fixed invert in cached playlist
This commit is contained in:
+12
-4
@@ -6,6 +6,7 @@ import com.vk.dto.music.MusicTrack;
|
||||
import org.json.JSONArray;
|
||||
import org.json.JSONException;
|
||||
import org.json.JSONObject;
|
||||
import ru.vtosters.hooks.other.Preferences;
|
||||
import ru.vtosters.lite.music.cache.CacheDatabaseDelegate;
|
||||
import ru.vtosters.lite.music.cache.FileCacheImplementation;
|
||||
|
||||
@@ -21,9 +22,18 @@ public class TracklistHelper {
|
||||
}
|
||||
|
||||
public static List<MusicTrack> getTracks() {
|
||||
return CacheDatabaseDelegate.getTracks();
|
||||
List<MusicTrack> tracks = CacheDatabaseDelegate.getTracks();
|
||||
|
||||
boolean doNotinvertOrder = Preferences.getBoolValue("invertCachedTracks", false);
|
||||
|
||||
if (!doNotinvertOrder) {
|
||||
Collections.reverse(tracks);
|
||||
}
|
||||
|
||||
return tracks;
|
||||
}
|
||||
|
||||
|
||||
public static List<MusicTrack> getTracks(String id) {
|
||||
return CacheDatabaseDelegate.getTracksByAlbum(id);
|
||||
}
|
||||
@@ -32,11 +42,9 @@ public class TracklistHelper {
|
||||
return CacheDatabaseDelegate.getTracksByAlbumOne(id);
|
||||
}
|
||||
|
||||
public static JSONArray tracksToIds(List<MusicTrack> tracks, boolean invertList) {
|
||||
public static JSONArray tracksToIds(List<MusicTrack> tracks) {
|
||||
var arr = new JSONArray();
|
||||
|
||||
if (!invertList) Collections.reverse(tracks);
|
||||
|
||||
for (MusicTrack track : tracks) {
|
||||
arr.put(track.y1());
|
||||
}
|
||||
|
||||
+1
-2
@@ -11,7 +11,6 @@ import io.reactivex.ObservableOnSubscribe;
|
||||
import org.json.JSONArray;
|
||||
import org.json.JSONException;
|
||||
import org.json.JSONObject;
|
||||
import ru.vtosters.hooks.other.Preferences;
|
||||
import ru.vtosters.lite.music.cache.CacheDatabaseDelegate;
|
||||
import ru.vtosters.lite.music.cache.helpers.PlaylistHelper;
|
||||
import ru.vtosters.lite.music.cache.helpers.TracklistHelper;
|
||||
@@ -233,7 +232,7 @@ public class TracklistInjector {
|
||||
.put("id", getRandomId())
|
||||
.put("data_type", "music_audios")
|
||||
.put("url", "synth:cache:list")
|
||||
.put("audios_ids", TracklistHelper.tracksToIds(tracks, Preferences.getBoolValue("invertCachedTracks", false)));
|
||||
.put("audios_ids", TracklistHelper.tracksToIds(tracks));
|
||||
|
||||
var layout = new JSONObject()
|
||||
.put("name", "list")
|
||||
|
||||
Reference in New Issue
Block a user