feat: Downloader source system (#3007)

Author: Axelen123

app/schemas/app.revanced.manager.data.room.AppDatabase/3.json

@@ -9,18 +9,14 @@ import androidx.fragment.app.FragmentActivity
 import androidx.fragment.app.FragmentContainerView
 import androidx.fragment.app.commit
 import app.revanced.manager.domain.repository.DownloaderRepository
-import app.revanced.manager.network.downloader.DownloaderPackageState
 import org.koin.android.ext.android.inject
 
 class DownloaderActivity : FragmentActivity() {
     private val downloaderRepository: DownloaderRepository by inject()
-    var downloaderPackageName = ""
+    private var downloaderPackageName = ""
 
     private val downloaderPkgState
-        get() = downloaderRepository
-            .downloaderPackageStates
-            .value[downloaderPackageName]
-            ?.let { it as? DownloaderPackageState.Loaded }
+        get() = downloaderRepository.findPackageByName(downloaderPackageName)
 
     private var res: Resources? = null
 

app/src/main/java/app/revanced/manager/DownloaderActivity.kt

@@ -154,9 +154,6 @@ private fun ReVancedManager(vm: MainViewModel) {
                 onUpdateClick = {
                     navController.navigateSafe(Update())
                 },
-                onDownloaderClick = {
-                    navController.navigateSafe(Settings.Downloads)
-                },
                 onAppClick = { packageName ->
                     navController.navigateSafe(InstalledApplicationInfo(packageName))
                 },
@@ -177,9 +174,11 @@ private fun ReVancedManager(vm: MainViewModel) {
         }
 
         composable<BundleInformation> {
+            val data = it.toRoute<BundleInformation>()
+
             BundleInformationScreen(
                 onBackClick = navController::popBackStackSafe,
-                viewModel = koinViewModel()
+                viewModel = koinViewModel { parametersOf(data.uid) }
             )
         }
 
@@ -358,16 +357,16 @@ private fun ReVancedManager(vm: MainViewModel) {
             deepLinkedComposable<Settings.Downloads>("settings/downloads") {
                 DownloadsSettingsScreen(
                     onBackClick = navController::popBackStackSafe,
-                    onDownloaderClick = { packageName ->
-                        navController.navigateSafe(Settings.DownloadersInfo(packageName))
+                    onDownloaderClick = { uid ->
+                        navController.navigateSafe(Settings.DownloadersInfo(uid))
                     }
                 )
             }
 
             composable<Settings.DownloadersInfo> {
                 val route = it.toRoute<Settings.DownloadersInfo>()
                 DownloaderInfoScreen(
-                    packageName = route.packageName,
+                    uid = route.uid,
                     onBackClick = navController::popBackStackSafe
                 )
             }

app/src/main/java/app/revanced/manager/MainActivity.kt

@@ -73,9 +73,11 @@ class ManagerApplication : Application() {
             downloaderRepository.reload()
         }
         scope.launch(Dispatchers.Default) {
-            with(patchBundleRepository) {
-                reload()
-                updateCheck()
+            arrayOf(patchBundleRepository, downloaderRepository).forEach {
+                with(it) {
+                    reload()
+                    updateCheck()
+                }
             }
         }
         registerActivityLifecycleCallbacks(object : ActivityLifecycleCallbacks {

app/src/main/java/app/revanced/manager/ManagerApplication.kt

@@ -2,8 +2,10 @@ package app.revanced.manager.data.room
 
 import androidx.room.AutoMigration
 import androidx.room.Database
+import androidx.room.DeleteTable
 import androidx.room.RoomDatabase
 import androidx.room.TypeConverters
+import androidx.room.migration.AutoMigrationSpec
 import app.revanced.manager.data.room.apps.downloaded.DownloadedApp
 import app.revanced.manager.data.room.apps.downloaded.DownloadedAppDao
 import app.revanced.manager.data.room.apps.installed.AppliedPatch
@@ -15,17 +17,24 @@ import app.revanced.manager.data.room.selection.SelectedPatch
 import app.revanced.manager.data.room.selection.SelectionDao
 import app.revanced.manager.data.room.bundles.PatchBundleDao
 import app.revanced.manager.data.room.bundles.PatchBundleEntity
+import app.revanced.manager.data.room.downloader.DownloaderDao
+import app.revanced.manager.data.room.downloader.DownloaderEntity
 import app.revanced.manager.data.room.options.Option
 import app.revanced.manager.data.room.options.OptionDao
 import app.revanced.manager.data.room.options.OptionGroup
-import app.revanced.manager.data.room.downloader.TrustedDownloader
-import app.revanced.manager.data.room.downloader.TrustedDownloaderDao
 import kotlin.random.Random
 
 @Database(
-    entities = [PatchBundleEntity::class, PatchSelection::class, SelectedPatch::class, DownloadedApp::class, InstalledApp::class, AppliedPatch::class, InstalledPatchBundle::class, OptionGroup::class, Option::class, TrustedDownloader::class],
-    version = 2,
-    autoMigrations = [AutoMigration(from = 1, to = 2)]
+    entities = [PatchBundleEntity::class, PatchSelection::class, SelectedPatch::class, DownloadedApp::class, InstalledApp::class, AppliedPatch::class, InstalledPatchBundle::class, OptionGroup::class, Option::class, DownloaderEntity::class],
+    version = 3,
+    autoMigrations = [
+        AutoMigration(from = 1, to = 2),
+        AutoMigration(
+            from = 2,
+            to = 3,
+            spec = AppDatabase.DeleteTrustedDownloaders::class
+        )
+    ]
 )
 @TypeConverters(Converters::class)
 abstract class AppDatabase : RoomDatabase() {
@@ -34,7 +43,10 @@ abstract class AppDatabase : RoomDatabase() {
     abstract fun downloadedAppDao(): DownloadedAppDao
     abstract fun installedAppDao(): InstalledAppDao
     abstract fun optionDao(): OptionDao
-    abstract fun trustedDownloaderDao(): TrustedDownloaderDao
+    abstract fun downloaderDao(): DownloaderDao
+
+    @DeleteTable(tableName = "trusted_downloaders")
+    class DeleteTrustedDownloaders : AutoMigrationSpec
 
     companion object {
         fun generateUid() = Random.Default.nextInt()

app/src/main/java/app/revanced/manager/data/room/AppDatabase.kt

@@ -1,8 +1,8 @@
 package app.revanced.manager.data.room
 
 import androidx.room.TypeConverter
-import app.revanced.manager.data.room.bundles.Source
 import app.revanced.manager.data.room.options.Option.SerializedValue
+import app.revanced.manager.data.room.sources.Source
 import java.io.File
 
 class Converters {

app/src/main/java/app/revanced/manager/data/room/Converters.kt

@@ -1,6 +1,7 @@
 package app.revanced.manager.data.room.bundles
 
 import androidx.room.*
+import app.revanced.manager.data.room.sources.SourceProperties
 
 @Dao
 interface PatchBundleDao {
@@ -23,7 +24,7 @@ interface PatchBundleDao {
     suspend fun remove(uid: Int)
 
     @Query("SELECT name, version, auto_update, source FROM patch_bundles WHERE uid = :uid")
-    suspend fun getProps(uid: Int): PatchBundleProperties?
+    suspend fun getProps(uid: Int): SourceProperties?
 
     @Upsert
     suspend fun upsert(source: PatchBundleEntity)

app/src/main/java/app/revanced/manager/data/room/bundles/PatchBundleDao.kt

@@ -1,33 +1,7 @@
 package app.revanced.manager.data.room.bundles
 
 import androidx.room.*
-import io.ktor.http.*
-
-sealed class Source {
-    object Local : Source() {
-        const val SENTINEL = "local"
-
-        override fun toString() = SENTINEL
-    }
-
-    object API : Source() {
-        const val SENTINEL = "api"
-
-        override fun toString() = SENTINEL
-    }
-
-    data class Remote(val url: Url) : Source() {
-        override fun toString() = url.toString()
-    }
-
-    companion object {
-        fun from(value: String) = when (value) {
-            Local.SENTINEL -> Local
-            API.SENTINEL -> API
-            else -> Remote(Url(value))
-        }
-    }
-}
+import app.revanced.manager.data.room.sources.Source
 
 @Entity(tableName = "patch_bundles")
 data class PatchBundleEntity(
@@ -36,11 +10,4 @@ data class PatchBundleEntity(
     @ColumnInfo(name = "version") val versionHash: String? = null,
     @ColumnInfo(name = "source") val source: Source,
     @ColumnInfo(name = "auto_update") val autoUpdate: Boolean
-)
-
-data class PatchBundleProperties(
-    @ColumnInfo(name = "name") val name: String,
-    @ColumnInfo(name = "version") val versionHash: String? = null,
-    @ColumnInfo(name = "source") val source: Source,
-    @ColumnInfo(name = "auto_update") val autoUpdate: Boolean
 )

app/src/main/java/app/revanced/manager/data/room/bundles/PatchBundleEntity.kt

@@ -0,0 +1,34 @@
+package app.revanced.manager.data.room.downloader
+
+import androidx.room.Dao
+import androidx.room.Query
+import androidx.room.Transaction
+import androidx.room.Upsert
+import app.revanced.manager.data.room.sources.SourceProperties
+
+@Dao
+interface DownloaderDao {
+    @Query("SELECT * FROM downloaders")
+    suspend fun all(): List<DownloaderEntity>
+
+    @Query("UPDATE downloaders SET version = :patches WHERE uid = :uid")
+    suspend fun updateVersionHash(uid: Int, patches: String?)
+
+    @Query("DELETE FROM downloaders WHERE uid != 0")
+    suspend fun purgeCustomDownloaders()
+
+    @Transaction
+    suspend fun reset() {
+        purgeCustomDownloaders()
+        updateVersionHash(0, null) // Reset the main source
+    }
+
+    @Query("DELETE FROM downloaders WHERE uid = :uid")
+    suspend fun remove(uid: Int)
+
+    @Query("SELECT name, version, auto_update, source FROM downloaders WHERE uid = :uid")
+    suspend fun getProps(uid: Int): SourceProperties?
+
+    @Upsert
+    suspend fun upsert(source: DownloaderEntity)
+}

app/src/main/java/app/revanced/manager/data/room/downloader/DownloaderDao.kt

@@ -0,0 +1,13 @@
+package app.revanced.manager.data.room.downloader
+
+import androidx.room.*
+import app.revanced.manager.data.room.sources.Source
+
+@Entity(tableName = "downloaders")
+data class DownloaderEntity(
+    @PrimaryKey val uid: Int,
+    @ColumnInfo(name = "name") val name: String,
+    @ColumnInfo(name = "version") val versionHash: String? = null,
+    @ColumnInfo(name = "source") val source: Source,
+    @ColumnInfo(name = "auto_update") val autoUpdate: Boolean
+)