Skip to content

Commit ca38737

Browse files
Axelen123oSumAtrIX
Axelen123
authored and
oSumAtrIX
committed
feat: Add downloader plugin system (#2041)
1 parent 7e858a2 commit ca38737

84 files changed

Lines changed: 2983 additions & 1104 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎app/build.gradle.kts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,10 @@ dependencies {
113113
implementation(libs.runtime.ktx)
114114
implementation(libs.runtime.compose)
115115
implementation(libs.splash.screen)
116-
implementation(libs.compose.activity)
116+
implementation(libs.activity.compose)
117117
implementation(libs.work.runtime.ktx)
118118
implementation(libs.preferences.datastore)
119+
implementation(libs.appcompat)
119120

120121
// Compose
121122
implementation(platform(libs.compose.bom))
@@ -155,6 +156,9 @@ dependencies {
155156
implementation(libs.revanced.patcher)
156157
implementation(libs.revanced.library)
157158

159+
// Downloader plugins
160+
implementation(project(":downloader-plugin"))
161+
158162
// Native processes
159163
implementation(libs.kotlin.process)
160164

@@ -196,7 +200,7 @@ dependencies {
196200
// EnumUtil
197201
implementation(libs.enumutil)
198202
ksp(libs.enumutil.ksp)
199-
203+
200204
// Reorderable lists
201205
implementation(libs.reorderable)
202206

‎app/proguard-rules.pro‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@
4949
-keep class com.android.** {
5050
*;
5151
}
52+
-keep class app.revanced.manager.plugin.** {
53+
*;
54+
}
55+
5256
-dontwarn com.google.auto.value.**
5357
-dontwarn java.awt.**
5458
-dontwarn javax.**

‎app/schemas/app.revanced.manager.data.room.AppDatabase/1.json‎

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"formatVersion": 1,
33
"database": {
44
"version": 1,
5-
"identityHash": "c385297c07ea54804dc8526c388f706d",
5+
"identityHash": "d0119047505da435972c5247181de675",
66
"entities": [
77
{
88
"tableName": "patch_bundles",
@@ -144,7 +144,7 @@
144144
},
145145
{
146146
"tableName": "downloaded_app",
147-
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`package_name` TEXT NOT NULL, `version` TEXT NOT NULL, `directory` TEXT NOT NULL, PRIMARY KEY(`package_name`, `version`))",
147+
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`package_name` TEXT NOT NULL, `version` TEXT NOT NULL, `directory` TEXT NOT NULL, `last_used` INTEGER NOT NULL, PRIMARY KEY(`package_name`, `version`))",
148148
"fields": [
149149
{
150150
"fieldPath": "packageName",
@@ -163,6 +163,12 @@
163163
"columnName": "directory",
164164
"affinity": "TEXT",
165165
"notNull": true
166+
},
167+
{
168+
"fieldPath": "lastUsed",
169+
"columnName": "last_used",
170+
"affinity": "INTEGER",
171+
"notNull": true
166172
}
167173
],
168174
"primaryKey": {
@@ -386,12 +392,38 @@
386392
]
387393
}
388394
]
395+
},
396+
{
397+
"tableName": "trusted_downloader_plugins",
398+
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`package_name` TEXT NOT NULL, `signature` BLOB NOT NULL, PRIMARY KEY(`package_name`))",
399+
"fields": [
400+
{
401+
"fieldPath": "packageName",
402+
"columnName": "package_name",
403+
"affinity": "TEXT",
404+
"notNull": true
405+
},
406+
{
407+
"fieldPath": "signature",
408+
"columnName": "signature",
409+
"affinity": "BLOB",
410+
"notNull": true
411+
}
412+
],
413+
"primaryKey": {
414+
"autoGenerate": false,
415+
"columnNames": [
416+
"package_name"
417+
]
418+
},
419+
"indices": [],
420+
"foreignKeys": []
389421
}
390422
],
391423
"views": [],
392424
"setupQueries": [
393425
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
394-
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'c385297c07ea54804dc8526c388f706d')"
426+
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'd0119047505da435972c5247181de675')"
395427
]
396428
}
397429
}

‎app/src/main/AndroidManifest.xml‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,16 @@
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:tools="http://schemas.android.com/tools">
44

5-
<permission android:name="android.permission.QUERY_ALL_PACKAGES"
6-
tools:ignore="ReservedSystemPermission" />
5+
<permission
6+
android:name="app.revanced.manager.permission.PLUGIN_HOST"
7+
android:protectionLevel="signature"
8+
android:label="@string/plugin_host_permission_label"
9+
android:description="@string/plugin_host_permission_description"
10+
/>
711

12+
<uses-permission android:name="app.revanced.manager.permission.PLUGIN_HOST" />
13+
<uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"
14+
tools:ignore="QueryAllPackagesPermission" />
815
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
916
<uses-permission android:name="android.permission.INTERNET" />
1017
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
@@ -17,12 +24,6 @@
1724
tools:ignore="ScopedStorage" />
1825
<uses-permission android:name="android.permission.WAKE_LOCK" />
1926

20-
<queries>
21-
<intent>
22-
<action android:name="android.intent.action.MAIN" />
23-
</intent>
24-
</queries>
25-
2627
<application
2728
android:name=".ManagerApplication"
2829
android:allowBackup="true"
@@ -47,6 +48,8 @@
4748
</intent-filter>
4849
</activity>
4950

51+
<activity android:name=".plugin.downloader.webview.WebViewActivity" android:exported="false" android:theme="@style/Theme.WebViewActivity" />
52+
5053
<service android:name=".service.InstallService" />
5154
<service android:name=".service.UninstallService" />
5255

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

Lines changed: 18 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@ package app.revanced.manager
33
import android.os.Bundle
44
import androidx.activity.ComponentActivity
55
import androidx.activity.compose.setContent
6+
import androidx.activity.enableEdgeToEdge
67
import androidx.compose.animation.ExperimentalAnimationApi
78
import androidx.compose.foundation.isSystemInDarkTheme
89
import androidx.compose.runtime.getValue
910
import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
11+
import androidx.core.view.WindowCompat
1012
import app.revanced.manager.ui.destination.Destination
1113
import app.revanced.manager.ui.destination.SettingsDestination
1214
import app.revanced.manager.ui.screen.AppSelectorScreen
@@ -15,11 +17,11 @@ import app.revanced.manager.ui.screen.InstalledAppInfoScreen
1517
import app.revanced.manager.ui.screen.PatcherScreen
1618
import app.revanced.manager.ui.screen.SelectedAppInfoScreen
1719
import app.revanced.manager.ui.screen.SettingsScreen
18-
import app.revanced.manager.ui.screen.VersionSelectorScreen
1920
import app.revanced.manager.ui.theme.ReVancedManagerTheme
2021
import app.revanced.manager.ui.theme.Theme
2122
import app.revanced.manager.ui.viewmodel.MainViewModel
2223
import app.revanced.manager.ui.viewmodel.SelectedAppInfoViewModel
24+
import app.revanced.manager.util.EventEffect
2325
import dev.olshevski.navigation.reimagined.AnimatedNavHost
2426
import dev.olshevski.navigation.reimagined.NavBackHandler
2527
import dev.olshevski.navigation.reimagined.navigate
@@ -35,6 +37,8 @@ class MainActivity : ComponentActivity() {
3537
override fun onCreate(savedInstanceState: Bundle?) {
3638
super.onCreate(savedInstanceState)
3739

40+
WindowCompat.setDecorFitsSystemWindows(window, false)
41+
enableEdgeToEdge()
3842
installSplashScreen()
3943

4044
val vm: MainViewModel = getAndroidViewModel()
@@ -52,16 +56,23 @@ class MainActivity : ComponentActivity() {
5256
rememberNavController<Destination>(startDestination = Destination.Dashboard)
5357
NavBackHandler(navController)
5458

59+
EventEffect(vm.appSelectFlow) { app ->
60+
navController.navigate(Destination.SelectedApplicationInfo(app))
61+
}
62+
5563
AnimatedNavHost(
5664
controller = navController
5765
) { destination ->
5866
when (destination) {
5967
is Destination.Dashboard -> DashboardScreen(
6068
onSettingsClick = { navController.navigate(Destination.Settings()) },
6169
onAppSelectorClick = { navController.navigate(Destination.AppSelector) },
62-
onUpdateClick = { navController.navigate(
63-
Destination.Settings(SettingsDestination.Update())
64-
) },
70+
onUpdateClick = {
71+
navController.navigate(Destination.Settings(SettingsDestination.Update()))
72+
},
73+
onDownloaderPluginClick = {
74+
navController.navigate(Destination.Settings(SettingsDestination.Downloads))
75+
},
6576
onAppClick = { installedApp ->
6677
navController.navigate(
6778
Destination.InstalledApplicationInfo(
@@ -72,14 +83,7 @@ class MainActivity : ComponentActivity() {
7283
)
7384

7485
is Destination.InstalledApplicationInfo -> InstalledAppInfoScreen(
75-
onPatchClick = { packageName, patchSelection ->
76-
navController.navigate(
77-
Destination.VersionSelector(
78-
packageName,
79-
patchSelection
80-
)
81-
)
82-
},
86+
onPatchClick = vm::selectApp,
8387
onBackClick = { navController.pop() },
8488
viewModel = getComposeViewModel { parametersOf(destination.installedApp) }
8589
)
@@ -90,35 +94,11 @@ class MainActivity : ComponentActivity() {
9094
)
9195

9296
is Destination.AppSelector -> AppSelectorScreen(
93-
onAppClick = { navController.navigate(Destination.VersionSelector(it)) },
94-
onStorageClick = {
95-
navController.navigate(
96-
Destination.SelectedApplicationInfo(
97-
it
98-
)
99-
)
100-
},
97+
onSelect = vm::selectApp,
98+
onStorageSelect = vm::selectApp,
10199
onBackClick = { navController.pop() }
102100
)
103101

104-
is Destination.VersionSelector -> VersionSelectorScreen(
105-
onBackClick = { navController.pop() },
106-
onAppClick = { selectedApp ->
107-
navController.navigate(
108-
Destination.SelectedApplicationInfo(
109-
selectedApp,
110-
destination.patchSelection,
111-
)
112-
)
113-
},
114-
viewModel = getComposeViewModel {
115-
parametersOf(
116-
destination.packageName,
117-
destination.patchSelection
118-
)
119-
}
120-
)
121-
122102
is Destination.SelectedApplicationInfo -> SelectedAppInfoScreen(
123103
onPatchClick = { app, patches, options ->
124104
navController.navigate(

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package app.revanced.manager
33
import android.app.Application
44
import app.revanced.manager.di.*
55
import app.revanced.manager.domain.manager.PreferencesManager
6+
import app.revanced.manager.domain.repository.DownloaderPluginRepository
67
import app.revanced.manager.domain.repository.PatchBundleRepository
78
import kotlinx.coroutines.Dispatchers
89
import coil.Coil
@@ -23,6 +24,8 @@ class ManagerApplication : Application() {
2324
private val scope = MainScope()
2425
private val prefs: PreferencesManager by inject()
2526
private val patchBundleRepository: PatchBundleRepository by inject()
27+
private val downloaderPluginRepository: DownloaderPluginRepository by inject()
28+
2629
override fun onCreate() {
2730
super.onCreate()
2831

@@ -59,6 +62,9 @@ class ManagerApplication : Application() {
5962
scope.launch {
6063
prefs.preload()
6164
}
65+
scope.launch(Dispatchers.Default) {
66+
downloaderPluginRepository.reload()
67+
}
6268
scope.launch(Dispatchers.Default) {
6369
with(patchBundleRepository) {
6470
reload()

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,22 @@ import app.revanced.manager.data.room.bundles.PatchBundleEntity
1616
import app.revanced.manager.data.room.options.Option
1717
import app.revanced.manager.data.room.options.OptionDao
1818
import app.revanced.manager.data.room.options.OptionGroup
19+
import app.revanced.manager.data.room.plugins.TrustedDownloaderPlugin
20+
import app.revanced.manager.data.room.plugins.TrustedDownloaderPluginDao
1921
import kotlin.random.Random
2022

21-
@Database(entities = [PatchBundleEntity::class, PatchSelection::class, SelectedPatch::class, DownloadedApp::class, InstalledApp::class, AppliedPatch::class, OptionGroup::class, Option::class], version = 1)
23+
@Database(
24+
entities = [PatchBundleEntity::class, PatchSelection::class, SelectedPatch::class, DownloadedApp::class, InstalledApp::class, AppliedPatch::class, OptionGroup::class, Option::class, TrustedDownloaderPlugin::class],
25+
version = 1
26+
)
2227
@TypeConverters(Converters::class)
2328
abstract class AppDatabase : RoomDatabase() {
2429
abstract fun patchBundleDao(): PatchBundleDao
2530
abstract fun selectionDao(): SelectionDao
2631
abstract fun downloadedAppDao(): DownloadedAppDao
2732
abstract fun installedAppDao(): InstalledAppDao
2833
abstract fun optionDao(): OptionDao
34+
abstract fun trustedDownloaderPluginDao(): TrustedDownloaderPluginDao
2935

3036
companion object {
3137
fun generateUid() = Random.Default.nextInt()

‎app/src/main/java/app/revanced/manager/data/room/apps/downloaded/DownloadedApp.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@ data class DownloadedApp(
1212
@ColumnInfo(name = "package_name") val packageName: String,
1313
@ColumnInfo(name = "version") val version: String,
1414
@ColumnInfo(name = "directory") val directory: File,
15+
@ColumnInfo(name = "last_used") val lastUsed: Long = System.currentTimeMillis()
1516
)

‎app/src/main/java/app/revanced/manager/data/room/apps/downloaded/DownloadedAppDao.kt‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import androidx.room.Dao
44
import androidx.room.Delete
55
import androidx.room.Insert
66
import androidx.room.Query
7+
import androidx.room.Upsert
78
import kotlinx.coroutines.flow.Flow
89

910
@Dao
@@ -14,8 +15,11 @@ interface DownloadedAppDao {
1415
@Query("SELECT * FROM downloaded_app WHERE package_name = :packageName AND version = :version")
1516
suspend fun get(packageName: String, version: String): DownloadedApp?
1617

17-
@Insert
18-
suspend fun insert(downloadedApp: DownloadedApp)
18+
@Upsert
19+
suspend fun upsert(downloadedApp: DownloadedApp)
20+
21+
@Query("UPDATE downloaded_app SET last_used = :newValue WHERE package_name = :packageName AND version = :version")
22+
suspend fun markUsed(packageName: String, version: String, newValue: Long = System.currentTimeMillis())
1923

2024
@Delete
2125
suspend fun delete(downloadedApps: Collection<DownloadedApp>)

‎app/src/main/java/app/revanced/manager/data/room/plugins/TrustedDownloaderPlugin.kt‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package app.revanced.manager.data.room.plugins
2+
3+
import androidx.room.ColumnInfo
4+
import androidx.room.Entity
5+
import androidx.room.PrimaryKey
6+
7+
@Entity(tableName = "trusted_downloader_plugins")
8+
class TrustedDownloaderPlugin(
9+
@PrimaryKey @ColumnInfo(name = "package_name") val packageName: String,
10+
@ColumnInfo(name = "signature") val signature: ByteArray
11+
)

0 commit comments

Comments
 (0)