Refactor download status persistence and UI

Author: jmandel

app/schemas/org.schabi.newpipe.database.AppDatabase/10.json

@@ -25,7 +25,6 @@ import io.reactivex.rxjava3.plugins.RxJavaPlugins
 import org.acra.ACRA.init
 import org.acra.ACRA.isACRASenderServiceProcess
 import org.acra.config.CoreConfigurationBuilder
-import org.schabi.newpipe.download.DownloadMaintenance
 import org.schabi.newpipe.error.ReCaptchaActivity
 import org.schabi.newpipe.extractor.NewPipe
 import org.schabi.newpipe.extractor.downloader.Downloader
@@ -121,8 +120,6 @@ open class App :
         configureRxJavaErrorHandler()
 
         YoutubeStreamExtractor.setPoTokenProvider(PoTokenProviderImpl)
-
-        DownloadMaintenance.schedule(this)
     }
 
     override fun newImageLoader(context: Context): ImageLoader =

app/src/main/java/org/schabi/newpipe/App.kt

@@ -9,7 +9,6 @@
 import static org.schabi.newpipe.database.Migrations.MIGRATION_6_7;
 import static org.schabi.newpipe.database.Migrations.MIGRATION_7_8;
 import static org.schabi.newpipe.database.Migrations.MIGRATION_8_9;
-import static org.schabi.newpipe.database.Migrations.MIGRATION_9_10;
 
 import android.content.Context;
 import android.database.Cursor;
@@ -30,7 +29,7 @@ private static AppDatabase getDatabase(final Context context) {
         return Room
                 .databaseBuilder(context.getApplicationContext(), AppDatabase.class, DATABASE_NAME)
                 .addMigrations(MIGRATION_1_2, MIGRATION_2_3, MIGRATION_3_4, MIGRATION_4_5,
-                        MIGRATION_5_6, MIGRATION_6_7, MIGRATION_7_8, MIGRATION_8_9, MIGRATION_9_10)
+                        MIGRATION_5_6, MIGRATION_6_7, MIGRATION_7_8, MIGRATION_8_9)
                 .build();
     }
 

app/src/main/java/org/schabi/newpipe/NewPipeDatabase.java

@@ -1,13 +1,11 @@
 package org.schabi.newpipe.database;
 
-import static org.schabi.newpipe.database.Migrations.DB_VER_10;
+import static org.schabi.newpipe.database.Migrations.DB_VER_9;
 
 import androidx.room.Database;
 import androidx.room.RoomDatabase;
 import androidx.room.TypeConverters;
 
-import org.schabi.newpipe.database.download.DownloadedStreamEntity;
-import org.schabi.newpipe.database.download.DownloadedStreamsDao;
 import org.schabi.newpipe.database.feed.dao.FeedDAO;
 import org.schabi.newpipe.database.feed.dao.FeedGroupDAO;
 import org.schabi.newpipe.database.feed.model.FeedEntity;
@@ -38,9 +36,9 @@
                 StreamEntity.class, StreamHistoryEntity.class, StreamStateEntity.class,
                 PlaylistEntity.class, PlaylistStreamEntity.class, PlaylistRemoteEntity.class,
                 FeedEntity.class, FeedGroupEntity.class, FeedGroupSubscriptionEntity.class,
-                FeedLastUpdatedEntity.class, DownloadedStreamEntity.class
+                FeedLastUpdatedEntity.class
         },
-        version = DB_VER_10
+        version = DB_VER_9
 )
 public abstract class AppDatabase extends RoomDatabase {
     public static final String DATABASE_NAME = "newpipe.db";
@@ -64,6 +62,4 @@ public abstract class AppDatabase extends RoomDatabase {
     public abstract FeedGroupDAO feedGroupDAO();
 
     public abstract SubscriptionDAO subscriptionDAO();
-
-    public abstract DownloadedStreamsDao downloadedStreamsDao();
 }

app/src/main/java/org/schabi/newpipe/database/AppDatabase.java

@@ -1,7 +1,6 @@
 package org.schabi.newpipe.database
 
 import androidx.room.TypeConverter
-import org.schabi.newpipe.database.download.DownloadedStreamStatus
 import org.schabi.newpipe.extractor.stream.StreamType
 import org.schabi.newpipe.local.subscription.FeedGroupIcon
 import java.time.Instant
@@ -50,14 +49,4 @@ class Converters {
     fun feedGroupIconOf(id: Int): FeedGroupIcon {
         return FeedGroupIcon.entries.first { it.id == id }
     }
-
-    @TypeConverter
-    fun downloadedStreamStatusOf(value: Int?): DownloadedStreamStatus? {
-        return value?.let { DownloadedStreamStatus.fromValue(it) }
-    }
-
-    @TypeConverter
-    fun integerOf(status: DownloadedStreamStatus?): Int? {
-        return status?.value
-    }
 }

app/src/main/java/org/schabi/newpipe/database/Converters.kt

@@ -27,7 +27,6 @@ public final class Migrations {
     public static final int DB_VER_7 = 7;
     public static final int DB_VER_8 = 8;
     public static final int DB_VER_9 = 9;
-    public static final int DB_VER_10 = 10;
 
     private static final String TAG = Migrations.class.getName();
     public static final boolean DEBUG = MainActivity.DEBUG;
@@ -303,22 +302,6 @@ public void migrate(@NonNull final SupportSQLiteDatabase database) {
         }
     };
 
-    public static final Migration MIGRATION_9_10 = new Migration(DB_VER_9, DB_VER_10) {
-        @Override
-        public void migrate(@NonNull final SupportSQLiteDatabase database) {
-            database.execSQL("CREATE TABLE IF NOT EXISTS downloaded_streams "
-                    + "(id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "
-                    + "stream_uid INTEGER NOT NULL, service_id INTEGER NOT NULL, "
-                    + "url TEXT NOT NULL, file_uri TEXT NOT NULL, parent_uri TEXT, "
-                    + "display_name TEXT, mime TEXT, size_bytes INTEGER, quality_label TEXT, "
-                    + "duration_ms INTEGER, status INTEGER NOT NULL, added_at INTEGER NOT NULL, "
-                    + "last_checked_at INTEGER, missing_since INTEGER, FOREIGN KEY(stream_uid) "
-                    + "REFERENCES streams(uid) ON UPDATE CASCADE ON DELETE CASCADE)");
-            database.execSQL("CREATE UNIQUE INDEX index_downloaded_streams_stream_uid "
-                    + "ON downloaded_streams (stream_uid)");
-        }
-    };
-
     private Migrations() {
     }
 }

app/src/main/java/org/schabi/newpipe/database/Migrations.java

@@ -81,14 +81,6 @@ public boolean onCreateOptionsMenu(final Menu menu) {
         return true;
     }
 
-    @Override
-    protected void onResume() {
-        super.onResume();
-        new Thread(() ->
-                DownloadMaintenance.revalidateAvailable(DownloadActivity.this, 10)
-        ).start();
-    }
-
     @Override
     public boolean onOptionsItemSelected(final MenuItem item) {
         switch (item.getItemId()) {