oops

app/build.gradle.kts

@@ -27,7 +27,7 @@ android {
     buildTypes {
         debug {
             applicationIdSuffix = ".debug"
-            resValue("string", "app_name", "ReVanced Manager (dev)")
+            resValue("string", "app_name", "ReVanced Manager (Debug)")
             isPseudoLocalesEnabled = true
 
             buildConfigField("long", "BUILD_ID", "${Random.nextLong()}L")
@@ -40,12 +40,21 @@ android {
                 proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
             }
 
-            if (project.hasProperty("signAsDebug")) {
-                applicationIdSuffix = ".debug"
-                resValue("string", "app_name", "ReVanced Manager Debug")
+            val keystoreFile = file("keystore.jks")
+
+            if (project.hasProperty("signAsDebug") || !keystoreFile.exists()) {
+                applicationIdSuffix = ".debug_signed"
+                resValue("string", "app_name", "ReVanced Manager (Debug signed)")
                 signingConfig = signingConfigs.getByName("debug")
 
                 isPseudoLocalesEnabled = true
+            } else {
+                signingConfig = signingConfigs.create("release") {
+                    storeFile = keystoreFile
+                    storePassword = System.getenv("KEYSTORE_PASSWORD")
+                    keyAlias = System.getenv("KEYSTORE_ENTRY_ALIAS")
+                    keyPassword = System.getenv("KEYSTORE_ENTRY_PASSWORD")
+                }
             }
 
             buildConfigField("long", "BUILD_ID", "0L")
@@ -63,15 +72,17 @@ android {
     }
 
     packaging {
-        resources.excludes.addAll(listOf(
-            "/prebuilt/**",
-            "META-INF/DEPENDENCIES",
-            "META-INF/**.version",
-            "DebugProbesKt.bin",
-            "kotlin-tooling-metadata.json",
-            "org/bouncycastle/pqc/**.properties",
-            "org/bouncycastle/x509/**.properties",
-        ))
+        resources.excludes.addAll(
+            listOf(
+                "/prebuilt/**",
+                "META-INF/DEPENDENCIES",
+                "META-INF/**.version",
+                "DebugProbesKt.bin",
+                "kotlin-tooling-metadata.json",
+                "org/bouncycastle/pqc/**.properties",
+                "org/bouncycastle/x509/**.properties",
+            )
+        )
         jniLibs {
             useLegacyPackaging = true
         }

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

@@ -277,6 +277,10 @@ private fun ReVancedManager(vm: MainViewModel) {
                 AdvancedSettingsScreen(onBackClick = navController::popBackStack)
             }
 
+            composable<Settings.DeveloperOptions> {
+                DeveloperOptionsScreen(onBackClick = navController::popBackStack)
+            }
+
             composable<Settings.Updates> {
                 UpdatesSettingsScreen(
                     onBackClick = navController::popBackStack,
@@ -312,9 +316,6 @@ private fun ReVancedManager(vm: MainViewModel) {
                 LicensesScreen(onBackClick = navController::popBackStack)
             }
 
-            composable<Settings.DeveloperOptions> {
-                DeveloperOptionsScreen(onBackClick = navController::popBackStack)
-            }
         }
     }
 }

app/src/main/java/app/revanced/manager/patcher/runtime/ProcessRuntime.kt

@@ -111,6 +111,7 @@ class ProcessRuntime(private val context: Context) : Runtime(context) {
         }
 
         val patching = CompletableDeferred<Unit>()
+        val scope = this
 
         launch(Dispatchers.IO) {
             val binder = awaitBinderConnection()
@@ -124,7 +125,7 @@ class ProcessRuntime(private val context: Context) : Runtime(context) {
                 override fun log(level: String, msg: String) = logger.log(enumValueOf(level), msg)
 
                 override fun patchSucceeded() {
-                    launch { onPatchCompleted() }
+                    scope.launch { onPatchCompleted() }
                 }
 
                 override fun progress(name: String?, state: String?, msg: String?) =
@@ -179,7 +180,7 @@ class ProcessRuntime(private val context: Context) : Runtime(context) {
     }
 
     /**
-     * An [Exception] occured in the remote process while patching.
+     * An [Exception] occurred in the remote process while patching.
      *
      * @param originalStackTrace The stack trace of the original [Exception].
      */

app/src/main/java/app/revanced/manager/patcher/runtime/process/PatcherProcess.kt

@@ -1,8 +1,10 @@
 package app.revanced.manager.patcher.runtime.process
 
+import android.annotation.SuppressLint
 import android.app.ActivityThread
 import android.content.Context
 import android.content.Intent
+import android.os.Build
 import android.os.Bundle
 import android.os.Looper
 import app.revanced.manager.BuildConfig
@@ -95,6 +97,10 @@ class PatcherProcess(private val context: Context) : IPatcherProcess.Stub() {
     }
 
     companion object {
+        private val longArrayClass = LongArray::class.java
+        private val emptyLongArray = LongArray(0)
+
+        @SuppressLint("PrivateApi")
         @JvmStatic
         fun main(args: Array<String>) {
             Looper.prepare()
@@ -105,6 +111,15 @@ class PatcherProcess(private val context: Context) : IPatcherProcess.Stub() {
             val systemContext = ActivityThread.systemMain().systemContext as Context
             val appContext = systemContext.createPackageContext(managerPackageName, 0)
 
+            // Avoid annoying logs. See https://github.com/robolectric/robolectric/blob/ad0484c6b32c7d11176c711abeb3cb4a900f9258/robolectric/src/main/java/org/robolectric/android/internal/AndroidTestEnvironment.java#L376-L388
+            Class.forName("android.app.AppCompatCallbacks").apply {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {
+                    getDeclaredMethod("install", longArrayClass, longArrayClass).also { it.isAccessible = true }(null, emptyLongArray, emptyLongArray)
+                } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                    getDeclaredMethod("install", longArrayClass).also { it.isAccessible = true }(null, emptyLongArray)
+                }
+            }
+
             val ipcInterface = PatcherProcess(appContext)
 
             appContext.sendBroadcast(Intent().apply {

app/src/main/java/app/revanced/manager/ui/screen/BundleListScreen.kt

@@ -4,6 +4,7 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.lazy.items
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.snapshots.SnapshotStateList
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -19,8 +20,10 @@ fun BundleListScreen(
     selectedSources: SnapshotStateList<PatchBundleSource>,
     bundlesSelectable: Boolean,
 ) {
-    val sortedSources = sources.sortedBy {
-        it.state.value.patchBundleOrNull()?.patches?.size
+    val sortedSources = remember(sources) {
+        sources.sortedByDescending { source ->
+            source.state.value.patchBundleOrNull()?.patches?.size ?: 0
+        }
     }
 
     LazyColumnWithScrollbar(

app/src/main/java/app/revanced/manager/ui/screen/SettingsScreen.kt

@@ -41,6 +41,11 @@ private val settingsSections = listOf(
         R.string.advanced_description,
         Icons.Outlined.Tune
     ) to Settings.Advanced,
+    Triple(
+        R.string.developer_options,
+        R.string.developer_options_description,
+        Icons.Outlined.Code
+    ) to Settings.DeveloperOptions,
     Triple(
         R.string.about,
         R.string.app_name,

app/src/main/java/app/revanced/manager/ui/screen/settings/AboutSettingsScreen.kt

@@ -126,11 +126,6 @@ fun AboutSettingsScreen(
                 navigate(Settings.Contributors)
             }
         ),
-        Triple(
-            stringResource(R.string.developer_options),
-            stringResource(R.string.developer_options_description),
-            third = { navigate(Settings.DeveloperOptions) }
-        ),
         Triple(
             stringResource(R.string.opensource_licenses),
             stringResource(R.string.opensource_licenses_description),

app/src/main/java/app/revanced/manager/ui/screen/settings/AdvancedSettingsScreen.kt

@@ -112,20 +112,6 @@ fun AdvancedSettingsScreen(
                 }
             )
 
-            GroupHeader(stringResource(R.string.patcher))
-            BooleanItem(
-                preference = vm.prefs.useProcessRuntime,
-                coroutineScope = vm.viewModelScope,
-                headline = R.string.process_runtime,
-                description = R.string.process_runtime_description,
-            )
-            IntegerItem(
-                preference = vm.prefs.patcherProcessMemoryLimit,
-                coroutineScope = vm.viewModelScope,
-                headline = R.string.process_runtime_memory_limit,
-                description = R.string.process_runtime_memory_limit_description,
-            )
-
             GroupHeader(stringResource(R.string.safeguards))
             SafeguardBooleanItem(
                 preference = vm.prefs.disablePatchVersionCompatCheck,
@@ -156,6 +142,20 @@ fun AdvancedSettingsScreen(
                 confirmationText = R.string.patch_selection_safeguard_confirmation
             )
 
+            GroupHeader(stringResource(R.string.patcher))
+            BooleanItem(
+                preference = vm.prefs.useProcessRuntime,
+                coroutineScope = vm.viewModelScope,
+                headline = R.string.process_runtime,
+                description = R.string.process_runtime_description,
+            )
+            IntegerItem(
+                preference = vm.prefs.patcherProcessMemoryLimit,
+                coroutineScope = vm.viewModelScope,
+                headline = R.string.process_runtime_memory_limit,
+                description = R.string.process_runtime_memory_limit_description,
+            )
+
             GroupHeader(stringResource(R.string.debugging))
             val exportDebugLogsLauncher =
                 rememberLauncherForActivityResult(ActivityResultContracts.CreateDocument("text/plain")) {

app/src/main/java/app/revanced/manager/ui/viewmodel/GeneralSettingsViewModel.kt

@@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import app.revanced.manager.domain.manager.PreferencesManager
 import app.revanced.manager.ui.theme.Theme
+import app.revanced.manager.util.resetListItemColorsCached
 import kotlinx.coroutines.launch
 
 class GeneralSettingsViewModel(
@@ -11,5 +12,6 @@ class GeneralSettingsViewModel(
 ) : ViewModel() {
     fun setTheme(theme: Theme) = viewModelScope.launch {
         prefs.theme.update(theme)
+        resetListItemColorsCached()
     }
 }

app/src/main/java/app/revanced/manager/util/Util.kt

@@ -180,6 +180,10 @@ fun LocalDateTime.relativeTime(context: Context): String {
 
 private var transparentListItemColorsCached: ListItemColors? = null
 
+fun resetListItemColorsCached() {
+    transparentListItemColorsCached = null
+}
+
 /**
  * The default ListItem colors, but with [ListItemColors.containerColor] set to [Color.Transparent].
  */

settings.gradle.kts

@@ -1,19 +1,16 @@
 pluginManagement {
     repositories {
-        gradlePluginPortal()
-        google()
         mavenCentral()
-        maven("https://jitpack.io")
-        mavenLocal()
+        google()
+        gradlePluginPortal()
     }
 }
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {
-        google()
         mavenCentral()
+        google()
         maven("https://jitpack.io")
-        mavenLocal()
         maven {
             // A repository must be specified for some reason. "registry" is a dummy.
             url = uri("https://maven.pkg.github.com/revanced/registry")
@@ -24,5 +21,6 @@ dependencyResolutionManagement {
         }
     }
 }
+
 rootProject.name = "ReVanced Manager"
 include(":app")