Create sub-package and default interval for DebounceSaver & sort playlists in db

Author: GGAutomaton

app/src/main/java/org/schabi/newpipe/database/playlist/PlaylistLocalItem.java

@@ -16,6 +16,7 @@ public interface PlaylistLocalItem extends LocalItem {
     static List<PlaylistLocalItem> merge(
             final List<PlaylistMetadataEntry> localPlaylists,
             final List<PlaylistRemoteEntity> remotePlaylists) {
+        // The playlists from the database must be in the display index order.
 
         // Merge localPlaylists and remotePlaylists by display index.
         // If two items have the same display index, sort them in CASE_INSENSITIVE_ORDER.
@@ -25,11 +26,6 @@ static List<PlaylistLocalItem> merge(
                 localPlaylists.size() + remotePlaylists.size());
         final List<PlaylistLocalItem> itemsWithSameIndex = new ArrayList<>();
 
-        // The data from database may not be in the display index order
-        Collections.sort(localPlaylists,
-                Comparator.comparingLong(PlaylistMetadataEntry::getDisplayIndex));
-        Collections.sort(remotePlaylists,
-                Comparator.comparingLong(PlaylistRemoteEntity::getDisplayIndex));
         int i = 0;
         int j = 0;
         while (i < localPlaylists.size()) {

app/src/main/java/org/schabi/newpipe/database/playlist/dao/PlaylistRemoteDAO.java

@@ -11,6 +11,7 @@
 
 import io.reactivex.rxjava3.core.Flowable;
 
+import static org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity.REMOTE_PLAYLIST_DISPLAY_INDEX;
 import static org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity.REMOTE_PLAYLIST_ID;
 import static org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity.REMOTE_PLAYLIST_SERVICE_ID;
 import static org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity.REMOTE_PLAYLIST_TABLE;
@@ -39,6 +40,10 @@ public interface PlaylistRemoteDAO extends BasicDAO<PlaylistRemoteEntity> {
             + REMOTE_PLAYLIST_URL + " = :url AND " + REMOTE_PLAYLIST_SERVICE_ID + " = :serviceId")
     Flowable<List<PlaylistRemoteEntity>> getPlaylist(long serviceId, String url);
 
+    @Query("SELECT * FROM " + REMOTE_PLAYLIST_TABLE
+     + " ORDER BY " + REMOTE_PLAYLIST_DISPLAY_INDEX)
+    Flowable<List<PlaylistRemoteEntity>> getDisplayIndexOrderedPlaylists();
+
     @Query("SELECT " + REMOTE_PLAYLIST_ID + " FROM " + REMOTE_PLAYLIST_TABLE
             + " WHERE " + REMOTE_PLAYLIST_URL + " = :url "
             + "AND " + REMOTE_PLAYLIST_SERVICE_ID + " = :serviceId")

app/src/main/java/org/schabi/newpipe/local/bookmark/BookmarkFragment.java

@@ -35,8 +35,8 @@
 import org.schabi.newpipe.local.holder.RemoteBookmarkPlaylistItemHolder;
 import org.schabi.newpipe.local.playlist.LocalPlaylistManager;
 import org.schabi.newpipe.local.playlist.RemotePlaylistManager;
-import org.schabi.newpipe.util.DebounceSavable;
-import org.schabi.newpipe.util.DebounceSaver;
+import org.schabi.newpipe.util.debounce.DebounceSavable;
+import org.schabi.newpipe.util.debounce.DebounceSaver;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.OnClickGesture;
 
@@ -89,7 +89,7 @@ public void onCreate(final Bundle savedInstanceState) {
         disposables = new CompositeDisposable();
 
         isLoadingComplete = new AtomicBoolean();
-        debounceSaver = new DebounceSaver(10000, this);
+        debounceSaver = new DebounceSaver(this);
 
         displayIndexInDatabase = new HashMap<>();
     }
@@ -185,8 +185,8 @@ public void startLoading(final boolean forceLoad) {
         }
         isLoadingComplete.set(false);
 
-        Flowable.combineLatest(localPlaylistManager.getPlaylists(),
-                remotePlaylistManager.getPlaylists(), PlaylistLocalItem::merge)
+        Flowable.combineLatest(localPlaylistManager.getDisplayIndexOrderedPlaylists(),
+                remotePlaylistManager.getDisplayIndexOrderedPlaylists(), PlaylistLocalItem::merge)
                 .onBackpressureLatest()
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(getPlaylistsSubscriber());

app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java

@@ -46,8 +46,8 @@
 import org.schabi.newpipe.player.MainPlayer.PlayerType;
 import org.schabi.newpipe.player.playqueue.PlayQueue;
 import org.schabi.newpipe.player.playqueue.SinglePlayQueue;
-import org.schabi.newpipe.util.DebounceSavable;
-import org.schabi.newpipe.util.DebounceSaver;
+import org.schabi.newpipe.util.debounce.DebounceSavable;
+import org.schabi.newpipe.util.debounce.DebounceSaver;
 import org.schabi.newpipe.util.Localization;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.OnClickGesture;
@@ -112,7 +112,7 @@ public void onCreate(final Bundle savedInstanceState) {
         disposables = new CompositeDisposable();
 
         isLoadingComplete = new AtomicBoolean();
-        debounceSaver = new DebounceSaver(10000, this);
+        debounceSaver = new DebounceSaver(this);
     }
 
     @Override

app/src/main/java/org/schabi/newpipe/local/playlist/RemotePlaylistManager.java

@@ -26,6 +26,10 @@ public Flowable<List<PlaylistRemoteEntity>> getPlaylists() {
         return playlistRemoteTable.getAll().subscribeOn(Schedulers.io());
     }
 
+    public Flowable<List<PlaylistRemoteEntity>> getDisplayIndexOrderedPlaylists() {
+        return playlistRemoteTable.getDisplayIndexOrderedPlaylists().subscribeOn(Schedulers.io());
+    }
+
     public Flowable<List<PlaylistRemoteEntity>> getPlaylist(final PlaylistInfo info) {
         return playlistRemoteTable.getPlaylist(info.getServiceId(), info.getUrl())
                 .subscribeOn(Schedulers.io());

app/src/main/java/org/schabi/newpipe/settings/SelectPlaylistFragment.java

@@ -90,8 +90,8 @@ private void loadPlaylists() {
         final LocalPlaylistManager localPlaylistManager = new LocalPlaylistManager(database);
         final RemotePlaylistManager remotePlaylistManager = new RemotePlaylistManager(database);
 
-        disposable = Flowable.combineLatest(localPlaylistManager.getPlaylists(),
-                remotePlaylistManager.getPlaylists(), PlaylistLocalItem::merge)
+        disposable = Flowable.combineLatest(localPlaylistManager.getDisplayIndexOrderedPlaylists(),
+                remotePlaylistManager.getDisplayIndexOrderedPlaylists(), PlaylistLocalItem::merge)
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(this::displayPlaylists, this::onError);
     }

…schabi/newpipe/util/DebounceSavable.java …wpipe/util/debounce/DebounceSavable.javaapp/src/main/java/org/schabi/newpipe/util/DebounceSavable.java renamed to app/src/main/java/org/schabi/newpipe/util/debounce/DebounceSavable.java app/src/main/java/org/schabi/newpipe/util/DebounceSavable.java renamed to app/src/main/java/org/schabi/newpipe/util/debounce/DebounceSavable.java

@@ -1,4 +1,4 @@
-package org.schabi.newpipe.util;
+package org.schabi.newpipe.util.debounce;
 
 import org.schabi.newpipe.error.ErrorInfo;
 

…g/schabi/newpipe/util/DebounceSaver.java …newpipe/util/debounce/DebounceSaver.javaapp/src/main/java/org/schabi/newpipe/util/DebounceSaver.java renamed to app/src/main/java/org/schabi/newpipe/util/debounce/DebounceSaver.java app/src/main/java/org/schabi/newpipe/util/DebounceSaver.java renamed to app/src/main/java/org/schabi/newpipe/util/debounce/DebounceSaver.java

@@ -1,4 +1,4 @@
-package org.schabi.newpipe.util;
+package org.schabi.newpipe.util.debounce;
 
 import org.schabi.newpipe.error.ErrorInfo;
 import org.schabi.newpipe.error.UserAction;
@@ -21,6 +21,9 @@ public class DebounceSaver {
     // Has the object been modified
     private final AtomicBoolean isModified;
 
+    // Default 10 seconds
+    private static final long DEFAULT_SAVE_DEBOUNCE_MILLIS = 10000;
+
 
     /**
      * Creates a new {@code DebounceSaver}.
@@ -36,6 +39,16 @@ public DebounceSaver(final long saveDebounceMillis, final DebounceSavable deboun
         this.isModified = new AtomicBoolean();
     }
 
+    /**
+     * Creates a new {@code DebounceSaver}. Save the object 10 seconds later after the last change
+     * occurred.
+     *
+     * @param debounceSavable       The object containing data to be saved.
+     */
+    public DebounceSaver(final DebounceSavable debounceSavable) {
+        this(DEFAULT_SAVE_DEBOUNCE_MILLIS, debounceSavable);
+    }
+
     public boolean getIsModified() {
         return isModified.get();
     }