Migrate playlist fragment to Jetpack Compose

app/build.gradle

@@ -226,7 +226,7 @@ dependencies {
     implementation libs.androidx.media
     implementation libs.androidx.preference
     implementation libs.androidx.recyclerview
-    implementation libs.androidx.room.runtime
+    implementation libs.androidx.room.ktx
     implementation libs.androidx.room.rxjava3
     kapt libs.androidx.room.compiler
     implementation libs.androidx.swiperefreshlayout

app/src/androidTest/java/org/schabi/newpipe/database/DatabaseMigrationTest.kt

@@ -7,6 +7,8 @@ import androidx.room.testing.MigrationTestHelper
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
+import kotlinx.coroutines.reactive.awaitFirst
+import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotEquals
 import org.junit.Assert.assertNull
@@ -226,7 +228,7 @@ class DatabaseMigrationTest {
     }
 
     @Test
-    fun migrateDatabaseFrom8to9() {
+    fun migrateDatabaseFrom8to9() = runBlocking {
         val databaseInV8 = testHelper.createDatabase(AppDatabase.DATABASE_NAME, Migrations.DB_VER_8)
 
         val localUid1: Long
@@ -283,8 +285,8 @@ class DatabaseMigrationTest {
         )
 
         val migratedDatabaseV9 = getMigratedDatabase()
-        var localListFromDB = migratedDatabaseV9.playlistDAO().all.blockingFirst()
-        var remoteListFromDB = migratedDatabaseV9.playlistRemoteDAO().all.blockingFirst()
+        var localListFromDB = migratedDatabaseV9.playlistDAO().getAll().awaitFirst()
+        var remoteListFromDB = migratedDatabaseV9.playlistRemoteDAO().getAll().awaitFirst()
 
         assertEquals(1, localListFromDB.size)
         assertEquals(localUid2, localListFromDB[0].uid)
@@ -303,8 +305,8 @@ class DatabaseMigrationTest {
             )
         )
 
-        localListFromDB = migratedDatabaseV9.playlistDAO().all.blockingFirst()
-        remoteListFromDB = migratedDatabaseV9.playlistRemoteDAO().all.blockingFirst()
+        localListFromDB = migratedDatabaseV9.playlistDAO().getAll().awaitFirst()
+        remoteListFromDB = migratedDatabaseV9.playlistRemoteDAO().getAll().awaitFirst()
         assertEquals(2, localListFromDB.size)
         assertEquals(localUid3, localListFromDB[1].uid)
         assertEquals(-1, localListFromDB[1].displayIndex)

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

@@ -0,0 +1,44 @@
+package org.schabi.newpipe.database.playlist.dao
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.Query
+import androidx.room.Transaction
+import androidx.room.Update
+import io.reactivex.rxjava3.core.Flowable
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.firstOrNull
+import org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity
+
+@Dao
+interface PlaylistRemoteDAO {
+    @Query("SELECT * FROM remote_playlists")
+    fun getAll(): Flowable<List<PlaylistRemoteEntity>>
+
+    @Query("SELECT * FROM remote_playlists WHERE url = :url AND service_id = :serviceId")
+    fun getPlaylist(serviceId: Int, url: String): Flow<PlaylistRemoteEntity?>
+
+    @Query("SELECT * FROM remote_playlists ORDER BY display_index")
+    fun getPlaylists(): Flowable<List<PlaylistRemoteEntity>>
+
+    @Insert
+    suspend fun insert(playlist: PlaylistRemoteEntity): Long
+
+    @Update
+    suspend fun update(playlist: PlaylistRemoteEntity)
+
+    @Transaction
+    suspend fun upsert(playlist: PlaylistRemoteEntity) {
+        val dbPlaylist = getPlaylist(playlist.serviceId, playlist.url).firstOrNull()
+
+        if (dbPlaylist == null) {
+            insert(playlist)
+        } else {
+            playlist.uid = dbPlaylist.uid
+            update(playlist)
+        }
+    }
+
+    @Query("DELETE FROM remote_playlists WHERE uid = :playlistId")
+    suspend fun deletePlaylist(playlistId: Long): Int
+}

app/src/main/java/org/schabi/newpipe/database/playlist/model/PlaylistRemoteEntity.java

@@ -1,20 +1,17 @@
 package org.schabi.newpipe.database.playlist.model;
 
-import android.text.TextUtils;
-
 import androidx.room.ColumnInfo;
 import androidx.room.Entity;
 import androidx.room.Ignore;
 import androidx.room.Index;
 import androidx.room.PrimaryKey;
 
 import org.schabi.newpipe.database.playlist.PlaylistLocalItem;
-import org.schabi.newpipe.extractor.playlist.PlaylistInfo;
+import org.schabi.newpipe.ui.components.playlist.PlaylistScreenInfo;
 import org.schabi.newpipe.util.Constants;
 import org.schabi.newpipe.util.image.ImageStrategy;
 
 import static org.schabi.newpipe.database.LocalItem.LocalItemType.PLAYLIST_REMOTE_ITEM;
-import static org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity.REMOTE_PLAYLIST_NAME;
 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;
 import static org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity.REMOTE_PLAYLIST_URL;
@@ -84,31 +81,14 @@ public PlaylistRemoteEntity(final int serviceId, final String name, final String
     }
 
     @Ignore
-    public PlaylistRemoteEntity(final PlaylistInfo info) {
+    public PlaylistRemoteEntity(final PlaylistScreenInfo info) {
         this(info.getServiceId(), info.getName(), info.getUrl(),
                 // use uploader avatar when no thumbnail is available
                 ImageStrategy.imageListToDbUrl(info.getThumbnails().isEmpty()
                         ? info.getUploaderAvatars() : info.getThumbnails()),
                 info.getUploaderName(), info.getStreamCount());
     }
 
-    @Ignore
-    public boolean isIdenticalTo(final PlaylistInfo info) {
-        /*
-         * Returns boolean comparing the online playlist and the local copy.
-         * (False if info changed such as playlist name or track count)
-         */
-        return getServiceId() == info.getServiceId()
-                && getStreamCount() == info.getStreamCount()
-                && TextUtils.equals(getName(), info.getName())
-                && TextUtils.equals(getUrl(), info.getUrl())
-                // we want to update the local playlist data even when either the remote thumbnail
-                // URL changes, or the preferred image quality setting is changed by the user
-                && TextUtils.equals(getThumbnailUrl(),
-                ImageStrategy.imageListToDbUrl(info.getThumbnails()))
-                && TextUtils.equals(getUploader(), info.getUploaderName());
-    }
-
     @Override
     public long getUid() {
         return uid;

app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java

@@ -101,7 +101,6 @@ public class ChannelFragment extends BaseStateFragment<ChannelInfo>
     private MenuItem menuRssButton;
     private MenuItem menuNotifyButton;
     private SubscriptionEntity channelSubscription;
-    private MenuProvider menuProvider;
 
     public static ChannelFragment getInstance(final int serviceId, final String url,
                                               final String name) {
@@ -122,9 +121,24 @@ private void setInitialData(final int sid, final String u, final String title) {
     //////////////////////////////////////////////////////////////////////////*/
 
     @Override
-    public void onCreate(final Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        menuProvider = new MenuProvider() {
+    public void onAttach(@NonNull final Context context) {
+        super.onAttach(context);
+        subscriptionManager = new SubscriptionManager(activity);
+    }
+
+    @Override
+    public View onCreateView(@NonNull final LayoutInflater inflater,
+                             @Nullable final ViewGroup container,
+                             @Nullable final Bundle savedInstanceState) {
+        binding = FragmentChannelBinding.inflate(inflater, container, false);
+        return binding.getRoot();
+    }
+
+    @Override // called from onViewCreated in BaseFragment.onViewCreated
+    protected void initViews(final View rootView, final Bundle savedInstanceState) {
+        super.initViews(rootView, savedInstanceState);
+
+        final var menuProvider = new MenuProvider() {
             @Override
             public void onCreateMenu(@NonNull final Menu menu,
                                      @NonNull final MenuInflater inflater) {
@@ -134,7 +148,6 @@ public void onCreateMenu(@NonNull final Menu menu,
                     Log.d(TAG, "onCreateOptionsMenu() called with: "
                             + "menu = [" + menu + "], inflater = [" + inflater + "]");
                 }
-
             }
 
             @Override
@@ -179,26 +192,7 @@ public boolean onMenuItemSelected(@NonNull final MenuItem item) {
                 return true;
             }
         };
-        activity.addMenuProvider(menuProvider);
-    }
-
-    @Override
-    public void onAttach(@NonNull final Context context) {
-        super.onAttach(context);
-        subscriptionManager = new SubscriptionManager(activity);
-    }
-
-    @Override
-    public View onCreateView(@NonNull final LayoutInflater inflater,
-                             @Nullable final ViewGroup container,
-                             @Nullable final Bundle savedInstanceState) {
-        binding = FragmentChannelBinding.inflate(inflater, container, false);
-        return binding.getRoot();
-    }
-
-    @Override // called from onViewCreated in BaseFragment.onViewCreated
-    protected void initViews(final View rootView, final Bundle savedInstanceState) {
-        super.initViews(rootView, savedInstanceState);
+        activity.addMenuProvider(menuProvider, getViewLifecycleOwner());
 
         EmptyStateUtil.setEmptyStateComposable(
                 binding.emptyStateView,
@@ -246,8 +240,6 @@ public void onDestroy() {
         }
         disposables.clear();
         binding = null;
-        activity.removeMenuProvider(menuProvider);
-        menuProvider = null;
     }
 
     /*//////////////////////////////////////////////////////////////////////////