From cf17ed64c759d366ae7121dc61c4328205963ed4 Mon Sep 17 00:00:00 2001
From: gdlbo <41114720+gdlbo@users.noreply.github.com>
Date: Sun, 30 Jul 2023 16:49:30 +0300
Subject: [PATCH] fixed invert in cached playlist

---
 .../music/cache/helpers/TracklistHelper.java     | 16 ++++++++++++----
 .../music/cache/injectors/TracklistInjector.java |  3 +--
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/ru/vtosters/lite/music/cache/helpers/TracklistHelper.java b/app/src/main/java/ru/vtosters/lite/music/cache/helpers/TracklistHelper.java
index 439663763..1cf71fe4c 100644
--- a/app/src/main/java/ru/vtosters/lite/music/cache/helpers/TracklistHelper.java
+++ b/app/src/main/java/ru/vtosters/lite/music/cache/helpers/TracklistHelper.java
@@ -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());
         }
diff --git a/app/src/main/java/ru/vtosters/lite/music/cache/injectors/TracklistInjector.java b/app/src/main/java/ru/vtosters/lite/music/cache/injectors/TracklistInjector.java
index 35d397a53..037986b71 100644
--- a/app/src/main/java/ru/vtosters/lite/music/cache/injectors/TracklistInjector.java
+++ b/app/src/main/java/ru/vtosters/lite/music/cache/injectors/TracklistInjector.java
@@ -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")