feat: Improve root installation

2026-01-11 21:56:17 +00:00 · 2025-12-26 01:07:58 +01:00
63 changed files with 913 additions and 1311 deletions
--- a/.github/workflows/pull_strings.yml
+++ b/.github/workflows/pull_strings.yml
@@ -1,43 +0,0 @@
-name: Pull strings
-
-on:
-  schedule:
-    - cron: "0 0 * * 0"
-  workflow_dispatch:
-
-jobs:
-  pull:
-    name: Pull strings
-    permissions:
-      contents: write
-      pull-requests: write
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v5
-        with:
-          ref: dev
-          clean: true
-
-      - name: Pull strings
-        uses: crowdin/github-action@v2
-        with:
-          config: crowdin.yml
-          upload_sources: false
-          download_translations: true
-          skip_ref_checkout: true
-          localization_branch_name: feat/translations
-          create_pull_request: false
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
-          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
-
-      - name: Open pull request
-        if: github.event_name == 'workflow_dispatch'
-        uses: repo-sync/pull-request@v2
-        with:
-          source_branch: feat/translations
-          destination_branch: dev
-          pr_title: "chore: Sync translations"
-          pr_body: "Sync translations from [crowdin.com/project/revanced](https://crowdin.com/project/revanced)"
--- a/.github/workflows/push_strings.yml
+++ b/.github/workflows/push_strings.yml
@@ -1,26 +0,0 @@
-name: Push strings
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - dev
-    paths:
-      - app/src/main/res/values/strings.xml
-
-jobs:
-  push:
-    name: Push strings
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v5
-
-      - name: Push strings
-        uses: crowdin/github-action@v2
-        with:
-          config: crowdin.yml
-          upload_sources: true
-        env:
-          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
-          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
--- a/api/api/api.api
+++ b/api/api/api.api
@@ -24,6 +24,14 @@ public final class app/revanced/manager/plugin/downloader/DownloadUrl : android/
 	public final fun writeToParcel (Landroid/os/Parcel;I)V
 }

+public final class app/revanced/manager/plugin/downloader/DownloadUrl$Creator : android/os/Parcelable$Creator {
+	public fun <init> ()V
+	public final fun createFromParcel (Landroid/os/Parcel;)Lapp/revanced/manager/plugin/downloader/DownloadUrl;
+	public synthetic fun createFromParcel (Landroid/os/Parcel;)Ljava/lang/Object;
+	public final fun newArray (I)[Lapp/revanced/manager/plugin/downloader/DownloadUrl;
+	public synthetic fun newArray (I)[Ljava/lang/Object;
+}
+
 public final class app/revanced/manager/plugin/downloader/Downloader {
 	public static final field $stable I
 }
@@ -77,6 +85,14 @@ public final class app/revanced/manager/plugin/downloader/Package : android/os/P
 	public final fun writeToParcel (Landroid/os/Parcel;I)V
 }

+public final class app/revanced/manager/plugin/downloader/Package$Creator : android/os/Parcelable$Creator {
+	public fun <init> ()V
+	public final fun createFromParcel (Landroid/os/Parcel;)Lapp/revanced/manager/plugin/downloader/Package;
+	public synthetic fun createFromParcel (Landroid/os/Parcel;)Ljava/lang/Object;
+	public final fun newArray (I)[Lapp/revanced/manager/plugin/downloader/Package;
+	public synthetic fun newArray (I)[Ljava/lang/Object;
+}
+
 public abstract interface annotation class app/revanced/manager/plugin/downloader/PluginHostApi : java/lang/annotation/Annotation {
 }

@@ -143,6 +159,14 @@ public abstract class app/revanced/manager/plugin/downloader/webview/IWebViewEve
 	public fun onTransact (ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
 }

+public final class app/revanced/manager/plugin/downloader/webview/WebViewActivity$Parameters$Creator : android/os/Parcelable$Creator {
+	public fun <init> ()V
+	public final fun createFromParcel (Landroid/os/Parcel;)Lapp/revanced/manager/plugin/downloader/webview/WebViewActivity$Parameters;
+	public synthetic fun createFromParcel (Landroid/os/Parcel;)Ljava/lang/Object;
+	public final fun newArray (I)[Lapp/revanced/manager/plugin/downloader/webview/WebViewActivity$Parameters;
+	public synthetic fun newArray (I)[Ljava/lang/Object;
+}
+
 public abstract interface class app/revanced/manager/plugin/downloader/webview/WebViewCallbackScope : app/revanced/manager/plugin/downloader/Scope {
 	public abstract fun finish (Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public abstract fun load (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
--- a/api/build.gradle.kts
+++ b/api/build.gradle.kts
@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-
 plugins {
    alias(libs.plugins.android.library)
    alias(libs.plugins.kotlin.android)
@@ -19,16 +17,9 @@ dependencies {
    implementation(libs.appcompat)
 }

-kotlin {
-    jvmToolchain(17)
-    compilerOptions {
-        jvmTarget = JvmTarget.JVM_17
-    }
-}
-
 android {
    namespace = "app.revanced.manager.plugin.downloader"
-    compileSdk = 36
+    compileSdk = 35

    defaultConfig {
        minSdk = 26
@@ -51,6 +42,10 @@ android {
        targetCompatibility = JavaVersion.VERSION_17
    }

+    kotlinOptions {
+        jvmTarget = "17"
+    }
+
    buildFeatures {
        aidl = true
    }
--- a/app/CHANGELOG.md
+++ b/app/CHANGELOG.md
@@ -1,57 +1,3 @@
-# app [1.26.0-dev.20](https://github.com/ReVanced/revanced-manager/compare/v1.26.0-dev.19...v1.26.0-dev.20) (2026-01-09)
-
-
-### Bug Fixes
-
-* Save FAB freaking out in select patches screen ([4c0b6b0](https://github.com/ReVanced/revanced-manager/commit/4c0b6b02e95a8d6f655bcf5c25493b1f9a4a4dcd))
-
-# app [1.26.0-dev.19](https://github.com/ReVanced/revanced-manager/compare/v1.26.0-dev.18...v1.26.0-dev.19) (2026-01-08)
-
-
-### Bug Fixes
-
-* **locales:** use buildconfig instead of generating kt file ([72b1db9](https://github.com/ReVanced/revanced-manager/commit/72b1db9a2f33ab5d5fffd8ba83c05901eff19bea))
-
-# app [1.26.0-dev.18](https://github.com/ReVanced/revanced-manager/compare/v1.26.0-dev.17...v1.26.0-dev.18) (2026-01-08)
-
-
-### Bug Fixes
-
-* Prevent trailing comma when no locales are generated ([b16931c](https://github.com/ReVanced/revanced-manager/commit/b16931ca79d5ce4d17c75f6dd3bf6f976b8ff7be))
-
-
-### Features
-
-* Add language settings ([#2913](https://github.com/ReVanced/revanced-manager/issues/2913)) ([df31b39](https://github.com/ReVanced/revanced-manager/commit/df31b39cc8c1fbf00bc3301468e8e7e4b283caf2))
-
-# app [1.26.0-dev.17](https://github.com/ReVanced/revanced-manager/compare/v1.26.0-dev.16...v1.26.0-dev.17) (2026-01-06)
-
-
-### Bug Fixes
-
-* allow updating patches on metered networks ([9d9a0e8](https://github.com/ReVanced/revanced-manager/commit/9d9a0e81dbc9e73e6e3181f6bea9cabb69e49ea8))
-
-# app [1.26.0-dev.16](https://github.com/ReVanced/revanced-manager/compare/v1.26.0-dev.15...v1.26.0-dev.16) (2025-12-30)
-
-
-### Features
-
-* Show patches as individual steps in patcher screen ([#2889](https://github.com/ReVanced/revanced-manager/issues/2889)) ([11dd6e4](https://github.com/ReVanced/revanced-manager/commit/11dd6e4064099427a8c9bc6f225a19412e5c70e2))
-
-# app [1.26.0-dev.15](https://github.com/ReVanced/revanced-manager/compare/v1.26.0-dev.14...v1.26.0-dev.15) (2025-12-29)
-
-
-### Bug Fixes
-
-* install dialog getting stuck ([#2900](https://github.com/ReVanced/revanced-manager/issues/2900)) ([18a4df9](https://github.com/ReVanced/revanced-manager/commit/18a4df9af9cac120fdb8e4ff7aadd2e2a8d5c1a6))
-
-# app [1.26.0-dev.14](https://github.com/ReVanced/revanced-manager/compare/v1.26.0-dev.13...v1.26.0-dev.14) (2025-12-28)
-
-
-### Bug Fixes
-
-* Update selected patch count when SelectionState changes ([#2896](https://github.com/ReVanced/revanced-manager/issues/2896)) ([0d26df0](https://github.com/ReVanced/revanced-manager/commit/0d26df03f463195dae550240c7f652680763079c))
-
 # app [1.26.0-dev.13](https://github.com/ReVanced/revanced-manager/compare/v1.26.0-dev.12...v1.26.0-dev.13) (2025-12-17)


--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,7 +1,4 @@
-import com.mikepenz.aboutlibraries.plugin.DuplicateMode
-import com.mikepenz.aboutlibraries.plugin.DuplicateRule
 import io.github.z4kn4fein.semver.toVersion
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import kotlin.random.Random

 plugins {
@@ -12,7 +9,6 @@ plugins {
    alias(libs.plugins.compose.compiler)
    alias(libs.plugins.devtools)
    alias(libs.plugins.about.libraries)
-    alias(libs.plugins.about.libraries.android)
    signing
 }

@@ -85,8 +81,7 @@ dependencies {
    implementation(libs.koin.workmanager)

    // Licenses
-    implementation(libs.about.libraries.core)
-    implementation(libs.about.libraries.m3)
+    implementation(libs.about.libraries)

    // Ktor
    implementation(libs.ktor.core)
@@ -113,10 +108,6 @@ dependencies {

    // Compose Icons
    implementation(libs.compose.icons.fontawesome)
-
-    // Ackpine
-    implementation(libs.ackpine.core)
-    implementation(libs.ackpine.ktx)
 }

 buildscript {
@@ -131,7 +122,7 @@ buildscript {

 android {
    namespace = "app.revanced.manager"
-    compileSdk = 36
+    compileSdk = 35
    buildToolsVersion = "35.0.1"

    defaultConfig {
@@ -148,25 +139,13 @@ android {
                    (preRelease?.substringAfterLast('.')?.toInt() ?: 99)
        }
        vectorDrawables.useSupportLibrary = true
-
-        val resDir = file("src/main/res")
-        val locales = resDir.listFiles()
-            .orEmpty()
-            //noinspection WrongGradleMethod
-            .filter { it.isDirectory && it.name.matches(Regex("values-[a-z]{2}(-r[A-Z]{2})?")) }
-            //noinspection WrongGradleMethod
-            .map { it.name.removePrefix("values-").replace("-r", "-") }
-            .sorted()
-            //noinspection WrongGradleMethod
-            .joinToString(prefix = "{", separator = ",", postfix = "}") { "\"$it\"" }
-
-        buildConfigField("String[]", "SUPPORTED_LOCALES", locales)
    }

    buildTypes {
        debug {
            applicationIdSuffix = ".debug"
            resValue("string", "app_name", "ReVanced Manager (Debug)")
+            isPseudoLocalesEnabled = true

            buildConfigField("long", "BUILD_ID", "${Random.nextLong()}L")
        }
@@ -238,14 +217,20 @@ android {
        arg("room.schemaLocation", "$projectDir/schemas")
    }

+    kotlinOptions {
+        jvmTarget = "17"
+    }
+
    buildFeatures {
        compose = true
        aidl = true
        buildConfig = true
    }

-    androidResources {
-        generateLocaleConfig = true
+    android {
+        androidResources {
+            generateLocaleConfig = true
+        }
    }

    externalNativeBuild {
@@ -258,18 +243,6 @@ android {

 kotlin {
    jvmToolchain(17)
-    compilerOptions {
-        jvmTarget = JvmTarget.JVM_17
-    }
-}
-
-aboutLibraries {
-    library {
-        // Enable the duplication mode, allows to merge, or link dependencies which relate
-        duplicationMode = DuplicateMode.MERGE
-        // Configure the duplication rule, to match "duplicates" with
-        duplicationRule = DuplicateRule.EXACT
-    }
 }

 tasks {
--- a/app/gradle.properties
+++ b/app/gradle.properties
@@ -1 +1 @@
-version = 1.26.0-dev.20
+version = 1.26.0-dev.13
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -51,6 +51,9 @@

        <activity android:name=".plugin.downloader.webview.WebViewActivity" android:exported="false" android:theme="@style/Theme.WebViewActivity" />

+        <service android:name=".service.InstallService" />
+        <service android:name=".service.UninstallService" />
+
        <service
            android:name="androidx.work.impl.foreground.SystemForegroundService"
            android:foregroundServiceType="specialUse"
@@ -72,15 +75,5 @@
                    android:value="androidx.startup"
                    tools:node="remove" />
        </provider>
-
-        <provider
-            android:name="androidx.startup.InitializationProvider"
-            android:authorities="${applicationId}.androidx-startup"
-            android:exported="false"
-            tools:node="merge">
-            <meta-data
-                android:name="ru.solrudev.ackpine.AckpineInitializer"
-                tools:node="remove" />
-        </provider>
    </application>
 </manifest>
--- a/app/src/main/aidl/app/revanced/manager/patcher/ProgressEventParcel.aidl
+++ b/app/src/main/aidl/app/revanced/manager/patcher/ProgressEventParcel.aidl
@@ -1,4 +0,0 @@
-// ProgressEventParcel.aidl
-package app.revanced.manager.patcher;
-
-parcelable ProgressEventParcel;
--- a/app/src/main/aidl/app/revanced/manager/patcher/runtime/process/IPatcherEvents.aidl
+++ b/app/src/main/aidl/app/revanced/manager/patcher/runtime/process/IPatcherEvents.aidl
@@ -1,12 +1,11 @@
 // IPatcherEvents.aidl
 package app.revanced.manager.patcher.runtime.process;

-import app.revanced.manager.patcher.ProgressEventParcel;
-
 // Interface for sending events back to the main app process.
 oneway interface IPatcherEvents {
    void log(String level, String msg);
-    void event(in ProgressEventParcel event);
+    void patchSucceeded();
+    void progress(String name, String state, String msg);
    // The patching process has ended. The exceptionStackTrace is null if it finished successfully.
    void finished(String exceptionStackTrace);
 }
--- a/app/src/main/java/app/revanced/manager/MainActivity.kt
+++ b/app/src/main/java/app/revanced/manager/MainActivity.kt
@@ -3,11 +3,11 @@ package app.revanced.manager
 import android.content.ActivityNotFoundException
 import android.os.Bundle
 import android.os.Parcelable
+import androidx.activity.ComponentActivity
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.activity.result.contract.ActivityResultContracts
-import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.animation.slideInHorizontally
 import androidx.compose.animation.slideOutHorizontally
@@ -59,10 +59,11 @@ import app.revanced.manager.ui.viewmodel.SelectedAppInfoViewModel
 import app.revanced.manager.util.EventEffect
 import kotlinx.coroutines.launch
 import org.koin.androidx.compose.koinViewModel
+import org.koin.androidx.compose.navigation.koinNavViewModel
 import org.koin.core.parameter.parametersOf
 import org.koin.androidx.viewmodel.ext.android.getViewModel as getActivityViewModel

-class MainActivity : AppCompatActivity() {
+class MainActivity : ComponentActivity() {
    @ExperimentalAnimationApi
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
@@ -184,7 +185,7 @@ private fun ReVancedManager(vm: MainViewModel) {
                val data =
                    parentBackStackEntry.getComplexArg<SelectedApplicationInfo.ViewModelParams>()
                val viewModel =
-                    koinViewModel<SelectedAppInfoViewModel>(viewModelStoreOwner = parentBackStackEntry) {
+                    koinNavViewModel<SelectedAppInfoViewModel>(viewModelStoreOwner = parentBackStackEntry) {
                        parametersOf(data)
                    }

@@ -225,7 +226,7 @@ private fun ReVancedManager(vm: MainViewModel) {
            composable<SelectedApplicationInfo.PatchesSelector> {
                val data =
                    it.getComplexArg<SelectedApplicationInfo.PatchesSelector.ViewModelParams>()
-                val selectedAppInfoVm = koinViewModel<SelectedAppInfoViewModel>(
+                val selectedAppInfoVm = koinNavViewModel<SelectedAppInfoViewModel>(
                    viewModelStoreOwner = navController.navGraphEntry(it)
                )

@@ -242,7 +243,7 @@ private fun ReVancedManager(vm: MainViewModel) {
            composable<SelectedApplicationInfo.RequiredOptions> {
                val data =
                    it.getComplexArg<SelectedApplicationInfo.PatchesSelector.ViewModelParams>()
-                val selectedAppInfoVm = koinViewModel<SelectedAppInfoViewModel>(
+                val selectedAppInfoVm = koinNavViewModel<SelectedAppInfoViewModel>(
                    viewModelStoreOwner = navController.navGraphEntry(it)
                )

--- a/app/src/main/java/app/revanced/manager/ManagerApplication.kt
+++ b/app/src/main/java/app/revanced/manager/ManagerApplication.kt
@@ -48,8 +48,7 @@ class ManagerApplication : Application() {
                workerModule,
                viewModelModule,
                databaseModule,
-                rootModule,
-                ackpineModule
+                rootModule
            )
        }

--- a/app/src/main/java/app/revanced/manager/data/platform/NetworkInfo.kt
+++ b/app/src/main/java/app/revanced/manager/data/platform/NetworkInfo.kt
@@ -15,5 +15,5 @@ class NetworkInfo(app: Application) {
    /**
     * Returns true if it is safe to download large files.
     */
-    fun isSafe(ignoreMetered: Boolean) = isConnected() && (ignoreMetered || isUnmetered())
+    fun isSafe() = isConnected() && isUnmetered()
 }
--- a/app/src/main/java/app/revanced/manager/di/AckpineModule.kt
+++ b/app/src/main/java/app/revanced/manager/di/AckpineModule.kt
@@ -1,19 +0,0 @@
-package app.revanced.manager.di
-
-import android.content.Context
-import org.koin.android.ext.koin.androidContext
-import org.koin.dsl.module
-import ru.solrudev.ackpine.installer.PackageInstaller
-import ru.solrudev.ackpine.uninstaller.PackageUninstaller
-
-val ackpineModule = module {
-    fun provideInstaller(context: Context) = PackageInstaller.getInstance(context)
-    fun provideUninstaller(context: Context) = PackageUninstaller.getInstance(context)
-
-    single {
-        provideInstaller(androidContext())
-    }
-    single {
-        provideUninstaller(androidContext())
-    }
-}
--- a/app/src/main/java/app/revanced/manager/di/ViewModelModule.kt
+++ b/app/src/main/java/app/revanced/manager/di/ViewModelModule.kt
@@ -1,7 +1,7 @@
 package app.revanced.manager.di

 import app.revanced.manager.ui.viewmodel.*
-import org.koin.core.module.dsl.*
+import org.koin.androidx.viewmodel.dsl.viewModelOf
 import org.koin.dsl.module

 val viewModelModule = module {
--- a/app/src/main/java/app/revanced/manager/domain/installer/RootInstaller.kt
+++ b/app/src/main/java/app/revanced/manager/domain/installer/RootInstaller.kt
@@ -54,7 +54,11 @@ class RootInstaller(
        await()
    }

-    suspend fun execute(vararg commands: String) = getShell().newJob().add(*commands).exec()
+    suspend fun execute(vararg commands: String): Shell.Result {
+        val stdout = mutableListOf<String>()
+        val stderr = mutableListOf<String>()
+        return getShell().newJob().add(*commands).to(stdout, stderr).exec()
+    }

    fun hasRootAccess() = Shell.isAppGrantedRoot() ?: false

@@ -108,20 +112,15 @@ class RootInstaller(
        unmount(packageName)

        stockAPK?.let { stockApp ->
-            pm.getPackageInfo(packageName)?.let { packageInfo ->
-                // TODO: get user id programmatically
-                if (pm.getVersionCode(packageInfo) <= pm.getVersionCode(
-                        pm.getPackageInfo(patchedAPK)
-                            ?: error("Failed to get package info for patched app")
-                    )
-                )
-                    execute("pm uninstall -k --user 0 $packageName").assertSuccess("Failed to uninstall stock app")
-            }
+            // TODO: get user id programmatically
+            execute("pm uninstall -k --user 0 $packageName")

-            execute("pm install \"${stockApp.absolutePath}\"").assertSuccess("Failed to install stock app")
+            execute("pm install -r -d --user 0 \"${stockApp.absolutePath}\"")
+                .assertSuccess("Failed to install stock app")
        }

-        remoteFS.getFile(modulePath).mkdir()
+        remoteFS.getFile(modulePath).mkdirs()
+            .also { if (!it) throw Exception("Failed to create module directory") }

        listOf(
            "service.sh",
@@ -142,7 +141,6 @@ class RootInstaller(
        }

        "$modulePath/$packageName.apk".let { apkPath ->
-
            remoteFS.getFile(patchedAPK.absolutePath)
                .also { if (!it.exists()) throw Exception("File doesn't exist") }
                .newInputStream().use { inputStream ->
@@ -173,9 +171,43 @@ class RootInstaller(
        const val modulesPath = "/data/adb/modules"

        private fun Shell.Result.assertSuccess(errorMessage: String) {
-            if (!isSuccess) throw Exception(errorMessage)
+            if (!isSuccess) {
+                throw ShellCommandException(
+                    errorMessage,
+                    code,
+                    out,
+                    err
+                )
+            }
        }
    }
 }

+class ShellCommandException(
+    val userMessage: String,
+    val exitCode: Int,
+    val stdout: List<String>,
+    val stderr: List<String>
+) : Exception(format(userMessage, exitCode, stdout, stderr)) {
+    companion object {
+        private fun format(message: String, exitCode: Int, stdout: List<String>, stderr: List<String>): String =
+            buildString {
+                appendLine(message)
+                appendLine("Exit code: $exitCode")
+
+                val output = stdout.filter { it.isNotBlank() }
+                val errors = stderr.filter { it.isNotBlank() }
+
+                if (output.isNotEmpty()) {
+                    appendLine("stdout:")
+                    output.forEach(::appendLine)
+                }
+                if (errors.isNotEmpty()) {
+                    appendLine("stderr:")
+                    errors.forEach(::appendLine)
+                }
+            }
+    }
+}
+
 class RootServiceException : Exception("Root not available")
--- a/app/src/main/java/app/revanced/manager/domain/manager/PreferencesManager.kt
+++ b/app/src/main/java/app/revanced/manager/domain/manager/PreferencesManager.kt
@@ -34,6 +34,4 @@ class PreferencesManager(
    val acknowledgedDownloaderPlugins = stringSetPreference("acknowledged_downloader_plugins", emptySet())

    val showDeveloperSettings = booleanPreference("show_developer_settings", context.isDebuggable)
-
-    val allowMeteredNetworks = booleanPreference("allow_metered_networks", false)
 }
--- a/app/src/main/java/app/revanced/manager/domain/repository/PatchBundleRepository.kt
+++ b/app/src/main/java/app/revanced/manager/domain/repository/PatchBundleRepository.kt
@@ -286,29 +286,28 @@ class PatchBundleRepository(
            State(sources.toPersistentMap(), info.toPersistentMap())
        }

-    suspend fun createLocal(createStream: suspend () -> InputStream) =
-        dispatchAction("Add bundle") {
-            with(createEntity("", SourceInfo.Local).load() as LocalPatchBundle) {
-                try {
-                    createStream().use { patches -> replace(patches) }
-                } catch (e: Exception) {
-                    if (e is CancellationException) throw e
-                    Log.e(tag, "Got exception while importing bundle", e)
-                    withContext(Dispatchers.Main) {
-                        app.toast(app.getString(R.string.patches_replace_fail, e.simpleMessage()))
-                    }
-
-                    deleteLocalFile()
+    suspend fun createLocal(createStream: suspend () -> InputStream) = dispatchAction("Add bundle") {
+        with(createEntity("", SourceInfo.Local).load() as LocalPatchBundle) {
+            try {
+                createStream().use { patches -> replace(patches) }
+            } catch (e: Exception) {
+                if (e is CancellationException) throw e
+                Log.e(tag, "Got exception while importing bundle", e)
+                withContext(Dispatchers.Main) {
+                    app.toast(app.getString(R.string.patches_replace_fail, e.simpleMessage()))
                }
-            }

-            doReload()
+                deleteLocalFile()
+            }
        }

+        doReload()
+    }
+
    suspend fun createRemote(url: String, autoUpdate: Boolean) =
        dispatchAction("Add bundle ($url)") { state ->
            val src = createEntity("", SourceInfo.from(url), autoUpdate).load() as RemotePatchBundle
-            update(src, force = true)
+            update(src)
            state.copy(sources = state.sources.put(src.uid, src))
        }

@@ -330,38 +329,32 @@ class PatchBundleRepository(
            state.copy(sources = state.sources.put(uid, newSrc))
        }

-    suspend fun update(
-        vararg sources: RemotePatchBundle,
-        showToast: Boolean = false,
-        force: Boolean = false
-    ) {
+    suspend fun update(vararg sources: RemotePatchBundle, showToast: Boolean = false) {
        val uids = sources.map { it.uid }.toSet()
-        store.dispatch(Update(showToast = showToast, force = force) { it.uid in uids })
+        store.dispatch(Update(showToast = showToast) { it.uid in uids })
    }

-    suspend fun redownloadRemoteBundles() = store.dispatch(Update(force = true, redownload = true))
+    suspend fun redownloadRemoteBundles() = store.dispatch(Update(force = true))

    /**
     * Updates all bundles that should be automatically updated.
     */
-    suspend fun updateCheck() =
-        store.dispatch(Update(force = prefs.allowMeteredNetworks.get()) { it.autoUpdate })
+    suspend fun updateCheck() = store.dispatch(Update { it.autoUpdate })

    private inner class Update(
        private val force: Boolean = false,
-        private val redownload: Boolean = false,
        private val showToast: Boolean = false,
        private val predicate: (bundle: RemotePatchBundle) -> Boolean = { true },
    ) : Action<State> {
        private suspend fun toast(@StringRes id: Int, vararg args: Any?) =
            withContext(Dispatchers.Main) { app.toast(app.getString(id, *args)) }

-        override fun toString() = if (redownload) "Redownload remote bundles" else "Update check"
+        override fun toString() = if (force) "Redownload remote bundles" else "Update check"

        override suspend fun ActionContext.execute(
            current: State
        ) = coroutineScope {
-            if (!networkInfo.isSafe(force)) {
+            if (!networkInfo.isSafe()) {
                Log.d(tag, "Skipping update check because the network is down or metered.")
                return@coroutineScope current
            }
@@ -374,7 +367,7 @@ class PatchBundleRepository(
                        Log.d(tag, "Updating patch bundle: ${it.name}")

                        val newVersion = with(it) {
-                            if (redownload) downloadLatest() else update()
+                            if (force) downloadLatest() else update()
                        } ?: return@async null

                        it to newVersion
--- a/app/src/main/java/app/revanced/manager/network/service/HttpService.kt
+++ b/app/src/main/java/app/revanced/manager/network/service/HttpService.kt
@@ -16,11 +16,8 @@ import io.ktor.http.isSuccess
 import io.ktor.utils.io.ByteReadChannel
 import io.ktor.utils.io.core.isNotEmpty
 import io.ktor.utils.io.core.readBytes
-import io.ktor.utils.io.exhausted
-import io.ktor.utils.io.readRemaining
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import kotlinx.io.asSink
 import kotlinx.serialization.json.Json
 import java.io.File
 import java.io.OutputStream
@@ -72,12 +69,14 @@ class HttpService(
    ) {
        http.prepareGet(builder).execute { httpResponse ->
            if (httpResponse.status.isSuccess()) {
+                val channel: ByteReadChannel = httpResponse.body()
                withContext(Dispatchers.IO) {
-                    val channel: ByteReadChannel = httpResponse.body()
-                    val sink = outputStream.asSink()
-                    while (!channel.exhausted()) {
+                    while (!channel.isClosedForRead) {
                        val packet = channel.readRemaining(DEFAULT_BUFFER_SIZE.toLong())
-                        packet.transferTo(sink)
+                        while (packet.isNotEmpty) {
+                            val bytes = packet.readBytes()
+                            outputStream.write(bytes)
+                        }
                    }
                }

--- a/app/src/main/java/app/revanced/manager/patcher/PatcherProgress.kt
+++ b/app/src/main/java/app/revanced/manager/patcher/PatcherProgress.kt
@@ -1,78 +0,0 @@
-package app.revanced.manager.patcher
-
-import android.os.Parcelable
-import kotlinx.parcelize.Parcelize
-
-
-@Parcelize
-sealed class ProgressEvent : Parcelable {
-    abstract val stepId: StepId?
-
-    data class Started(override val stepId: StepId) : ProgressEvent()
-
-    data class Progress(
-        override val stepId: StepId,
-        val current: Long? = null,
-        val total: Long? = null,
-        val message: String? = null,
-    ) : ProgressEvent()
-
-    data class Completed(
-        override val stepId: StepId,
-    ) : ProgressEvent()
-
-    data class Failed(
-        override val stepId: StepId?,
-        val error: RemoteError,
-    ) : ProgressEvent()
-}
-
-/**
- * Parcelable wrapper for [ProgressEvent].
- *
- * Required because AIDL does not support sealed classes.
- */
-@Parcelize
-data class ProgressEventParcel(val event: ProgressEvent) : Parcelable
-
-fun ProgressEventParcel.toEvent(): ProgressEvent = event
-fun ProgressEvent.toParcel(): ProgressEventParcel = ProgressEventParcel(this)
-
-@Parcelize
-sealed class StepId : Parcelable {
-    data object DownloadAPK : StepId()
-    data object LoadPatches : StepId()
-    data object ReadAPK : StepId()
-    data object ExecutePatches : StepId()
-    data class ExecutePatch(val index: Int) : StepId()
-    data object WriteAPK : StepId()
-    data object SignAPK : StepId()
-}
-
-@Parcelize
-data class RemoteError(
-    val type: String,
-    val message: String?,
-    val stackTrace: String,
-) : Parcelable
-
-fun Exception.toRemoteError() = RemoteError(
-    type = this::class.java.name,
-    message = this.message,
-    stackTrace = this.stackTraceToString(),
-)
-
-
-inline fun <T> runStep(
-    stepId: StepId,
-    onEvent: (ProgressEvent) -> Unit,
-    block: () -> T,
-): T = try {
-    onEvent(ProgressEvent.Started(stepId))
-    val value = block()
-    onEvent(ProgressEvent.Completed(stepId))
-    value
-} catch (error: Exception) {
-    onEvent(ProgressEvent.Failed(stepId, error.toRemoteError()))
-    throw error
-}
--- a/app/src/main/java/app/revanced/manager/patcher/Session.kt
+++ b/app/src/main/java/app/revanced/manager/patcher/Session.kt
@@ -1,9 +1,10 @@
 package app.revanced.manager.patcher

+import android.content.Context
 import app.revanced.library.ApkUtils.applyTo
-import app.revanced.manager.patcher.Session.Companion.component1
-import app.revanced.manager.patcher.Session.Companion.component2
+import app.revanced.manager.R
 import app.revanced.manager.patcher.logger.Logger
+import app.revanced.manager.ui.model.State
 import app.revanced.patcher.Patcher
 import app.revanced.patcher.PatcherConfig
 import app.revanced.patcher.patch.Patch
@@ -21,10 +22,15 @@ class Session(
    cacheDir: String,
    frameworkDir: String,
    aaptPath: String,
+    private val androidContext: Context,
    private val logger: Logger,
    private val input: File,
-    private val onEvent: (ProgressEvent) -> Unit,
+    private val onPatchCompleted: suspend () -> Unit,
+    private val onProgress: (name: String?, state: State?, message: String?) -> Unit
 ) : Closeable {
+    private fun updateProgress(name: String? = null, state: State? = null, message: String? = null) =
+        onProgress(name, state, message)
+
    private val tempDir = File(cacheDir).resolve("patcher").also { it.mkdirs() }
    private val patcher = Patcher(
        PatcherConfig(
@@ -36,68 +42,86 @@ class Session(
    )

    private suspend fun Patcher.applyPatchesVerbose(selectedPatches: PatchList) {
+        var nextPatchIndex = 0
+
+        updateProgress(
+            name = androidContext.getString(R.string.executing_patch, selectedPatches[nextPatchIndex]),
+            state = State.RUNNING
+        )
+
        this().collect { (patch, exception) ->
-            val index = selectedPatches.indexOf(patch)
-            if (index == -1) return@collect
+            if (patch !in selectedPatches) return@collect

            if (exception != null) {
-                onEvent(
-                    ProgressEvent.Failed(
-                        StepId.ExecutePatch(index),
-                        exception.toRemoteError(),
-                    )
+                updateProgress(
+                    name = androidContext.getString(R.string.failed_to_execute_patch, patch.name),
+                    state = State.FAILED,
+                    message = exception.stackTraceToString()
                )
+
                logger.error("${patch.name} failed:")
                logger.error(exception.stackTraceToString())
                throw exception
            }

-            onEvent(
-                ProgressEvent.Completed(
-                    StepId.ExecutePatch(index),
+            nextPatchIndex++
+
+            onPatchCompleted()
+
+            selectedPatches.getOrNull(nextPatchIndex)?.let { nextPatch ->
+                updateProgress(
+                    name = androidContext.getString(R.string.executing_patch, nextPatch.name)
                )
-            )
+            }

            logger.info("${patch.name} succeeded")
        }
+
+        updateProgress(
+            state = State.COMPLETED,
+            name = androidContext.resources.getQuantityString(
+                R.plurals.patches_executed,
+                selectedPatches.size,
+                selectedPatches.size
+            )
+        )
    }

    suspend fun run(output: File, selectedPatches: PatchList) {
-        runStep(StepId.ExecutePatches, onEvent) {
-            java.util.logging.Logger.getLogger("").apply {
-                handlers.forEach {
-                    it.close()
-                    removeHandler(it)
-                }
+        updateProgress(state = State.COMPLETED) // Unpacking

-                addHandler(logger.handler)
+        java.util.logging.Logger.getLogger("").apply {
+            handlers.forEach {
+                it.close()
+                removeHandler(it)
            }

-            with(patcher) {
-                logger.info("Merging integrations")
-                this += selectedPatches.toSet()
-
-                logger.info("Applying patches...")
-                applyPatchesVerbose(selectedPatches.sortedBy { it.name })
-            }
+            addHandler(logger.handler)
        }

-        runStep(StepId.WriteAPK, onEvent) {
-            logger.info("Writing patched files...")
-            val result = patcher.get()
+        with(patcher) {
+            logger.info("Merging integrations")
+            this += selectedPatches.toSet()

-            val patched = tempDir.resolve("result.apk")
-            withContext(Dispatchers.IO) {
-                Files.copy(input.toPath(), patched.toPath(), StandardCopyOption.REPLACE_EXISTING)
-            }
-            result.applyTo(patched)
-
-            logger.info("Patched apk saved to $patched")
-
-            withContext(Dispatchers.IO) {
-                Files.move(patched.toPath(), output.toPath(), StandardCopyOption.REPLACE_EXISTING)
-            }
+            logger.info("Applying patches...")
+            applyPatchesVerbose(selectedPatches.sortedBy { it.name })
        }
+
+        logger.info("Writing patched files...")
+        val result = patcher.get()
+
+        val patched = tempDir.resolve("result.apk")
+        withContext(Dispatchers.IO) {
+            Files.copy(input.toPath(), patched.toPath(), StandardCopyOption.REPLACE_EXISTING)
+        }
+        result.applyTo(patched)
+
+        logger.info("Patched apk saved to $patched")
+
+        withContext(Dispatchers.IO) {
+            Files.move(patched.toPath(), output.toPath(), StandardCopyOption.REPLACE_EXISTING)
+        }
+        updateProgress(state = State.COMPLETED) // Saving
    }

    override fun close() {
--- a/app/src/main/java/app/revanced/manager/patcher/runtime/CoroutineRuntime.kt
+++ b/app/src/main/java/app/revanced/manager/patcher/runtime/CoroutineRuntime.kt
@@ -1,12 +1,11 @@
 package app.revanced.manager.patcher.runtime

 import android.content.Context
-import app.revanced.manager.patcher.ProgressEvent
 import app.revanced.manager.patcher.Session
-import app.revanced.manager.patcher.StepId
 import app.revanced.manager.patcher.logger.Logger
 import app.revanced.manager.patcher.patch.PatchBundle
-import app.revanced.manager.patcher.runStep
+import app.revanced.manager.patcher.worker.ProgressEventHandler
+import app.revanced.manager.ui.model.State
 import app.revanced.manager.util.Options
 import app.revanced.manager.util.PatchSelection
 import java.io.File
@@ -14,7 +13,7 @@ import java.io.File
 /**
 * Simple [Runtime] implementation that runs the patcher using coroutines.
 */
-class CoroutineRuntime(context: Context) : Runtime(context) {
+class CoroutineRuntime(private val context: Context) : Runtime(context) {
    override suspend fun execute(
        inputFile: String,
        outputFile: String,
@@ -22,50 +21,47 @@ class CoroutineRuntime(context: Context) : Runtime(context) {
        selectedPatches: PatchSelection,
        options: Options,
        logger: Logger,
-        onEvent: (ProgressEvent) -> Unit,
+        onPatchCompleted: suspend () -> Unit,
+        onProgress: ProgressEventHandler,
    ) {
-        val patchList = runStep(StepId.LoadPatches, onEvent) {
-            val selectedBundles = selectedPatches.keys
-            val bundles = bundles()
-            val uids = bundles.entries.associate { (key, value) -> value to key }
+        val selectedBundles = selectedPatches.keys
+        val bundles = bundles()
+        val uids = bundles.entries.associate { (key, value) -> value to key }

-            val allPatches =
-                PatchBundle.Loader.patches(bundles.values, packageName)
-                    .mapKeys { (b, _) -> uids[b]!! }
-                    .filterKeys { it in selectedBundles }
+        val allPatches =
+            PatchBundle.Loader.patches(bundles.values, packageName)
+                .mapKeys { (b, _) -> uids[b]!! }
+                .filterKeys { it in selectedBundles }

-            val patchList = selectedPatches.flatMap { (bundle, selected) ->
-                allPatches[bundle]?.filter { it.name in selected }
-                    ?: throw IllegalArgumentException("Patch bundle $bundle does not exist")
-            }
+        val patchList = selectedPatches.flatMap { (bundle, selected) ->
+            allPatches[bundle]?.filter { it.name in selected }
+                ?: throw IllegalArgumentException("Patch bundle $bundle does not exist")
+        }

-            // Set all patch options.
-            options.forEach { (bundle, bundlePatchOptions) ->
-                val patches = allPatches[bundle] ?: return@forEach
-                bundlePatchOptions.forEach { (patchName, configuredPatchOptions) ->
-                    val patchOptions = patches.single { it.name == patchName }.options
-                    configuredPatchOptions.forEach { (key, value) ->
-                        patchOptions[key] = value
-                    }
+        // Set all patch options.
+        options.forEach { (bundle, bundlePatchOptions) ->
+            val patches = allPatches[bundle] ?: return@forEach
+            bundlePatchOptions.forEach { (patchName, configuredPatchOptions) ->
+                val patchOptions = patches.single { it.name == patchName }.options
+                configuredPatchOptions.forEach { (key, value) ->
+                    patchOptions[key] = value
                }
            }
-
-            patchList
        }

-        val session = runStep(StepId.ReadAPK, onEvent) {
-            Session(
-                cacheDir,
-                frameworkPath,
-                aaptPath,
-                logger,
-                File(inputFile),
-                onEvent,
-            )
-        }
+        onProgress(null, State.COMPLETED, null) // Loading patches

-        session.use { s ->
-            s.run(
+        Session(
+            cacheDir,
+            frameworkPath,
+            aaptPath,
+            context,
+            logger,
+            File(inputFile),
+            onPatchCompleted = onPatchCompleted,
+            onProgress
+        ).use { session ->
+            session.run(
                File(outputFile),
                patchList
            )
--- a/app/src/main/java/app/revanced/manager/patcher/runtime/ProcessRuntime.kt
+++ b/app/src/main/java/app/revanced/manager/patcher/runtime/ProcessRuntime.kt
@@ -10,13 +10,12 @@ import app.revanced.manager.BuildConfig
 import app.revanced.manager.patcher.runtime.process.IPatcherEvents
 import app.revanced.manager.patcher.runtime.process.IPatcherProcess
 import app.revanced.manager.patcher.LibraryResolver
-import app.revanced.manager.patcher.ProgressEvent
-import app.revanced.manager.patcher.ProgressEventParcel
 import app.revanced.manager.patcher.logger.Logger
 import app.revanced.manager.patcher.runtime.process.Parameters
 import app.revanced.manager.patcher.runtime.process.PatchConfiguration
 import app.revanced.manager.patcher.runtime.process.PatcherProcess
-import app.revanced.manager.patcher.toEvent
+import app.revanced.manager.patcher.worker.ProgressEventHandler
+import app.revanced.manager.ui.model.State
 import app.revanced.manager.util.Options
 import app.revanced.manager.util.PM
 import app.revanced.manager.util.PatchSelection
@@ -67,7 +66,8 @@ class ProcessRuntime(private val context: Context) : Runtime(context) {
        selectedPatches: PatchSelection,
        options: Options,
        logger: Logger,
-        onEvent: (ProgressEvent) -> Unit,
+        onPatchCompleted: suspend () -> Unit,
+        onProgress: ProgressEventHandler,
    ) = coroutineScope {
        // Get the location of our own Apk.
        val managerBaseApk = pm.getPackageInfo(context.packageName)!!.applicationInfo!!.sourceDir
@@ -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()
@@ -123,10 +124,13 @@ class ProcessRuntime(private val context: Context) : Runtime(context) {
            val eventHandler = object : IPatcherEvents.Stub() {
                override fun log(level: String, msg: String) = logger.log(enumValueOf(level), msg)

-                override fun event(event: ProgressEventParcel?) {
-                    event?.let { onEvent(it.toEvent()) }
+                override fun patchSucceeded() {
+                    scope.launch { onPatchCompleted() }
                }

+                override fun progress(name: String?, state: String?, msg: String?) =
+                    onProgress(name, state?.let { enumValueOf<State>(it) }, msg)
+
                override fun finished(exceptionStackTrace: String?) {
                    binder.exit()

--- a/app/src/main/java/app/revanced/manager/patcher/runtime/Runtime.kt
+++ b/app/src/main/java/app/revanced/manager/patcher/runtime/Runtime.kt
@@ -4,9 +4,9 @@ import android.content.Context
 import app.revanced.manager.data.platform.Filesystem
 import app.revanced.manager.domain.manager.PreferencesManager
 import app.revanced.manager.domain.repository.PatchBundleRepository
-import app.revanced.manager.patcher.ProgressEvent
 import app.revanced.manager.patcher.aapt.Aapt
 import app.revanced.manager.patcher.logger.Logger
+import app.revanced.manager.patcher.worker.ProgressEventHandler
 import app.revanced.manager.util.Options
 import app.revanced.manager.util.PatchSelection
 import kotlinx.coroutines.flow.first
@@ -34,6 +34,7 @@ sealed class Runtime(context: Context) : KoinComponent {
        selectedPatches: PatchSelection,
        options: Options,
        logger: Logger,
-        onEvent: (ProgressEvent) -> Unit,
+        onPatchCompleted: suspend () -> Unit,
+        onProgress: ProgressEventHandler,
    )
 }
--- a/app/src/main/java/app/revanced/manager/patcher/runtime/process/PatcherProcess.kt
+++ b/app/src/main/java/app/revanced/manager/patcher/runtime/process/PatcherProcess.kt
@@ -8,15 +8,12 @@ import android.os.Build
 import android.os.Bundle
 import android.os.Looper
 import app.revanced.manager.BuildConfig
-import app.revanced.manager.patcher.ProgressEvent
 import app.revanced.manager.patcher.Session
-import app.revanced.manager.patcher.StepId
 import app.revanced.manager.patcher.logger.LogLevel
 import app.revanced.manager.patcher.logger.Logger
 import app.revanced.manager.patcher.patch.PatchBundle
-import app.revanced.manager.patcher.runStep
 import app.revanced.manager.patcher.runtime.ProcessRuntime
-import app.revanced.manager.patcher.toParcel
+import app.revanced.manager.ui.model.State
 import kotlinx.coroutines.CoroutineExceptionHandler
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -27,7 +24,7 @@ import kotlin.system.exitProcess
 /**
 * The main class that runs inside the runner process launched by [ProcessRuntime].
 */
-class PatcherProcess() : IPatcherProcess.Stub() {
+class PatcherProcess(private val context: Context) : IPatcherProcess.Stub() {
    private var eventBinder: IPatcherEvents? = null

    private val scope =
@@ -49,8 +46,6 @@ class PatcherProcess() : IPatcherProcess.Stub() {
    override fun exit() = exitProcess(0)

    override fun start(parameters: Parameters, events: IPatcherEvents) {
-        fun onEvent(event: ProgressEvent) = events.event(event.toParcel())
-
        eventBinder = events

        scope.launch {
@@ -61,42 +56,38 @@ class PatcherProcess() : IPatcherProcess.Stub() {

            logger.info("Memory limit: ${Runtime.getRuntime().maxMemory() / (1024 * 1024)}MB")

-            val patchList = runStep(StepId.LoadPatches, ::onEvent) {
-                val allPatches = PatchBundle.Loader.patches(
-                    parameters.configurations.map { it.bundle },
-                    parameters.packageName
-                )
-
-                parameters.configurations.flatMap { config ->
-                    val patches = (allPatches[config.bundle] ?: return@flatMap emptyList())
+            val allPatches = PatchBundle.Loader.patches(parameters.configurations.map { it.bundle }, parameters.packageName)
+            val patchList = parameters.configurations.flatMap { config ->
+                val patches = (allPatches[config.bundle] ?: return@flatMap emptyList())
                        .filter { it.name in config.patches }
                        .associateBy { it.name }

-                    config.options.forEach { (patchName, opts) ->
-                        val patchOptions = patches[patchName]?.options
-                            ?: throw Exception("Patch with name $patchName does not exist.")
+                config.options.forEach { (patchName, opts) ->
+                    val patchOptions = patches[patchName]?.options
+                        ?: throw Exception("Patch with name $patchName does not exist.")

-                        opts.forEach { (key, value) ->
-                            patchOptions[key] = value
-                        }
+                    opts.forEach { (key, value) ->
+                        patchOptions[key] = value
                    }
-
-                    patches.values
                }
+
+                patches.values
            }

-            val session = runStep(StepId.ReadAPK, ::onEvent) {
-                Session(
-                    cacheDir = parameters.cacheDir,
-                    aaptPath = parameters.aaptPath,
-                    frameworkDir = parameters.frameworkDir,
-                    logger = logger,
-                    input = File(parameters.inputFile),
-                    onEvent = ::onEvent,
-                )
-            }
+            events.progress(null, State.COMPLETED.name, null) // Loading patches

-            session.use {
+            Session(
+                cacheDir = parameters.cacheDir,
+                aaptPath = parameters.aaptPath,
+                frameworkDir = parameters.frameworkDir,
+                androidContext = context,
+                logger = logger,
+                input = File(parameters.inputFile),
+                onPatchCompleted = { events.patchSucceeded() },
+                onProgress = { name, state, message ->
+                    events.progress(name, state?.name, message)
+                }
+            ).use {
                it.run(File(parameters.outputFile), patchList)
            }

@@ -128,7 +119,7 @@ class PatcherProcess() : IPatcherProcess.Stub() {
                }
            }

-            val ipcInterface = PatcherProcess()
+            val ipcInterface = PatcherProcess(appContext)

            appContext.sendBroadcast(Intent().apply {
                action = ProcessRuntime.CONNECT_TO_APP_ACTION
--- a/app/src/main/java/app/revanced/manager/patcher/worker/PatcherWorker.kt
+++ b/app/src/main/java/app/revanced/manager/patcher/worker/PatcherWorker.kt
@@ -29,17 +29,14 @@ import app.revanced.manager.domain.repository.InstalledAppRepository
 import app.revanced.manager.domain.worker.Worker
 import app.revanced.manager.domain.worker.WorkerRepository
 import app.revanced.manager.network.downloader.LoadedDownloaderPlugin
-import app.revanced.manager.patcher.ProgressEvent
-import app.revanced.manager.patcher.StepId
 import app.revanced.manager.patcher.logger.Logger
-import app.revanced.manager.patcher.runStep
 import app.revanced.manager.patcher.runtime.CoroutineRuntime
 import app.revanced.manager.patcher.runtime.ProcessRuntime
-import app.revanced.manager.patcher.toRemoteError
 import app.revanced.manager.plugin.downloader.GetScope
 import app.revanced.manager.plugin.downloader.PluginHostApi
 import app.revanced.manager.plugin.downloader.UserInteractionException
 import app.revanced.manager.ui.model.SelectedApp
+import app.revanced.manager.ui.model.State
 import app.revanced.manager.util.Options
 import app.revanced.manager.util.PM
 import app.revanced.manager.util.PatchSelection
@@ -51,6 +48,8 @@ import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 import java.io.File

+typealias ProgressEventHandler = (name: String?, state: State?, message: String?) -> Unit
+
@OptIn(PluginHostApi::class)
 class PatcherWorker(
    context: Context,
@@ -72,9 +71,11 @@ class PatcherWorker(
        val selectedPatches: PatchSelection,
        val options: Options,
        val logger: Logger,
+        val onDownloadProgress: suspend (Pair<Long, Long?>?) -> Unit,
+        val onPatchCompleted: suspend () -> Unit,
        val handleStartActivityRequest: suspend (LoadedDownloaderPlugin, Intent) -> ActivityResult,
        val setInputFile: suspend (File) -> Unit,
-        val onEvent: (ProgressEvent) -> Unit,
+        val onProgress: ProgressEventHandler
    ) {
        val packageName get() = input.packageName
    }
@@ -139,6 +140,10 @@ class PatcherWorker(
    }

    private suspend fun runPatcher(args: Args): Result {
+
+        fun updateProgress(name: String? = null, state: State? = null, message: String? = null) =
+            args.onProgress(name, state, message)
+
        val patchedApk = fs.tempDir.resolve("patched.apk")

        return try {
@@ -158,65 +163,51 @@ class PatcherWorker(
                    args.input.version,
                    prefs.suggestedVersionSafeguard.get(),
                    !prefs.disablePatchVersionCompatCheck.get(),
-                    onDownload = { progress ->
-                        args.onEvent(
-                            ProgressEvent.Progress(
-                                stepId = StepId.DownloadAPK,
-                                current = progress.first,
-                                total = progress.second
-                            )
-                        )
-                    }
-                ).also { args.setInputFile(it) }
+                    onDownload = args.onDownloadProgress
+                ).also {
+                    args.setInputFile(it)
+                    updateProgress(state = State.COMPLETED) // Download APK
+                }

            val inputFile = when (val selectedApp = args.input) {
                is SelectedApp.Download -> {
-                    runStep(StepId.DownloadAPK, args.onEvent) {
-                        val (plugin, data) = downloaderPluginRepository.unwrapParceledData(
-                            selectedApp.data
-                        )
+                    val (plugin, data) = downloaderPluginRepository.unwrapParceledData(selectedApp.data)

-                        download(plugin, data)
-                    }
+                    download(plugin, data)
                }

                is SelectedApp.Search -> {
-                    runStep(StepId.DownloadAPK, args.onEvent) {
-                        downloaderPluginRepository.loadedPluginsFlow.first()
-                            .firstNotNullOfOrNull { plugin ->
-                                try {
-                                    val getScope = object : GetScope {
-                                        override val pluginPackageName = plugin.packageName
-                                        override val hostPackageName =
-                                            applicationContext.packageName
-
-                                        override suspend fun requestStartActivity(intent: Intent): Intent? {
-                                            val result =
-                                                args.handleStartActivityRequest(plugin, intent)
-                                            return when (result.resultCode) {
-                                                Activity.RESULT_OK -> result.data
-                                                Activity.RESULT_CANCELED -> throw UserInteractionException.Activity.Cancelled()
-                                                else -> throw UserInteractionException.Activity.NotCompleted(
-                                                    result.resultCode,
-                                                    result.data
-                                                )
-                                            }
+                    downloaderPluginRepository.loadedPluginsFlow.first()
+                        .firstNotNullOfOrNull { plugin ->
+                            try {
+                                val getScope = object : GetScope {
+                                    override val pluginPackageName = plugin.packageName
+                                    override val hostPackageName = applicationContext.packageName
+                                    override suspend fun requestStartActivity(intent: Intent): Intent? {
+                                        val result = args.handleStartActivityRequest(plugin, intent)
+                                        return when (result.resultCode) {
+                                            Activity.RESULT_OK -> result.data
+                                            Activity.RESULT_CANCELED -> throw UserInteractionException.Activity.Cancelled()
+                                            else -> throw UserInteractionException.Activity.NotCompleted(
+                                                result.resultCode,
+                                                result.data
+                                            )
                                        }
                                    }
-                                    withContext(Dispatchers.IO) {
-                                        plugin.get(
-                                            getScope,
-                                            selectedApp.packageName,
-                                            selectedApp.version
-                                        )
-                                    }?.takeIf { (_, version) -> selectedApp.version == null || version == selectedApp.version }
-                                } catch (e: UserInteractionException.Activity.NotCompleted) {
-                                    throw e
-                                } catch (_: UserInteractionException) {
-                                    null
-                                }?.let { (data, _) -> download(plugin, data) }
-                            } ?: throw Exception("App is not available.")
-                    }
+                                }
+                                withContext(Dispatchers.IO) {
+                                    plugin.get(
+                                        getScope,
+                                        selectedApp.packageName,
+                                        selectedApp.version
+                                    )
+                                }?.takeIf { (_, version) -> selectedApp.version == null || version == selectedApp.version }
+                            } catch (e: UserInteractionException.Activity.NotCompleted) {
+                                throw e
+                            } catch (_: UserInteractionException) {
+                                null
+                            }?.let { (data, _) -> download(plugin, data) }
+                        } ?: throw Exception("App is not available.")
                }

                is SelectedApp.Local -> selectedApp.file.also { args.setInputFile(it) }
@@ -236,12 +227,12 @@ class PatcherWorker(
                args.selectedPatches,
                args.options,
                args.logger,
-                args.onEvent,
+                args.onPatchCompleted,
+                args.onProgress
            )

-            runStep(StepId.SignAPK, args.onEvent) {
-                keystoreManager.sign(patchedApk, File(args.output))
-            }
+            keystoreManager.sign(patchedApk, File(args.output))
+            updateProgress(state = State.COMPLETED) // Signing

            Log.i(tag, "Patching succeeded".logFmt())
            Result.success()
@@ -250,11 +241,11 @@ class PatcherWorker(
                tag,
                "An exception occurred in the remote process while patching. ${e.originalStackTrace}".logFmt()
            )
-            args.onEvent(ProgressEvent.Failed(null, e.toRemoteError())) // Fallback if exception doesn't occur within step
+            updateProgress(state = State.FAILED, message = e.originalStackTrace)
            Result.failure()
        } catch (e: Exception) {
            Log.e(tag, "An exception occurred while patching".logFmt(), e)
-            args.onEvent(ProgressEvent.Failed(null, e.toRemoteError())) // Fallback if exception doesn't occur within step
+            updateProgress(state = State.FAILED, message = e.stackTraceToString())
            Result.failure()
        } finally {
            patchedApk.delete()
--- a/app/src/main/java/app/revanced/manager/service/InstallService.kt
+++ b/app/src/main/java/app/revanced/manager/service/InstallService.kt
@@ -0,0 +1,53 @@
+package app.revanced.manager.service
+
+import android.app.Service
+import android.content.Intent
+import android.content.pm.PackageInstaller
+import android.os.Build
+import android.os.IBinder
+
+@Suppress("DEPRECATION")
+class InstallService : Service() {
+
+    override fun onStartCommand(
+        intent: Intent, flags: Int, startId: Int
+    ): Int {
+        val extraStatus = intent.getIntExtra(PackageInstaller.EXTRA_STATUS, -999)
+        val extraStatusMessage = intent.getStringExtra(PackageInstaller.EXTRA_STATUS_MESSAGE)
+        val extraPackageName = intent.getStringExtra(PackageInstaller.EXTRA_PACKAGE_NAME)
+        when (extraStatus) {
+            PackageInstaller.STATUS_PENDING_USER_ACTION -> {
+                startActivity(if (Build.VERSION.SDK_INT >= 33) {
+                    intent.getParcelableExtra(Intent.EXTRA_INTENT, Intent::class.java)
+                } else {
+                    intent.getParcelableExtra(Intent.EXTRA_INTENT)
+                }.apply {
+                    this?.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                })
+            }
+
+            else -> {
+                sendBroadcast(Intent().apply {
+                    action = APP_INSTALL_ACTION
+                    `package` = packageName
+                    putExtra(EXTRA_INSTALL_STATUS, extraStatus)
+                    putExtra(EXTRA_INSTALL_STATUS_MESSAGE, extraStatusMessage)
+                    putExtra(EXTRA_PACKAGE_NAME, extraPackageName)
+                })
+            }
+        }
+        stopSelf()
+        return START_NOT_STICKY
+    }
+
+    override fun onBind(intent: Intent?): IBinder? = null
+
+    companion object {
+        const val APP_INSTALL_ACTION = "APP_INSTALL_ACTION"
+
+        const val EXTRA_INSTALL_STATUS = "EXTRA_INSTALL_STATUS"
+        const val EXTRA_INSTALL_STATUS_MESSAGE = "EXTRA_INSTALL_STATUS_MESSAGE"
+        const val EXTRA_PACKAGE_NAME = "EXTRA_PACKAGE_NAME"
+    }
+
+}
--- a/app/src/main/java/app/revanced/manager/ui/component/AppIcon.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/AppIcon.kt
@@ -16,7 +16,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.graphics.vector.rememberVectorPainter
 import coil.compose.AsyncImage
-import com.eygraber.compose.placeholder.material3.placeholder
+import io.github.fornewid.placeholder.material3.placeholder

@Composable
 fun AppIcon(
--- a/app/src/main/java/app/revanced/manager/ui/component/AppLabel.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/AppLabel.kt
@@ -16,7 +16,7 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.TextStyle
 import app.revanced.manager.R
-import com.eygraber.compose.placeholder.material3.placeholder
+import io.github.fornewid.placeholder.material3.placeholder
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext

--- a/app/src/main/java/app/revanced/manager/ui/component/InstallerStatusDialog.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/InstallerStatusDialog.kt
@@ -1,6 +1,5 @@
 package app.revanced.manager.ui.component

-import android.annotation.SuppressLint
 import android.content.pm.PackageInstaller
 import androidx.annotation.RequiresApi
 import androidx.annotation.StringRes
@@ -80,7 +79,7 @@ private fun installerStatusDialogButton(
 enum class DialogKind(
    val flag: Int,
    val title: Int,
-    @param:StringRes val contentStringResId: Int,
+    @StringRes val contentStringResId: Int,
    val icon: ImageVector = Icons.Outlined.ErrorOutline,
    val confirmButton: InstallerStatusDialogButton = installerStatusDialogButton(R.string.ok),
    val dismissButton: InstallerStatusDialogButton? = null,
@@ -134,8 +133,10 @@ enum class DialogKind(
        title = R.string.installation_storage_issue_dialog_title,
        contentStringResId = R.string.installation_storage_issue_description,
    ),
+
+    @RequiresApi(34)
    FAILURE_TIMEOUT(
-        flag = @SuppressLint("InlinedApi") PackageInstaller.STATUS_FAILURE_TIMEOUT,
+        flag = PackageInstaller.STATUS_FAILURE_TIMEOUT,
        title = R.string.installation_timeout_dialog_title,
        contentStringResId = R.string.installation_timeout_description,
        confirmButton = installerStatusDialogButton(R.string.install_app) { model ->
--- a/app/src/main/java/app/revanced/manager/ui/component/LoadingIndicator.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/LoadingIndicator.kt
@@ -14,7 +14,7 @@ fun LoadingIndicator(
    progress: () -> Float? = { null },
    color: Color = ProgressIndicatorDefaults.circularColor,
    strokeWidth: Dp = ProgressIndicatorDefaults.CircularStrokeWidth,
-    trackColor: Color = ProgressIndicatorDefaults.circularIndeterminateTrackColor,
+    trackColor: Color = ProgressIndicatorDefaults.circularTrackColor,
    strokeCap: StrokeCap = ProgressIndicatorDefaults.CircularDeterminateStrokeCap
 ) {
    progress()?.let {
--- a/app/src/main/java/app/revanced/manager/ui/component/Markdown.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/Markdown.kt
@@ -18,6 +18,8 @@ fun Markdown(
        colors = markdownColor(
            text = MaterialTheme.colorScheme.onSurfaceVariant,
            codeBackground = MaterialTheme.colorScheme.secondaryContainer,
+            codeText = MaterialTheme.colorScheme.onSecondaryContainer,
+            linkText = MaterialTheme.colorScheme.primary
        ),
        typography = markdownTypography(
            h1 = MaterialTheme.typography.headlineSmall.copy(fontWeight = FontWeight.Bold),
--- a/app/src/main/java/app/revanced/manager/ui/component/SearchBar.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/SearchBar.kt
@@ -29,8 +29,7 @@ fun SearchBar(
 ) {
    val colors = SearchBarColors(
        containerColor = MaterialTheme.colorScheme.surfaceContainerHigh,
-        dividerColor = MaterialTheme.colorScheme.outline,
-        inputFieldColors = SearchBarDefaults.inputFieldColors()
+        dividerColor = MaterialTheme.colorScheme.outline
    )
    val keyboardController = LocalSoftwareKeyboardController.current

--- a/app/src/main/java/app/revanced/manager/ui/component/SearchView.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/SearchView.kt
@@ -31,8 +31,7 @@ fun SearchView(
 ) {
    val colors = SearchBarColors(
        containerColor = MaterialTheme.colorScheme.surfaceContainerHigh,
-        dividerColor = MaterialTheme.colorScheme.outline,
-        inputFieldColors = SearchBarDefaults.inputFieldColors()
+        dividerColor = MaterialTheme.colorScheme.outline
    )
    val focusRequester = remember { FocusRequester() }
    val keyboardController = LocalSoftwareKeyboardController.current
--- a/app/src/main/java/app/revanced/manager/ui/component/patcher/Steps.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/patcher/Steps.kt
@@ -39,9 +39,11 @@ import androidx.compose.ui.unit.dp
 import app.revanced.manager.R
 import app.revanced.manager.ui.component.ArrowButton
 import app.revanced.manager.ui.component.LoadingIndicator
+import app.revanced.manager.ui.model.ProgressKey
 import app.revanced.manager.ui.model.State
-import app.revanced.manager.ui.model.StepCategory
 import app.revanced.manager.ui.model.Step
+import app.revanced.manager.ui.model.StepCategory
+import app.revanced.manager.ui.model.StepProgressProvider
 import java.util.Locale
 import kotlin.math.floor

@@ -50,6 +52,8 @@ import kotlin.math.floor
 fun Steps(
    category: StepCategory,
    steps: List<Step>,
+    stepCount: Pair<Int, Int>? = null,
+    stepProgressProvider: StepProgressProvider,
    isExpanded: Boolean = false,
    onExpand: () -> Unit,
    onClick: () -> Unit
@@ -63,17 +67,8 @@ fun Steps(
        }
    }

-    val filteredSteps = remember(steps) {
-        val failedCount = steps.count { it.state == State.FAILED }
-
-        steps.filter { step ->
-            // Show hidden steps if it's the only failed step.
-            !step.hide || (step.state == State.FAILED && failedCount == 1)
-        }
-    }
-
    LaunchedEffect(state) {
-        if (state == State.RUNNING || state == State.FAILED)
+        if (state == State.RUNNING)
            onExpand()
    }

@@ -97,8 +92,13 @@ fun Steps(

            Spacer(modifier = Modifier.weight(1f))

+            val stepProgress = remember(stepCount, steps) {
+                stepCount?.let { (current, total) -> "$current/$total" }
+                    ?: "${steps.count { it.state == State.COMPLETED }}/${steps.size}"
+            }
+
            Text(
-                text = "${filteredSteps.count { it.state == State.COMPLETED }}/${filteredSteps.size}",
+                text = stepProgress,
                style = MaterialTheme.typography.labelSmall
            )

@@ -112,20 +112,23 @@ fun Steps(
                    .fillMaxWidth()
                    .padding(top = 10.dp)
            ) {
-                filteredSteps.forEachIndexed { index, step ->
-                    val (progress, progressText) = step.progress?.let { (current, total) ->
-                        if (total != null) current.toFloat() / total.toFloat() to "${current.megaBytes}/${total.megaBytes} MB"
-                        else null to "${current.megaBytes} MB"
+                steps.forEachIndexed { index, step ->
+                    val (progress, progressText) = when (step.progressKey) {
+                        null -> null
+                        ProgressKey.DOWNLOAD -> stepProgressProvider.downloadProgress?.let { (downloaded, total) ->
+                            if (total != null) downloaded.toFloat() / total.toFloat() to "${downloaded.megaBytes}/${total.megaBytes} MB"
+                            else null to "${downloaded.megaBytes} MB"
+                        }
                    } ?: (null to null)

                    SubStep(
-                        name = step.title,
+                        name = step.name,
                        state = step.state,
                        message = step.message,
                        progress = progress,
                        progressText = progressText,
                        isFirst = index == 0,
-                        isLast = index == filteredSteps.lastIndex,
+                        isLast = index == steps.lastIndex,
                    )
                }
            }
--- a/app/src/main/java/app/revanced/manager/ui/model/PatcherStep.kt
+++ b/app/src/main/java/app/revanced/manager/ui/model/PatcherStep.kt
@@ -3,10 +3,9 @@ package app.revanced.manager.ui.model
 import android.os.Parcelable
 import androidx.annotation.StringRes
 import app.revanced.manager.R
-import app.revanced.manager.patcher.StepId
 import kotlinx.parcelize.Parcelize

-enum class StepCategory(@param:StringRes val displayName: Int) {
+enum class StepCategory(@StringRes val displayName: Int) {
    PREPARING(R.string.patcher_step_group_preparing),
    PATCHING(R.string.patcher_step_group_patching),
    SAVING(R.string.patcher_step_group_saving)
@@ -16,20 +15,19 @@ enum class State {
    WAITING, RUNNING, FAILED, COMPLETED
 }

+enum class ProgressKey {
+    DOWNLOAD
+}
+
+interface StepProgressProvider {
+    val downloadProgress: Pair<Long, Long?>?
+}
+
@Parcelize
 data class Step(
-    val id: StepId,
-    val title: String,
+    val name: String,
    val category: StepCategory,
    val state: State = State.WAITING,
    val message: String? = null,
-    val progress: Pair<Long, Long?>? = null,
-    val hide: Boolean = false,
-) : Parcelable
-
-
-fun Step.withState(
-    state: State = this.state,
-    message: String? = this.message,
-    progress: Pair<Long, Long?>? = this.progress
-) = copy(state = state, message = message, progress = progress)
+    val progressKey: ProgressKey? = null
+) : Parcelable
--- a/app/src/main/java/app/revanced/manager/ui/screen/DashboardScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/DashboardScreen.kt
@@ -36,7 +36,7 @@ import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
-import androidx.compose.material3.SecondaryTabRow
+import androidx.compose.material3.TabRow
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.material3.surfaceColorAtElevation
@@ -53,7 +53,6 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -101,7 +100,6 @@ fun DashboardScreen(
        false
    )
    val androidContext = LocalContext.current
-    val resources = LocalResources.current
    val composableScope = rememberCoroutineScope()
    val pagerState = rememberPagerState(
        initialPage = DashboardPage.DASHBOARD.ordinal,
@@ -236,7 +234,7 @@ fun DashboardScreen(
                    when (pagerState.currentPage) {
                        DashboardPage.DASHBOARD.ordinal -> {
                            if (availablePatches < 1) {
-                                androidContext.toast(resources.getString(R.string.no_patch_found))
+                                androidContext.toast(androidContext.getString(R.string.no_patch_found))
                                composableScope.launch {
                                    pagerState.animateScrollToPage(
                                        DashboardPage.BUNDLES.ordinal
@@ -261,7 +259,7 @@ fun DashboardScreen(
        }
    ) { paddingValues ->
        Column(Modifier.padding(paddingValues)) {
-            SecondaryTabRow(
+            TabRow(
                selectedTabIndex = pagerState.currentPage,
                containerColor = MaterialTheme.colorScheme.surfaceColorAtElevation(3.0.dp)
            ) {
--- a/app/src/main/java/app/revanced/manager/ui/screen/PatcherScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/PatcherScreen.kt
@@ -40,7 +40,6 @@ import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import app.revanced.manager.R
@@ -70,7 +69,6 @@ fun PatcherScreen(
    }

    val context = LocalContext.current
-    val resources = LocalResources.current
    val exportApkLauncher =
        rememberLauncherForActivityResult(CreateDocument(APK_MIMETYPE), viewModel::export)

@@ -81,7 +79,7 @@ fun PatcherScreen(

    fun onPageBack() = when {
        patcherSucceeded == null -> showDismissConfirmationDialog = true
-        viewModel.isInstalling -> context.toast(resources.getString(R.string.patcher_install_in_progress))
+        viewModel.isInstalling -> context.toast(context.getString(R.string.patcher_install_in_progress))
        else -> onLeave()
    }

@@ -89,7 +87,7 @@ fun PatcherScreen(

    val steps by remember {
        derivedStateOf {
-            viewModel.steps.groupBy { it.category }.toList()
+            viewModel.steps.groupBy { it.category }
        }
    }

@@ -232,12 +230,14 @@ fun PatcherScreen(
                contentPadding = PaddingValues(16.dp)
            ) {
                items(
-                    items = steps,
+                    items = steps.toList(),
                    key = { it.first }
                ) { (category, steps) ->
                    Steps(
                        category = category,
                        steps = steps,
+                        stepCount = if (category == StepCategory.PATCHING) viewModel.patchesProgress else null,
+                        stepProgressProvider = viewModel,
                        isExpanded = expandedCategory == category,
                        onExpand = { expandCategory(category) },
                        onClick = {
--- a/app/src/main/java/app/revanced/manager/ui/screen/PatchesSelectorScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/PatchesSelectorScreen.kt
@@ -40,7 +40,7 @@ import androidx.compose.material3.ListItem
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.Scaffold
-import androidx.compose.material3.SecondaryScrollableTabRow
+import androidx.compose.material3.ScrollableTabRow
 import androidx.compose.material3.SmallFloatingActionButton
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
@@ -49,12 +49,10 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.produceState
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
-import androidx.compose.runtime.snapshotFlow
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
@@ -83,11 +81,9 @@ import app.revanced.manager.util.Options
 import app.revanced.manager.util.PatchSelection
 import app.revanced.manager.util.isScrollingUp
 import app.revanced.manager.util.transparentListItemColors
-import kotlinx.coroutines.FlowPreview
-import kotlinx.coroutines.flow.sample
 import kotlinx.coroutines.launch

-@OptIn(ExperimentalMaterial3Api::class, ExperimentalLayoutApi::class, FlowPreview::class)
+@OptIn(ExperimentalMaterial3Api::class, ExperimentalLayoutApi::class)
@Composable
 fun PatchesSelectorScreen(
    onSave: (PatchSelection?, Options) -> Unit,
@@ -235,8 +231,7 @@ fun PatchesSelectorScreen(
                            viewModel.selectionWarningEnabled -> showSelectionWarning = true

                            // Show universal warning if universal patch is selected and the toggle is off
-                            patch.compatiblePackages == null && viewModel.universalPatchWarningEnabled -> showUniversalWarning =
-                                true
+                            patch.compatiblePackages == null && viewModel.universalPatchWarningEnabled -> showUniversalWarning = true

                            // Toggle the patch otherwise
                            else -> viewModel.togglePatch(uid, patch)
@@ -365,21 +360,6 @@ fun PatchesSelectorScreen(
                    ) {
                        Icon(Icons.Outlined.Restore, stringResource(R.string.reset))
                    }
-
-                    val isScrollingUp =
-                        patchLazyListStates.getOrNull(pagerState.currentPage)?.isScrollingUp()
-                    val expanded by produceState(true, isScrollingUp) {
-                        val state = isScrollingUp ?: return@produceState
-                        value = state.value
-
-                        // Use snapshotFlow and sample to prevent the value from changing too often.
-                        snapshotFlow { state.value }
-                            .sample(333L)
-                            .collect {
-                                value = it
-                            }
-                    }
-
                    HapticExtendedFloatingActionButton(
                        text = {
                            Text(
@@ -395,7 +375,8 @@ fun PatchesSelectorScreen(
                                contentDescription = stringResource(R.string.save)
                            )
                        },
-                        expanded = expanded,
+                        expanded = patchLazyListStates.getOrNull(pagerState.currentPage)?.isScrollingUp
+                            ?: true,
                        onClick = {
                            onSave(viewModel.getCustomSelection(), viewModel.getOptions())
                        }
@@ -411,7 +392,7 @@ fun PatchesSelectorScreen(
                .padding(top = 16.dp)
        ) {
            if (bundles.size > 1) {
-                SecondaryScrollableTabRow(
+                ScrollableTabRow(
                    selectedTabIndex = pagerState.currentPage,
                    containerColor = MaterialTheme.colorScheme.surfaceColorAtElevation(3.0.dp)
                ) {
--- a/app/src/main/java/app/revanced/manager/ui/screen/RequiredOptionsScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/RequiredOptionsScreen.kt
@@ -13,7 +13,7 @@ import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
-import androidx.compose.material3.SecondaryScrollableTabRow
+import androidx.compose.material3.ScrollableTabRow
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.material3.rememberTopAppBarState
@@ -106,7 +106,7 @@ fun RequiredOptionsScreen(
                .padding(paddingValues)
        ) {
            if (list.isEmpty()) return@Column
-            else if (list.size > 1) SecondaryScrollableTabRow(
+            else if (list.size > 1) ScrollableTabRow(
                selectedTabIndex = pagerState.currentPage,
                containerColor = MaterialTheme.colorScheme.surfaceColorAtElevation(3.0.dp)
            ) {
--- a/app/src/main/java/app/revanced/manager/ui/screen/SelectedAppInfoScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/SelectedAppInfoScreen.kt
@@ -25,14 +25,12 @@ import androidx.compose.material3.TextButton
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.material3.rememberTopAppBarState
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -69,7 +67,6 @@ fun SelectedAppInfoScreen(
    vm: SelectedAppInfoViewModel
 ) {
    val context = LocalContext.current
-    val resources = LocalResources.current
    val networkInfo = koinInject<NetworkInfo>()
    val networkConnected = remember { networkInfo.isConnected() }
    val networkMetered = remember { !networkInfo.isUnmetered() }
@@ -79,12 +76,12 @@ fun SelectedAppInfoScreen(
    val bundles by vm.bundleInfoFlow.collectAsStateWithLifecycle(emptyList())

    val allowIncompatiblePatches by vm.prefs.disablePatchVersionCompatCheck.getAsState()
-    val patches by remember {
-        derivedStateOf {
-            vm.getPatches(bundles, allowIncompatiblePatches)
-        }
+    val patches = remember(bundles, allowIncompatiblePatches) {
+        vm.getPatches(bundles, allowIncompatiblePatches)
+    }
+    val selectedPatchCount = remember(patches) {
+        patches.values.sumOf { it.size }
    }
-    val selectedPatchCount = patches.values.sumOf { it.size }

    val launcher = rememberLauncherForActivityResult(
        contract = ActivityResultContracts.StartActivityForResult(),
@@ -120,7 +117,7 @@ fun SelectedAppInfoScreen(
                },
                onClick = patchClick@{
                    if (selectedPatchCount == 0) {
-                        context.toast(resources.getString(R.string.no_patches_selected))
+                        context.toast(context.getString(R.string.no_patches_selected))

                        return@patchClick
                    }
--- a/app/src/main/java/app/revanced/manager/ui/screen/SettingsScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/SettingsScreen.kt
@@ -22,8 +22,8 @@ import app.revanced.manager.ui.model.navigation.Settings
 import org.koin.compose.koinInject

 private data class Section(
-    @param:StringRes val name: Int,
-    @param:StringRes val description: Int,
+    @StringRes val name: Int,
+    @StringRes val description: Int,
    val image: ImageVector,
    val destination: Settings.Destination,
 )
--- a/app/src/main/java/app/revanced/manager/ui/screen/settings/AboutSettingsScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/settings/AboutSettingsScreen.kt
@@ -1,6 +1,5 @@
 package app.revanced.manager.ui.screen.settings

-import android.annotation.SuppressLint
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.Image
@@ -41,7 +40,6 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.hideFromAccessibility
 import androidx.compose.ui.semantics.semantics
@@ -69,9 +67,8 @@ fun AboutSettingsScreen(
    viewModel: AboutViewModel = koinViewModel()
 ) {
    val context = LocalContext.current
-    val resources = LocalResources.current
    // painterResource() is broken on release builds for some reason.
-    val icon = rememberDrawablePainter(drawable = remember(resources) {
+    val icon = rememberDrawablePainter(drawable = remember {
        AppCompatResources.getDrawable(context, R.drawable.ic_logo_ring)
    })

@@ -79,7 +76,7 @@ fun AboutSettingsScreen(
        viewModel.socials.partition(ReVancedSocial::preferred)
    }

-    val preferredSocialButtons = remember(resources, preferredSocials, viewModel.donate, viewModel.contact) {
+    val preferredSocialButtons = remember(preferredSocials, viewModel.donate, viewModel.contact) {
        preferredSocials.map {
            Triple(
                getSocialIcon(it.name),
@@ -92,7 +89,7 @@ fun AboutSettingsScreen(
            viewModel.donate?.let {
                Triple(
                    Icons.Outlined.FavoriteBorder,
-                    resources.getString(R.string.donate),
+                    context.getString(R.string.donate),
                    third = {
                        context.openUrl(it)
                    }
@@ -101,7 +98,7 @@ fun AboutSettingsScreen(
            viewModel.contact?.let {
                Triple(
                    Icons.Outlined.MailOutline,
-                    resources.getString(R.string.contact),
+                    context.getString(R.string.contact),
                    third = {
                        context.openUrl("mailto:$it")
                    }
@@ -134,7 +131,7 @@ fun AboutSettingsScreen(
            stringResource(R.string.contributors_description),
            third = nav@{
                if (!viewModel.isConnected) {
-                    context.toast(resources.getString(R.string.no_network_toast))
+                    context.toast(context.getString(R.string.no_network_toast))
                    return@nav
                }

@@ -156,7 +153,7 @@ fun AboutSettingsScreen(
    LaunchedEffect(developerTaps) {
        if (developerTaps == 0) return@LaunchedEffect
        if (showDeveloperSettings) {
-            snackbarHostState.showSnackbar(resources.getString(R.string.developer_options_already_enabled))
+            snackbarHostState.showSnackbar(context.getString(R.string.developer_options_already_enabled))
            developerTaps = 0
            return@LaunchedEffect
        }
@@ -164,7 +161,7 @@ fun AboutSettingsScreen(
        val remaining = DEVELOPER_OPTIONS_TAPS - developerTaps
        if (remaining > 0) {
            snackbarHostState.showSnackbar(
-                resources.getString(
+                context.getString(
                    R.string.developer_options_taps,
                    remaining
                ),
@@ -172,7 +169,7 @@ fun AboutSettingsScreen(
            )
        } else if (remaining == 0) {
            viewModel.showDeveloperSettings.update(true)
-            snackbarHostState.showSnackbar(resources.getString(R.string.developer_options_enabled))
+            snackbarHostState.showSnackbar(context.getString(R.string.developer_options_enabled))
        }

        // Reset the counter
--- a/app/src/main/java/app/revanced/manager/ui/screen/settings/AdvancedSettingsScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/settings/AdvancedSettingsScreen.kt
@@ -38,7 +38,6 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
@@ -65,10 +64,9 @@ fun AdvancedSettingsScreen(
    viewModel: AdvancedSettingsViewModel = koinViewModel()
 ) {
    val context = LocalContext.current
-    val resources = LocalResources.current
-    val memoryLimit = remember(resources) {
+    val memoryLimit = remember {
        val activityManager = context.getSystemService<ActivityManager>()!!
-        resources.getString(
+        context.getString(
            R.string.device_memory_limit_format,
            activityManager.memoryClass,
            activityManager.largeMemoryClass
@@ -185,7 +183,7 @@ fun AdvancedSettingsScreen(
                            ClipData.newPlainText("Device Information", deviceContent)
                        )

-                        context.toast(resources.getString(R.string.toast_copied_to_clipboard))
+                        context.toast(context.getString(R.string.toast_copied_to_clipboard))
                    }.withHapticFeedback(HapticFeedbackConstants.LONG_PRESS)
                ),
                headlineContent = stringResource(R.string.about_device),
--- a/app/src/main/java/app/revanced/manager/ui/screen/settings/GeneralSettingsScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/settings/GeneralSettingsScreen.kt
@@ -8,8 +8,6 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.FilledTonalButton
@@ -21,7 +19,6 @@ import androidx.compose.material3.rememberTopAppBarState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
@@ -41,7 +38,6 @@ import app.revanced.manager.ui.theme.Theme
 import app.revanced.manager.ui.viewmodel.GeneralSettingsViewModel
 import org.koin.androidx.compose.koinViewModel
 import org.koin.compose.koinInject
-import java.util.Locale

@OptIn(ExperimentalMaterial3Api::class)
@Composable
@@ -52,7 +48,6 @@ fun GeneralSettingsScreen(
    val prefs = viewModel.prefs
    val coroutineScope = viewModel.viewModelScope
    var showThemePicker by rememberSaveable { mutableStateOf(false) }
-    var showLanguagePicker by rememberSaveable { mutableStateOf(false) }

    if (showThemePicker) {
        ThemePicker(
@@ -60,17 +55,6 @@ fun GeneralSettingsScreen(
            onConfirm = { viewModel.setTheme(it) }
        )
    }
-
-    if (showLanguagePicker) {
-        LanguagePicker(
-            supportedLocales = viewModel.getSupportedLocales(),
-            currentLocale = viewModel.getCurrentLocale(),
-            onDismiss = { showLanguagePicker = false },
-            onConfirm = { viewModel.setLocale(it) },
-            getDisplayName = { viewModel.getLocaleDisplayName(it) }
-        )
-    }
-
    val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState())

    Scaffold(
@@ -90,24 +74,6 @@ fun GeneralSettingsScreen(
        ) {
            GroupHeader(stringResource(R.string.appearance))

-            val currentLocale = viewModel.getCurrentLocale()
-            val currentLanguageDisplay = remember(currentLocale) {
-                currentLocale?.let { viewModel.getLocaleDisplayName(it) }
-            }
-            SettingsListItem(
-                modifier = Modifier.clickable { showLanguagePicker = true },
-                headlineContent = stringResource(R.string.language),
-                supportingContent = stringResource(R.string.language_description),
-                trailingContent = {
-                    FilledTonalButton(onClick = { showLanguagePicker = true }) {
-                        Text(
-                            currentLanguageDisplay
-                                ?: stringResource(R.string.language_system_default)
-                        )
-                    }
-                }
-            )
-
            val theme by prefs.theme.getAsState()
            SettingsListItem(
                modifier = Modifier.clickable { showThemePicker = true },
@@ -139,14 +105,6 @@ fun GeneralSettingsScreen(
                    description = R.string.pure_black_theme_description
                )
            }
-
-            GroupHeader(stringResource(R.string.networking))
-            BooleanItem(
-                preference = prefs.allowMeteredNetworks,
-                coroutineScope = coroutineScope,
-                headline = R.string.allow_metered_networks,
-                description = R.string.allow_metered_networks_description
-            )
        }
    }
 }
@@ -190,64 +148,4 @@ private fun ThemePicker(
            }
        }
    )
-}
-
-@Composable
-private fun LanguagePicker(
-    supportedLocales: List<Locale>,
-    currentLocale: Locale?,
-    onDismiss: () -> Unit,
-    onConfirm: (Locale?) -> Unit,
-    getDisplayName: (Locale) -> String
-) {
-    var selectedLocale by remember { mutableStateOf(currentLocale) }
-    val systemDefaultString = stringResource(R.string.language_system_default)
-
-    AlertDialog(
-        onDismissRequest = onDismiss,
-        title = { Text(stringResource(R.string.language)) },
-        text = {
-            Column(
-                modifier = Modifier.verticalScroll(rememberScrollState())
-            ) {
-                Row(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .clickable { selectedLocale = null },
-                    verticalAlignment = Alignment.CenterVertically
-                ) {
-                    HapticRadioButton(
-                        selected = selectedLocale == null,
-                        onClick = { selectedLocale = null }
-                    )
-                    Text(systemDefaultString)
-                }
-
-                supportedLocales.forEach { locale ->
-                    Row(
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .clickable { selectedLocale = locale },
-                        verticalAlignment = Alignment.CenterVertically
-                    ) {
-                        HapticRadioButton(
-                            selected = selectedLocale == locale,
-                            onClick = { selectedLocale = locale }
-                        )
-                        Text(getDisplayName(locale))
-                    }
-                }
-            }
-        },
-        confirmButton = {
-            TextButton(
-                onClick = {
-                    onConfirm(selectedLocale)
-                    onDismiss()
-                }
-            ) {
-                Text(stringResource(R.string.apply))
-            }
-        }
-    )
 }
--- a/app/src/main/java/app/revanced/manager/ui/screen/settings/ImportExportSettingsScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/settings/ImportExportSettingsScreen.kt
@@ -36,7 +36,6 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
@@ -65,7 +64,6 @@ fun ImportExportSettingsScreen(
    vm: ImportExportViewModel = koinViewModel()
 ) {
    val context = LocalContext.current
-    val resources = LocalResources.current
    val coroutineScope = rememberCoroutineScope()
    var selectorDialog by rememberSaveable { mutableStateOf<(@Composable () -> Unit)?>(null) }

@@ -110,7 +108,7 @@ fun ImportExportSettingsScreen(
                vm.viewModelScope.launch {
                    uiSafe(context, R.string.failed_to_import_keystore, "Failed to import keystore") {
                        val result = vm.tryKeystoreImport(alias, pass)
-                        if (!result) context.toast(resources.getString(R.string.import_keystore_wrong_credentials))
+                        if (!result) context.toast(context.getString(R.string.import_keystore_wrong_credentials))
                    }
                }
            }
@@ -168,7 +166,7 @@ fun ImportExportSettingsScreen(
            GroupItem(
                onClick = {
                    if (!vm.canExport()) {
-                        context.toast(resources.getString(R.string.export_keystore_unavailable))
+                        context.toast(context.getString(R.string.export_keystore_unavailable))
                        return@GroupItem
                    }
                    exportKeystoreLauncher.launch("Manager.keystore")
--- a/app/src/main/java/app/revanced/manager/ui/screen/settings/LicensesSettingsScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/settings/LicensesSettingsScreen.kt
@@ -7,18 +7,15 @@ import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import app.revanced.manager.R
 import app.revanced.manager.ui.component.AppScaffold
 import app.revanced.manager.ui.component.AppTopBar
 import app.revanced.manager.ui.component.Scrollbar
+import com.mikepenz.aboutlibraries.ui.compose.LibrariesContainer
 import com.mikepenz.aboutlibraries.ui.compose.LibraryDefaults
-import com.mikepenz.aboutlibraries.ui.compose.android.produceLibraries
-import com.mikepenz.aboutlibraries.ui.compose.m3.LibrariesContainer
-import com.mikepenz.aboutlibraries.ui.compose.m3.chipColors
-import com.mikepenz.aboutlibraries.ui.compose.m3.libraryColors
+import com.mikepenz.aboutlibraries.ui.compose.libraryColors

@OptIn(ExperimentalMaterial3Api::class)
@Composable
@@ -36,23 +33,16 @@ fun LicensesSettingsScreen(
    ) { paddingValues ->
        Column(modifier = Modifier.padding(paddingValues)) {
            val lazyListState = rememberLazyListState()
-            val libraries by produceLibraries(R.raw.aboutlibraries)
-            val chipColors = LibraryDefaults.chipColors(
-                containerColor = MaterialTheme.colorScheme.primary,
-                contentColor = MaterialTheme.colorScheme.onPrimary,
-            )

            LibrariesContainer(
                modifier = Modifier
                    .fillMaxSize(),
-                libraries = libraries,
                lazyListState = lazyListState,
                colors = LibraryDefaults.libraryColors(
-                    libraryBackgroundColor = MaterialTheme.colorScheme.background,
-                    libraryContentColor = MaterialTheme.colorScheme.onBackground,
-                    versionChipColors = chipColors,
-                    licenseChipColors = chipColors,
-                    fundingChipColors = chipColors,
+                    backgroundColor = MaterialTheme.colorScheme.background,
+                    contentColor = MaterialTheme.colorScheme.onBackground,
+                    badgeBackgroundColor = MaterialTheme.colorScheme.primary,
+                    badgeContentColor = MaterialTheme.colorScheme.onPrimary,
                )
            )
            Scrollbar(lazyListState = lazyListState, modifier = Modifier.padding(paddingValues))
--- a/app/src/main/java/app/revanced/manager/ui/screen/settings/update/UpdatesSettingsScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/settings/update/UpdatesSettingsScreen.kt
@@ -12,7 +12,6 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.res.stringResource
 import app.revanced.manager.R
 import app.revanced.manager.ui.component.AppTopBar
@@ -34,7 +33,6 @@ fun UpdatesSettingsScreen(
    vm: UpdatesSettingsViewModel = koinViewModel(),
 ) {
    val context = LocalContext.current
-    val resources = LocalResources.current
    val coroutineScope = rememberCoroutineScope()
    val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState())

@@ -59,7 +57,7 @@ fun UpdatesSettingsScreen(
                modifier = Modifier.clickable {
                    coroutineScope.launch {
                        if (!vm.isConnected) {
-                            context.toast(resources.getString(R.string.no_network_toast))
+                            context.toast(context.getString(R.string.no_network_toast))
                            return@launch
                        }
                        if (vm.checkForUpdates()) onUpdateClick()
@@ -72,7 +70,7 @@ fun UpdatesSettingsScreen(
            SettingsListItem(
                modifier = Modifier.clickable {
                    if (!vm.isConnected) {
-                        context.toast(resources.getString(R.string.no_network_toast))
+                        context.toast(context.getString(R.string.no_network_toast))
                        return@clickable
                    }
                    onChangelogClick()
--- a/app/src/main/java/app/revanced/manager/ui/viewmodel/BundleListViewModel.kt
+++ b/app/src/main/java/app/revanced/manager/ui/viewmodel/BundleListViewModel.kt
@@ -54,7 +54,6 @@ class BundleListViewModel : ViewModel(), KoinComponent {
                patchBundleRepository.update(
                    *getSelectedSources().filterIsInstance<RemotePatchBundle>().toTypedArray(),
                    showToast = true,
-                    force = true
                )
            }
        }
@@ -66,7 +65,7 @@ class BundleListViewModel : ViewModel(), KoinComponent {
    fun update(src: PatchBundleSource) = viewModelScope.launch {
        if (src !is RemotePatchBundle) return@launch

-        patchBundleRepository.update(src, showToast = true, force = true)
+        patchBundleRepository.update(src, showToast = true)
    }

    enum class Event {
--- a/app/src/main/java/app/revanced/manager/ui/viewmodel/GeneralSettingsViewModel.kt
+++ b/app/src/main/java/app/revanced/manager/ui/viewmodel/GeneralSettingsViewModel.kt
@@ -1,26 +1,17 @@
 package app.revanced.manager.ui.viewmodel

-import android.app.Application
 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.SupportedLocales
 import app.revanced.manager.util.resetListItemColorsCached
 import kotlinx.coroutines.launch
-import java.util.Locale

 class GeneralSettingsViewModel(
-    private val app: Application,
    val prefs: PreferencesManager
 ) : ViewModel() {
    fun setTheme(theme: Theme) = viewModelScope.launch {
        prefs.theme.update(theme)
        resetListItemColorsCached()
    }
-
-    fun getSupportedLocales() = SupportedLocales.getSupportedLocales(app)
-    fun getCurrentLocale() = SupportedLocales.getCurrentLocale()
-    fun setLocale(locale: Locale?) = SupportedLocales.setLocale(locale)
-    fun getLocaleDisplayName(locale: Locale) = SupportedLocales.getDisplayName(locale)
 }
--- a/app/src/main/java/app/revanced/manager/ui/viewmodel/ImportExportViewModel.kt
+++ b/app/src/main/java/app/revanced/manager/ui/viewmodel/ImportExportViewModel.kt
@@ -36,8 +36,8 @@ import kotlin.io.path.deleteExisting
 import kotlin.io.path.inputStream

 sealed class ResetDialogState(
-    @param:StringRes val titleResId: Int,
-    @param:StringRes val descriptionResId: Int,
+    @StringRes val titleResId: Int,
+    @StringRes val descriptionResId: Int,
    val onConfirm: () -> Unit,
    val dialogOptionName: String? = null
 ) {
--- a/app/src/main/java/app/revanced/manager/ui/viewmodel/InstalledAppInfoViewModel.kt
+++ b/app/src/main/java/app/revanced/manager/ui/viewmodel/InstalledAppInfoViewModel.kt
@@ -1,11 +1,17 @@
 package app.revanced.manager.ui.viewmodel

 import android.app.Application
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
 import android.content.pm.PackageInfo
+import android.content.pm.PackageInstaller
 import android.util.Log
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
+import androidx.core.content.ContextCompat
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import app.revanced.manager.R
@@ -13,6 +19,7 @@ import app.revanced.manager.data.room.apps.installed.InstallType
 import app.revanced.manager.data.room.apps.installed.InstalledApp
 import app.revanced.manager.domain.installer.RootInstaller
 import app.revanced.manager.domain.repository.InstalledAppRepository
+import app.revanced.manager.service.UninstallService
 import app.revanced.manager.util.PM
 import app.revanced.manager.util.PatchSelection
 import app.revanced.manager.util.simpleMessage
@@ -23,8 +30,6 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
-import ru.solrudev.ackpine.session.Session
-import ru.solrudev.ackpine.uninstaller.UninstallFailure

 class InstalledAppInfoViewModel(
    packageName: String
@@ -82,28 +87,51 @@ class InstalledAppInfoViewModel(

    fun uninstall() {
        val app = installedApp ?: return
-        viewModelScope.launch {
-            when (app.installType) {
-                InstallType.DEFAULT -> {
-                    when (val result = pm.uninstallPackage(app.currentPackageName)) {
-                        is Session.State.Failed<UninstallFailure> -> {
-                            val msg = result.failure.message.orEmpty()
-                            context.toast(
-                                this@InstalledAppInfoViewModel.context.getString(
-                                    R.string.uninstall_app_fail,
-                                    msg
-                                )
-                            )
-                            return@launch
-                        }
-                        Session.State.Succeeded -> {}
-                    }
-                }
+        when (app.installType) {
+            InstallType.DEFAULT -> pm.uninstallPackage(app.currentPackageName)

-                InstallType.MOUNT -> rootInstaller.uninstall(app.currentPackageName)
+            InstallType.MOUNT -> viewModelScope.launch {
+                rootInstaller.uninstall(app.currentPackageName)
+                installedAppRepository.delete(app)
+                onBackClick()
            }
-            installedAppRepository.delete(app)
-            onBackClick()
        }
    }
+
+    private val uninstallBroadcastReceiver = object : BroadcastReceiver() {
+        override fun onReceive(context: Context?, intent: Intent?) {
+            when (intent?.action) {
+                UninstallService.APP_UNINSTALL_ACTION -> {
+                    val extraStatus =
+                        intent.getIntExtra(UninstallService.EXTRA_UNINSTALL_STATUS, -999)
+                    val extraStatusMessage =
+                        intent.getStringExtra(UninstallService.EXTRA_UNINSTALL_STATUS_MESSAGE)
+
+                    if (extraStatus == PackageInstaller.STATUS_SUCCESS) {
+                        viewModelScope.launch {
+                            installedApp?.let {
+                                installedAppRepository.delete(it)
+                            }
+                            onBackClick()
+                        }
+                    } else if (extraStatus != PackageInstaller.STATUS_FAILURE_ABORTED) {
+                        this@InstalledAppInfoViewModel.context.toast(this@InstalledAppInfoViewModel.context.getString(R.string.uninstall_app_fail, extraStatusMessage))
+                    }
+
+                }
+            }
+        }
+    }.also {
+        ContextCompat.registerReceiver(
+            context,
+            it,
+            IntentFilter(UninstallService.APP_UNINSTALL_ACTION),
+            ContextCompat.RECEIVER_NOT_EXPORTED
+        )
+    }
+
+    override fun onCleared() {
+        super.onCleared()
+        context.unregisterReceiver(uninstallBroadcastReceiver)
+    }
 }
--- a/app/src/main/java/app/revanced/manager/ui/viewmodel/PatcherViewModel.kt
+++ b/app/src/main/java/app/revanced/manager/ui/viewmodel/PatcherViewModel.kt
@@ -1,9 +1,11 @@
 package app.revanced.manager.ui.viewmodel

 import android.app.Application
+import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import android.content.pm.PackageInstaller as AndroidPackageInstaller
+import android.content.IntentFilter
+import android.content.pm.PackageInstaller
 import android.net.Uri
 import android.os.ParcelUuid
 import android.util.Log
@@ -14,6 +16,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.saveable.autoSaver
 import androidx.compose.runtime.setValue
 import androidx.compose.runtime.toMutableStateList
+import androidx.core.content.ContextCompat
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.map
@@ -29,35 +32,32 @@ import app.revanced.manager.data.room.apps.installed.InstalledApp
 import app.revanced.manager.domain.installer.RootInstaller
 import app.revanced.manager.domain.repository.InstalledAppRepository
 import app.revanced.manager.domain.worker.WorkerRepository
-import app.revanced.manager.patcher.ProgressEvent
-import app.revanced.manager.patcher.StepId
 import app.revanced.manager.patcher.logger.LogLevel
 import app.revanced.manager.patcher.logger.Logger
 import app.revanced.manager.patcher.worker.PatcherWorker
 import app.revanced.manager.plugin.downloader.PluginHostApi
 import app.revanced.manager.plugin.downloader.UserInteractionException
+import app.revanced.manager.service.InstallService
+import app.revanced.manager.service.UninstallService
 import app.revanced.manager.ui.model.InstallerModel
+import app.revanced.manager.ui.model.ProgressKey
 import app.revanced.manager.ui.model.SelectedApp
 import app.revanced.manager.ui.model.State
-import app.revanced.manager.ui.model.StepCategory
 import app.revanced.manager.ui.model.Step
+import app.revanced.manager.ui.model.StepCategory
+import app.revanced.manager.ui.model.StepProgressProvider
 import app.revanced.manager.ui.model.navigation.Patcher
-import app.revanced.manager.ui.model.withState
 import app.revanced.manager.util.PM
-import app.revanced.manager.util.PatchSelection
-import app.revanced.manager.util.asCode
 import app.revanced.manager.util.saveableVar
 import app.revanced.manager.util.saver.snapshotStateListSaver
+import app.revanced.manager.util.simpleMessage
+import app.revanced.manager.util.tag
 import app.revanced.manager.util.toast
 import app.revanced.manager.util.uiSafe
 import kotlinx.coroutines.CompletableDeferred
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.NonCancellable
-import kotlinx.coroutines.async
-import kotlinx.coroutines.cancel
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.receiveAsFlow
 import kotlinx.coroutines.launch
@@ -66,15 +66,6 @@ import kotlinx.coroutines.withContext
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.get
 import org.koin.core.component.inject
-import ru.solrudev.ackpine.installer.InstallFailure
-import ru.solrudev.ackpine.installer.PackageInstaller
-import ru.solrudev.ackpine.installer.createSession
-import ru.solrudev.ackpine.installer.getSession
-import ru.solrudev.ackpine.session.ProgressSession
-import ru.solrudev.ackpine.session.Session
-import ru.solrudev.ackpine.session.await
-import ru.solrudev.ackpine.session.parameters.Confirmation
-import ru.solrudev.ackpine.uninstaller.UninstallFailure
 import java.io.File
 import java.nio.file.Files
 import java.time.Duration
@@ -82,7 +73,7 @@ import java.time.Duration
@OptIn(SavedStateHandleSaveableApi::class, PluginHostApi::class)
 class PatcherViewModel(
    private val input: Patcher.ViewModelParams
-) : ViewModel(), KoinComponent, InstallerModel {
+) : ViewModel(), KoinComponent, StepProgressProvider, InstallerModel {
    private val app: Application by inject()
    private val fs: Filesystem by inject()
    private val pm: PM by inject()
@@ -90,7 +81,6 @@ class PatcherViewModel(
    private val installedAppRepository: InstalledAppRepository by inject()
    private val rootInstaller: RootInstaller by inject()
    private val savedStateHandle: SavedStateHandle = get()
-    private val ackpineInstaller: PackageInstaller = get()

    private var installedApp: InstalledApp? = null
    private val selectedApp = input.selectedApp
@@ -105,6 +95,7 @@ class PatcherViewModel(
        mutableStateOf<String?>(null)
    }
        private set
+    private var ongoingPmSession: Boolean by savedStateHandle.saveableVar { false }
    var packageInstallerStatus: Int? by savedStateHandle.saveable(
        key = "packageInstallerStatus",
        stateSaver = autoSaver()
@@ -113,7 +104,7 @@ class PatcherViewModel(
    }
        private set

-    var isInstalling by mutableStateOf(false)
+    var isInstalling by mutableStateOf(ongoingPmSession)
        private set

    private var currentActivityRequest: Pair<CompletableDeferred<Boolean>, String>? by mutableStateOf(
@@ -132,18 +123,6 @@ class PatcherViewModel(
        }
    }

-    /**
-     * This coroutine scope is used to await installations.
-     * It should not be cancelled on system-initiated process death since that would cancel the installation process.
-     */
-    private val installerCoroutineScope = CoroutineScope(Dispatchers.Main)
-
-    /**
-     * Holds the package name of the Apk we are trying to install.
-     */
-    private var installerPkgName: String by savedStateHandle.saveableVar { "" }
-    private var installerSessionId: ParcelUuid? by savedStateHandle.saveableVar()
-
    private var inputFile: File? by savedStateHandle.saveableVar()
    private val outputFile = tempDir.resolve("output.apk")

@@ -159,15 +138,35 @@ class PatcherViewModel(
        }
    }

-    val steps by savedStateHandle.saveable(saver = snapshotStateListSaver()) {
-        generateSteps(app, input.selectedApp, input.selectedPatches).toMutableStateList()
+    private val patchCount = input.selectedPatches.values.sumOf { it.size }
+    private var completedPatchCount by savedStateHandle.saveable {
+        // SavedStateHandle.saveable only supports the boxed version.
+        @Suppress("AutoboxingStateCreation") mutableStateOf(
+            0
+        )
    }
+    val patchesProgress get() = completedPatchCount to patchCount
+    override var downloadProgress by savedStateHandle.saveable(
+        key = "downloadProgress",
+        stateSaver = autoSaver()
+    ) {
+        mutableStateOf<Pair<Long, Long?>?>(null)
+    }
+        private set
+    val steps by savedStateHandle.saveable(saver = snapshotStateListSaver()) {
+        generateSteps(
+            app,
+            input.selectedApp
+        ).toMutableStateList()
+    }
+    private var currentStepIndex = 0

    val progress by derivedStateOf {
-        val steps = steps.filter { it.id != StepId.ExecutePatches }
+        val current = steps.count {
+            it.state == State.COMPLETED && it.category != StepCategory.PATCHING
+        } + completedPatchCount

-        val current = steps.count { it.state == State.COMPLETED }
-        val total = steps.size
+        val total = steps.size - 1 + patchCount

        current.toFloat() / total.toFloat()
    }
@@ -175,46 +174,67 @@ class PatcherViewModel(
    private val workManager = WorkManager.getInstance(app)

    private val patcherWorkerId by savedStateHandle.saveable<ParcelUuid> {
-        ParcelUuid(
-            workerRepository.launchExpedited<PatcherWorker, PatcherWorker.Args>(
-                "patching", PatcherWorker.Args(
-                    input.selectedApp,
-                    outputFile.path,
-                    input.selectedPatches,
-                    input.options,
-                    logger,
-                    setInputFile = { withContext(Dispatchers.Main) { inputFile = it } },
-                    handleStartActivityRequest = { plugin, intent ->
-                        withContext(Dispatchers.Main) {
-                            if (currentActivityRequest != null) throw Exception("Another request is already pending.")
-                            try {
-                                // Wait for the dialog interaction.
-                                val accepted = with(CompletableDeferred<Boolean>()) {
-                                    currentActivityRequest = this to plugin.name
+        ParcelUuid(workerRepository.launchExpedited<PatcherWorker, PatcherWorker.Args>(
+            "patching", PatcherWorker.Args(
+                input.selectedApp,
+                outputFile.path,
+                input.selectedPatches,
+                input.options,
+                logger,
+                onDownloadProgress = {
+                    withContext(Dispatchers.Main) {
+                        downloadProgress = it
+                    }
+                },
+                onPatchCompleted = { withContext(Dispatchers.Main) { completedPatchCount += 1 } },
+                setInputFile = { withContext(Dispatchers.Main) { inputFile = it } },
+                handleStartActivityRequest = { plugin, intent ->
+                    withContext(Dispatchers.Main) {
+                        if (currentActivityRequest != null) throw Exception("Another request is already pending.")
+                        try {
+                            // Wait for the dialog interaction.
+                            val accepted = with(CompletableDeferred<Boolean>()) {
+                                currentActivityRequest = this to plugin.name

+                                await()
+                            }
+                            if (!accepted) throw UserInteractionException.RequestDenied()
+
+                            // Launch the activity and wait for the result.
+                            try {
+                                with(CompletableDeferred<ActivityResult>()) {
+                                    launchedActivity = this
+                                    launchActivityChannel.send(intent)
                                    await()
                                }
-                                if (!accepted) throw UserInteractionException.RequestDenied()
-
-                                // Launch the activity and wait for the result.
-                                try {
-                                    with(CompletableDeferred<ActivityResult>()) {
-                                        launchedActivity = this
-                                        launchActivityChannel.send(intent)
-                                        await()
-                                    }
-                                } finally {
-                                    launchedActivity = null
-                                }
                            } finally {
-                                currentActivityRequest = null
+                                launchedActivity = null
                            }
+                        } finally {
+                            currentActivityRequest = null
                        }
-                    },
-                    onEvent = ::handleProgressEvent,
-                )
+                    }
+                },
+                onProgress = { name, state, message ->
+                    viewModelScope.launch {
+                        steps[currentStepIndex] = steps[currentStepIndex].run {
+                            copy(
+                                name = name ?: this.name,
+                                state = state ?: this.state,
+                                message = message ?: this.message
+                            )
+                        }
+
+                        if (state == State.COMPLETED && currentStepIndex != steps.lastIndex) {
+                            currentStepIndex++
+
+                            steps[currentStepIndex] =
+                                steps[currentStepIndex].copy(state = State.RUNNING)
+                        }
+                    }
+                }
            )
-        )
+        ))
    }

    val patcherSucceeded =
@@ -226,26 +246,64 @@ class PatcherViewModel(
            }
        }

-    init {
-        // TODO: detect system-initiated process death during the patching process.
+    private val installerBroadcastReceiver = object : BroadcastReceiver() {
+        override fun onReceive(context: Context?, intent: Intent?) {
+            when (intent?.action) {
+                InstallService.APP_INSTALL_ACTION -> {
+                    val pmStatus = intent.getIntExtra(
+                        InstallService.EXTRA_INSTALL_STATUS,
+                        PackageInstaller.STATUS_FAILURE
+                    )

-        installerSessionId?.uuid?.let { id ->
-            viewModelScope.launch {
-                try {
-                    isInstalling = true
-                    uiSafe(app, R.string.install_app_fail, "Failed to install") {
-                        // The process was killed during installation. Await the session again.
-                        withContext(Dispatchers.IO) {
-                            ackpineInstaller.getSession(id)
-                        }?.let {
-                            awaitInstallation(it)
+                    intent.getStringExtra(UninstallService.EXTRA_UNINSTALL_STATUS_MESSAGE)
+                        ?.let(logger::trace)
+
+                    if (pmStatus == PackageInstaller.STATUS_SUCCESS) {
+                        app.toast(app.getString(R.string.install_app_success))
+                        installedPackageName =
+                            intent.getStringExtra(InstallService.EXTRA_PACKAGE_NAME)
+                        viewModelScope.launch {
+                            installedAppRepository.addOrUpdate(
+                                installedPackageName!!,
+                                packageName,
+                                input.selectedApp.version
+                                    ?: pm.getPackageInfo(outputFile)?.versionName!!,
+                                InstallType.DEFAULT,
+                                input.selectedPatches
+                            )
                        }
-                    }
-                } finally {
+                    } else packageInstallerStatus = pmStatus
+
                    isInstalling = false
                }
+
+                UninstallService.APP_UNINSTALL_ACTION -> {
+                    val pmStatus = intent.getIntExtra(
+                        UninstallService.EXTRA_UNINSTALL_STATUS,
+                        PackageInstaller.STATUS_FAILURE
+                    )
+
+                    intent.getStringExtra(UninstallService.EXTRA_UNINSTALL_STATUS_MESSAGE)
+                        ?.let(logger::trace)
+
+                    if (pmStatus != PackageInstaller.STATUS_SUCCESS)
+                        packageInstallerStatus = pmStatus
+                }
            }
        }
+    }
+
+    init {
+        // TODO: detect system-initiated process death during the patching process.
+        ContextCompat.registerReceiver(
+            app,
+            installerBroadcastReceiver,
+            IntentFilter().apply {
+                addAction(InstallService.APP_INSTALL_ACTION)
+                addAction(UninstallService.APP_UNINSTALL_ACTION)
+            },
+            ContextCompat.RECEIVER_NOT_EXPORTED
+        )

        viewModelScope.launch {
            installedApp = installedAppRepository.get(packageName)
@@ -255,6 +313,7 @@ class PatcherViewModel(
    @OptIn(DelicateCoroutinesApi::class)
    override fun onCleared() {
        super.onCleared()
+        app.unregisterReceiver(installerBroadcastReceiver)
        workManager.cancelWorkById(patcherWorkerId.uuid)

        if (input.selectedApp is SelectedApp.Installed && installedApp?.installType == InstallType.MOUNT) {
@@ -268,37 +327,7 @@ class PatcherViewModel(
        }
    }

-    private fun handleProgressEvent(event: ProgressEvent) = viewModelScope.launch {
-        val stepIndex = steps.indexOfFirst {
-            event.stepId?.let { id -> id == it.id }
-                ?: (it.state == State.RUNNING || it.state == State.WAITING)
-        }
-
-        if (stepIndex != -1) steps[stepIndex] = steps[stepIndex].run {
-            when (event) {
-                is ProgressEvent.Started -> withState(State.RUNNING)
-
-                is ProgressEvent.Progress -> withState(
-                    message = event.message ?: message,
-                    progress = event.current?.let { event.current to event.total } ?: progress
-                )
-
-                is ProgressEvent.Completed -> withState(State.COMPLETED, progress = null)
-
-                is ProgressEvent.Failed -> {
-                    if (event.stepId == null && steps.any { it.state == State.FAILED }) return@launch
-                    withState(
-                        State.FAILED,
-                        message = event.error.stackTrace,
-                        progress = null
-                    )
-                }
-            }
-        }
-    }
-
    fun onBack() {
-        installerCoroutineScope.cancel()
        // tempDir cannot be deleted inside onCleared because it gets called on system-initiated process death.
        tempDir.deleteRecursively()
    }
@@ -343,111 +372,50 @@ class PatcherViewModel(

    fun open() = installedPackageName?.let(pm::launch)

-    private suspend fun startInstallation(file: File, packageName: String) {
-        val session = withContext(Dispatchers.IO) {
-            ackpineInstaller.createSession(Uri.fromFile(file)) {
-                confirmation = Confirmation.IMMEDIATE
-            }
-        }
-        withContext(Dispatchers.Main) {
-            installerPkgName = packageName
-        }
-        awaitInstallation(session)
-    }
-
-    private suspend fun awaitInstallation(session: ProgressSession<InstallFailure>) = withContext(
-        Dispatchers.Main
-    ) {
-        val result = installerCoroutineScope.async {
-            try {
-                installerSessionId = ParcelUuid(session.id)
-                withContext(Dispatchers.IO) {
-                    session.await()
-                }
-            } finally {
-                installerSessionId = null
-            }
-        }.await()
-
-        when (result) {
-            is Session.State.Failed<InstallFailure> -> {
-                result.failure.message?.let(logger::trace)
-                packageInstallerStatus = result.failure.asCode()
-            }
-
-            Session.State.Succeeded -> {
-                app.toast(app.getString(R.string.install_app_success))
-                installedPackageName = installerPkgName
-                installedAppRepository.addOrUpdate(
-                    installerPkgName,
-                    packageName,
-                    input.selectedApp.version
-                        ?: withContext(Dispatchers.IO) { pm.getPackageInfo(outputFile)?.versionName!! },
-                    InstallType.DEFAULT,
-                    input.selectedPatches
-                )
-            }
-        }
-    }
-
    fun install(installType: InstallType) = viewModelScope.launch {
-        isInstalling = true
-        var needsRootUninstall = false
+        var pmInstallStarted = false
        try {
-            uiSafe(app, R.string.install_app_fail, "Failed to install") {
-                val currentPackageInfo =
-                    withContext(Dispatchers.IO) { pm.getPackageInfo(outputFile) }
+            isInstalling = true
+
+            when (installType) {
+                InstallType.DEFAULT -> {
+                    val currentPackageInfo = pm.getPackageInfo(outputFile)
                        ?: throw Exception("Failed to load application info")

-                // If the app is currently installed
-                val existingPackageInfo =
-                    withContext(Dispatchers.IO) { pm.getPackageInfo(currentPackageInfo.packageName) }
-                if (existingPackageInfo != null) {
-                    // Check if the app version is less than the installed version
-                    if (
-                        pm.getVersionCode(currentPackageInfo) < pm.getVersionCode(
-                            existingPackageInfo
-                        )
-                    ) {
-                        // Exit if the selected app version is less than the installed version
-                        packageInstallerStatus = AndroidPackageInstaller.STATUS_FAILURE_CONFLICT
-                        return@launch
+                    // If the app is currently installed
+                    val existingPackageInfo = pm.getPackageInfo(currentPackageInfo.packageName)
+                    if (existingPackageInfo != null) {
+                        // Check if the app version is less than the installed version
+                        if (pm.getVersionCode(currentPackageInfo) < pm.getVersionCode(existingPackageInfo)) {
+                            // Exit if the selected app version is less than the installed version
+                            packageInstallerStatus = PackageInstaller.STATUS_FAILURE_CONFLICT
+                            return@launch
+                        }
                    }
+
+                    // Check if the app is mounted as root
+                    // If it is, unmount it first, silently
+                    if (rootInstaller.hasRootAccess() && rootInstaller.isAppMounted(packageName)) {
+                        rootInstaller.unmount(packageName)
+                    }
+
+                    // Install regularly
+                    pm.installApp(listOf(outputFile))
+                    pmInstallStarted = true
                }

-                when (installType) {
-                    InstallType.DEFAULT -> {
-                        // Check if the app is mounted as root
-                        // If it is, unmount it first, silently
-                        if (rootInstaller.hasRootAccess() && rootInstaller.isAppMounted(packageName)) {
-                            rootInstaller.unmount(packageName)
-                        }
-
-                        // Install regularly
-                        startInstallation(outputFile, currentPackageInfo.packageName)
-                    }
-
-                    InstallType.MOUNT -> {
+                InstallType.MOUNT -> {
+                    try {
+                        val packageInfo = pm.getPackageInfo(outputFile)
+                            ?: throw Exception("Failed to load application info")
                        val label = with(pm) {
-                            currentPackageInfo.label()
-                        }
-
-                        // Check for base APK, first check if the app is already installed
-                        if (existingPackageInfo == null) {
-                            // If the app is not installed, check if the output file is a base apk
-                            if (currentPackageInfo.splitNames.isNotEmpty()) {
-                                // Exit if there is no base APK package
-                                packageInstallerStatus =
-                                    AndroidPackageInstaller.STATUS_FAILURE_INVALID
-                                return@launch
-                            }
+                            packageInfo.label()
                        }

                        val inputVersion = input.selectedApp.version
-                            ?: withContext(Dispatchers.IO) { inputFile?.let(pm::getPackageInfo)?.versionName }
+                            ?: inputFile?.let(pm::getPackageInfo)?.versionName
                            ?: throw Exception("Failed to determine input APK version")

-                        needsRootUninstall = true
                        // Install as root
                        rootInstaller.install(
                            outputFile,
@@ -458,7 +426,7 @@ class PatcherViewModel(
                        )

                        installedAppRepository.addOrUpdate(
-                            currentPackageInfo.packageName,
+                            packageInfo.packageName,
                            packageName,
                            inputVersion,
                            InstallType.MOUNT,
@@ -470,20 +438,21 @@ class PatcherViewModel(
                        installedPackageName = packageName

                        app.toast(app.getString(R.string.install_app_success))
-                        needsRootUninstall = false
+                    } catch (e: Exception) {
+                        Log.e(tag, "Failed to install as root", e)
+                        app.toast(app.getString(R.string.install_app_fail, e.simpleMessage()))
+                        try {
+                            rootInstaller.uninstall(packageName)
+                        } catch (_: Exception) {
+                        }
                    }
                }
            }
+        } catch (e: Exception) {
+            Log.e(tag, "Failed to install", e)
+            app.toast(app.getString(R.string.install_app_fail, e.simpleMessage()))
        } finally {
-            isInstalling = false
-            if (needsRootUninstall) {
-                try {
-                    withContext(NonCancellable) {
-                        rootInstaller.uninstall(packageName)
-                    }
-                } catch (_: Exception) {
-                }
-            }
+            if (!pmInstallStarted) isInstalling = false
        }
    }

@@ -494,27 +463,12 @@ class PatcherViewModel(

    override fun reinstall() {
        viewModelScope.launch {
-            try {
+            uiSafe(app, R.string.reinstall_app_fail, "Failed to reinstall") {
+                pm.getPackageInfo(outputFile)?.packageName?.let { pm.uninstallPackage(it) }
+                    ?: throw Exception("Failed to load application info")
+
+                pm.installApp(listOf(outputFile))
                isInstalling = true
-                uiSafe(app, R.string.reinstall_app_fail, "Failed to reinstall") {
-                    val pkgName = withContext(Dispatchers.IO) {
-                        pm.getPackageInfo(outputFile)?.packageName
-                            ?: throw Exception("Failed to load application info")
-                    }
-
-                    when (val result = pm.uninstallPackage(pkgName)) {
-                        is Session.State.Failed<UninstallFailure> -> {
-                            result.failure.message?.let(logger::trace)
-                            packageInstallerStatus = result.failure.asCode()
-                            return@launch
-                        }
-
-                        Session.State.Succeeded -> {}
-                    }
-                    startInstallation(outputFile, pkgName)
-                }
-            } finally {
-                isInstalling = false
            }
        }
    }
@@ -533,66 +487,34 @@ class PatcherViewModel(
            LogLevel.ERROR -> Log.e(TAG, msg)
        }

-        fun generateSteps(
-            context: Context,
-            selectedApp: SelectedApp,
-            selectedPatches: PatchSelection
-        ): List<Step> = buildList {
-            if (selectedApp is SelectedApp.Download || selectedApp is SelectedApp.Search)
-                add(
-                    Step(
-                        StepId.DownloadAPK,
-                        context.getString(R.string.download_apk),
-                        StepCategory.PREPARING
-                    )
-                )
+        fun generateSteps(context: Context, selectedApp: SelectedApp): List<Step> {
+            val needsDownload =
+                selectedApp is SelectedApp.Download || selectedApp is SelectedApp.Search

-            add(
+            return listOfNotNull(
+                Step(
+                    context.getString(R.string.download_apk),
+                    StepCategory.PREPARING,
+                    state = State.RUNNING,
+                    progressKey = ProgressKey.DOWNLOAD,
+                ).takeIf { needsDownload },
                Step(
-                    StepId.LoadPatches,
                    context.getString(R.string.patcher_step_load_patches),
-                    StepCategory.PREPARING
-                )
-            )
-            add(
+                    StepCategory.PREPARING,
+                    state = if (needsDownload) State.WAITING else State.RUNNING,
+                ),
                Step(
-                    StepId.ReadAPK,
                    context.getString(R.string.patcher_step_unpack),
                    StepCategory.PREPARING
-                )
-            )
-            add(
+                ),
+
                Step(
-                    StepId.ExecutePatches,
                    context.getString(R.string.execute_patches),
-                    StepCategory.PATCHING,
-                    hide = true
-                )
-            )
+                    StepCategory.PATCHING
+                ),

-            selectedPatches.values.asSequence().flatten().sorted().forEachIndexed { index, name ->
-                add(
-                    Step(
-                        StepId.ExecutePatch(index),
-                        name,
-                        StepCategory.PATCHING
-                    )
-                )
-            }
-
-            add(
-                Step(
-                    StepId.WriteAPK,
-                    context.getString(R.string.patcher_step_write_patched),
-                    StepCategory.SAVING
-                )
-            )
-            add(
-                Step(
-                    StepId.SignAPK,
-                    context.getString(R.string.patcher_step_sign_apk),
-                    StepCategory.SAVING
-                )
+                Step(context.getString(R.string.patcher_step_write_patched), StepCategory.SAVING),
+                Step(context.getString(R.string.patcher_step_sign_apk), StepCategory.SAVING)
            )
        }
    }
--- a/app/src/main/java/app/revanced/manager/ui/viewmodel/SelectedAppInfoViewModel.kt
+++ b/app/src/main/java/app/revanced/manager/ui/viewmodel/SelectedAppInfoViewModel.kt
@@ -8,6 +8,7 @@ import android.os.Parcelable
 import android.util.Log
 import androidx.activity.result.ActivityResult
 import androidx.annotation.StringRes
+import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -128,6 +129,8 @@ class SelectedAppInfoViewModel(
    }

    var options: Options by savedStateHandle.saveable {
+        val state = mutableStateOf<Options>(emptyMap())
+
        viewModelScope.launch {
            if (!persistConfiguration) return@launch // TODO: save options for patched apps.
            val bundlePatches = bundleInfoFlow.first()
@@ -138,7 +141,7 @@ class SelectedAppInfoViewModel(
            }
        }

-        mutableStateOf(emptyMap())
+        state
    }
        private set

@@ -146,6 +149,8 @@ class SelectedAppInfoViewModel(
        if (input.patches != null)
            return@saveable mutableStateOf(SelectionState.Customized(input.patches))

+        val selection: MutableState<SelectionState> = mutableStateOf(SelectionState.Default)
+
        // Try to get the previous selection if customization is enabled.
        viewModelScope.launch {
            if (!prefs.disableSelectionWarning.get()) return@launch
@@ -155,7 +160,7 @@ class SelectedAppInfoViewModel(
            selectionState = SelectionState.Customized(previous)
        }

-        mutableStateOf(SelectionState.Default)
+        selection
    }

    var showSourceSelector by mutableStateOf(false)
@@ -306,7 +311,7 @@ class SelectedAppInfoViewModel(
        }
    }

-    enum class Error(@param:StringRes val resourceId: Int) {
+    enum class Error(@StringRes val resourceId: Int) {
        NoPlugins(R.string.downloader_no_plugins_available)
    }

--- a/app/src/main/java/app/revanced/manager/ui/viewmodel/UpdateViewModel.kt
+++ b/app/src/main/java/app/revanced/manager/ui/viewmodel/UpdateViewModel.kt
@@ -1,13 +1,18 @@
 package app.revanced.manager.ui.viewmodel

 import android.app.Application
-import android.net.Uri
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.content.pm.PackageInstaller
 import androidx.annotation.StringRes
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableLongStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
+import androidx.core.content.ContextCompat
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import app.revanced.manager.R
@@ -16,6 +21,8 @@ import app.revanced.manager.data.platform.NetworkInfo
 import app.revanced.manager.network.api.ReVancedAPI
 import app.revanced.manager.network.dto.ReVancedAsset
 import app.revanced.manager.network.service.HttpService
+import app.revanced.manager.service.InstallService
+import app.revanced.manager.util.PM
 import app.revanced.manager.util.toast
 import app.revanced.manager.util.uiSafe
 import io.ktor.client.plugins.onDownload
@@ -24,14 +31,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.koin.core.component.KoinComponent
-import org.koin.core.component.get
 import org.koin.core.component.inject
-import ru.solrudev.ackpine.installer.InstallFailure
-import ru.solrudev.ackpine.installer.PackageInstaller
-import ru.solrudev.ackpine.installer.createSession
-import ru.solrudev.ackpine.session.Session
-import ru.solrudev.ackpine.session.await
-import ru.solrudev.ackpine.session.parameters.Confirmation

 class UpdateViewModel(
    private val downloadOnScreenEntry: Boolean
@@ -39,11 +39,10 @@ class UpdateViewModel(
    private val app: Application by inject()
    private val reVancedAPI: ReVancedAPI by inject()
    private val http: HttpService by inject()
+    private val pm: PM by inject()
    private val networkInfo: NetworkInfo by inject()
    private val fs: Filesystem by inject()
-    private val ackpineInstaller: PackageInstaller = get()

-    // TODO: save state to handle process death.
    var downloadedSize by mutableLongStateOf(0L)
        private set
    var totalSize by mutableLongStateOf(0L)
@@ -63,17 +62,14 @@ class UpdateViewModel(
        private set

    private val location = fs.tempDir.resolve("updater.apk")
+    private val job = viewModelScope.launch {
+        uiSafe(app, R.string.download_manager_failed, "Failed to download ReVanced Manager") {
+            releaseInfo = reVancedAPI.getAppUpdate() ?: throw Exception("No update available")

-    init {
-        viewModelScope.launch {
-            uiSafe(app, R.string.download_manager_failed, "Failed to download ReVanced Manager") {
-                releaseInfo = reVancedAPI.getAppUpdate() ?: throw Exception("No update available")
-
-                if (downloadOnScreenEntry) {
-                    downloadUpdate()
-                } else {
-                    state = State.CAN_DOWNLOAD
-                }
+            if (downloadOnScreenEntry) {
+                downloadUpdate()
+            } else {
+                state = State.CAN_DOWNLOAD
            }
        }
    }
@@ -82,7 +78,7 @@ class UpdateViewModel(
        uiSafe(app, R.string.failed_to_download_update, "Failed to download update") {
            val release = releaseInfo!!
            withContext(Dispatchers.IO) {
-                if (!networkInfo.isSafe(false) && !ignoreInternetCheck) {
+                if (!networkInfo.isSafe() && !ignoreInternetCheck) {
                    showInternetCheckDialog = true
                } else {
                    state = State.DOWNLOADING
@@ -90,10 +86,8 @@ class UpdateViewModel(
                    http.download(location) {
                        url(release.downloadUrl)
                        onDownload { bytesSentTotal, contentLength ->
-                            withContext(Dispatchers.Main) {
-                                downloadedSize = bytesSentTotal
-                                contentLength?.let { totalSize = it }
-                            }
+                            downloadedSize = bytesSentTotal
+                            totalSize = contentLength
                        }
                    }
                    installUpdate()
@@ -104,36 +98,50 @@ class UpdateViewModel(

    fun installUpdate() = viewModelScope.launch {
        state = State.INSTALLING
-        val result = withContext(Dispatchers.IO) {
-            ackpineInstaller.createSession(Uri.fromFile(location)) {
-                confirmation = Confirmation.IMMEDIATE
-            }.await()
-        }

-        when (result) {
-            is Session.State.Failed<InstallFailure> -> when (val failure = result.failure) {
-                is InstallFailure.Aborted -> state = State.CAN_INSTALL
-                else -> {
-                    val msg = failure.message.orEmpty()
-                    app.toast(app.getString(R.string.install_app_fail, msg))
-                    installError = msg
-                    state = State.FAILED
+        pm.installApp(listOf(location))
+    }
+
+    private val installBroadcastReceiver = object : BroadcastReceiver() {
+        override fun onReceive(context: Context?, intent: Intent?) {
+            intent?.let {
+                val pmStatus = intent.getIntExtra(InstallService.EXTRA_INSTALL_STATUS, -999)
+                val extra =
+                    intent.getStringExtra(InstallService.EXTRA_INSTALL_STATUS_MESSAGE)!!
+
+                when(pmStatus) {
+                    PackageInstaller.STATUS_SUCCESS -> {
+                        app.toast(app.getString(R.string.install_app_success))
+                        state = State.SUCCESS
+                    }
+                    PackageInstaller.STATUS_FAILURE_ABORTED -> {
+                        state = State.CAN_INSTALL
+                    }
+                    else -> {
+                        app.toast(app.getString(R.string.install_app_fail, extra))
+                        installError = extra
+                        state = State.FAILED
+                    }
                }
            }
-
-            Session.State.Succeeded -> {
-                app.toast(app.getString(R.string.install_app_success))
-                state = State.SUCCESS
-            }
        }
    }

+    init {
+        ContextCompat.registerReceiver(app, installBroadcastReceiver, IntentFilter().apply {
+            addAction(InstallService.APP_INSTALL_ACTION)
+        }, ContextCompat.RECEIVER_NOT_EXPORTED)
+    }
+
    override fun onCleared() {
        super.onCleared()
+        app.unregisterReceiver(installBroadcastReceiver)
+
+        job.cancel()
        location.delete()
    }

-    enum class State(@param:StringRes val title: Int) {
+    enum class State(@StringRes val title: Int) {
        CAN_DOWNLOAD(R.string.update_available),
        DOWNLOADING(R.string.downloading_manager_update),
        CAN_INSTALL(R.string.ready_to_install_update),
--- a/app/src/main/java/app/revanced/manager/util/Ackpine.kt
+++ b/app/src/main/java/app/revanced/manager/util/Ackpine.kt
@@ -1,30 +0,0 @@
-package app.revanced.manager.util
-
-import android.annotation.SuppressLint
-import android.content.pm.PackageInstaller
-import ru.solrudev.ackpine.installer.InstallFailure
-import ru.solrudev.ackpine.uninstaller.UninstallFailure
-
-/**
- * Converts an Ackpine installation failure into a PM status code
- */
-fun InstallFailure.asCode() = when (this) {
-    is InstallFailure.Aborted -> PackageInstaller.STATUS_FAILURE_ABORTED
-    is InstallFailure.Blocked -> PackageInstaller.STATUS_FAILURE_BLOCKED
-    is InstallFailure.Conflict -> PackageInstaller.STATUS_FAILURE_CONFLICT
-    is InstallFailure.Incompatible -> PackageInstaller.STATUS_FAILURE_INCOMPATIBLE
-    is InstallFailure.Invalid -> PackageInstaller.STATUS_FAILURE_INVALID
-    is InstallFailure.Storage -> PackageInstaller.STATUS_FAILURE_STORAGE
-    is InstallFailure.Timeout -> @SuppressLint("InlinedApi") PackageInstaller.STATUS_FAILURE_TIMEOUT
-    else -> PackageInstaller.STATUS_FAILURE
-}
-
-/**
- * Converts an Ackpine uninstallation failure into a PM status code
- */
-fun UninstallFailure.asCode() = when (this) {
-    is UninstallFailure.Aborted -> PackageInstaller.STATUS_FAILURE_ABORTED
-    is UninstallFailure.Blocked -> PackageInstaller.STATUS_FAILURE_BLOCKED
-    is UninstallFailure.Conflict -> PackageInstaller.STATUS_FAILURE_CONFLICT
-    else -> PackageInstaller.STATUS_FAILURE
-}
--- a/app/src/main/java/app/revanced/manager/util/PM.kt
+++ b/app/src/main/java/app/revanced/manager/util/PM.kt
@@ -2,8 +2,11 @@ package app.revanced.manager.util

 import android.annotation.SuppressLint
 import android.app.Application
+import android.app.PendingIntent
+import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageInfo
+import android.content.pm.PackageInstaller
 import android.content.pm.PackageManager
 import android.content.pm.PackageManager.PackageInfoFlags
 import android.content.pm.PackageManager.NameNotFoundException
@@ -13,6 +16,8 @@ import android.os.Build
 import android.os.Parcelable
 import androidx.compose.runtime.Immutable
 import app.revanced.manager.domain.repository.PatchBundleRepository
+import app.revanced.manager.service.InstallService
+import app.revanced.manager.service.UninstallService
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
@@ -20,13 +25,10 @@ import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.withContext
 import kotlinx.parcelize.Parcelize
-import ru.solrudev.ackpine.session.await
-import ru.solrudev.ackpine.session.parameters.Confirmation
-import ru.solrudev.ackpine.uninstaller.PackageUninstaller
-import ru.solrudev.ackpine.uninstaller.createSession
-import ru.solrudev.ackpine.uninstaller.parameters.UninstallParametersDsl
 import java.io.File

+private const val byteArraySize = 1024 * 1024 // Because 1,048,576 is not readable
+
@Immutable
@Parcelize
 data class AppInfo(
@@ -38,8 +40,7 @@ data class AppInfo(
@SuppressLint("QueryPermissionsNeeded")
 class PM(
    private val app: Application,
-    patchBundleRepository: PatchBundleRepository,
-    private val uninstaller: PackageUninstaller
+    patchBundleRepository: PatchBundleRepository
 ) {
    private val scope = CoroutineScope(Dispatchers.IO)

@@ -144,11 +145,17 @@ class PM(
        false
    )

-    suspend fun uninstallPackage(pkg: String, config: UninstallParametersDsl.() -> Unit = {}) = withContext(Dispatchers.IO) {
-        uninstaller.createSession(pkg) {
-            confirmation = Confirmation.IMMEDIATE
-            config()
-        }.await()
+    suspend fun installApp(apks: List<File>) = withContext(Dispatchers.IO) {
+        val packageInstaller = app.packageManager.packageInstaller
+        packageInstaller.openSession(packageInstaller.createSession(sessionParams)).use { session ->
+            apks.forEach { apk -> session.writeApk(apk) }
+            session.commit(app.installIntentSender)
+        }
+    }
+
+    fun uninstallPackage(pkg: String) {
+        val packageInstaller = app.packageManager.packageInstaller
+        packageInstaller.uninstall(pkg, app.uninstallIntentSender)
    }

    fun launch(pkg: String) = app.packageManager.getLaunchIntentForPackage(pkg)?.let {
@@ -157,4 +164,44 @@ class PM(
    }

    fun canInstallPackages() = app.packageManager.canRequestPackageInstalls()
+
+    private fun PackageInstaller.Session.writeApk(apk: File) {
+        apk.inputStream().use { inputStream ->
+            openWrite(apk.name, 0, apk.length()).use { outputStream ->
+                inputStream.copyTo(outputStream, byteArraySize)
+                fsync(outputStream)
+            }
+        }
+    }
+
+    private val intentFlags
+        get() = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S)
+            PendingIntent.FLAG_MUTABLE
+        else
+            0
+
+    private val sessionParams
+        get() = PackageInstaller.SessionParams(
+            PackageInstaller.SessionParams.MODE_FULL_INSTALL
+        ).apply {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE)
+                setRequestUpdateOwnership(true)
+            setInstallReason(PackageManager.INSTALL_REASON_USER)
+        }
+
+    private val Context.installIntentSender
+        get() = PendingIntent.getService(
+            this,
+            0,
+            Intent(this, InstallService::class.java),
+            intentFlags
+        ).intentSender
+
+    private val Context.uninstallIntentSender
+        get() = PendingIntent.getService(
+            this,
+            0,
+            Intent(this, UninstallService::class.java),
+            intentFlags
+        ).intentSender
 }
--- a/app/src/main/java/app/revanced/manager/util/SupportedLocales.kt
+++ b/app/src/main/java/app/revanced/manager/util/SupportedLocales.kt
@@ -1,40 +0,0 @@
-package app.revanced.manager.util
-
-import android.app.LocaleConfig
-import android.content.Context
-import android.os.Build
-import android.os.LocaleList
-import androidx.appcompat.app.AppCompatDelegate
-import androidx.core.os.LocaleListCompat
-import app.revanced.manager.BuildConfig
-import java.util.Locale
-
-object SupportedLocales {
-    fun getSupportedLocales(context: Context): List<Locale> {
-        var result: List<Locale>? = null
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) result = runCatching {
-            LocaleConfig(context).supportedLocales?.toList()
-        }.getOrNull()
-
-        return result ?: generated
-    }
-
-    fun getCurrentLocale(): Locale? =
-        AppCompatDelegate.getApplicationLocales().takeIf { !it.isEmpty }?.get(0)
-
-    fun setLocale(locale: Locale?) = AppCompatDelegate.setApplicationLocales(
-        locale?.let { LocaleListCompat.create(it) } ?: LocaleListCompat.getEmptyLocaleList()
-    )
-
-    fun getDisplayName(locale: Locale) =
-        locale.getDisplayName(locale).replaceFirstChar { it.uppercase(locale) }
-
-    private fun LocaleList.toList() = (0 until size()).map { get(it) }
-
-    private val generated by lazy {
-        listOf(
-            Locale.ENGLISH,
-            *BuildConfig.SUPPORTED_LOCALES.map(Locale::forLanguageTag).toTypedArray()
-        )
-    }
-}
--- a/app/src/main/java/app/revanced/manager/util/Util.kt
+++ b/app/src/main/java/app/revanced/manager/util/Util.kt
@@ -15,10 +15,12 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.ReadOnlyComposable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.State
+import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.produceState
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberUpdatedState
-import androidx.compose.runtime.snapshotFlow
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.graphics.Color
@@ -31,7 +33,6 @@ import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import app.revanced.manager.R
-import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
@@ -41,6 +42,7 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.launch
+import kotlinx.datetime.Clock
 import kotlinx.datetime.LocalDateTime
 import kotlinx.datetime.TimeZone
 import kotlinx.datetime.format.MonthNames
@@ -48,11 +50,9 @@ import kotlinx.datetime.format.char
 import kotlinx.datetime.toInstant
 import kotlinx.datetime.toLocalDateTime
 import java.util.Locale
-import kotlin.math.abs
 import kotlin.properties.PropertyDelegateProvider
 import kotlin.properties.ReadWriteProperty
 import kotlin.reflect.KProperty
-import kotlin.time.Clock

 typealias PatchSelection = Map<Int, Set<String>>
 typealias Options = Map<Int, Map<String, Map<String, Any?>>>
@@ -82,8 +82,6 @@ fun Context.toast(string: String, duration: Int = Toast.LENGTH_SHORT) {
 inline fun uiSafe(context: Context, @StringRes toastMsg: Int, logMsg: String, block: () -> Unit) {
    try {
        block()
-    } catch (e: CancellationException) {
-        throw e
    } catch (error: Exception) {
        // You can only toast on the main thread.
        GlobalScope.launch(Dispatchers.Main) {
@@ -168,7 +166,7 @@ fun LocalDateTime.relativeTime(context: Context): String {
            else -> LocalDateTime.Format {
                monthName(MonthNames.ENGLISH_ABBREVIATED)
                char(' ')
-                day()
+                dayOfMonth()
                if (now.toLocalDateTime(TimeZone.UTC).year != this@relativeTime.year) {
                    chars(", ")
                    year()
@@ -195,12 +193,7 @@ val transparentListItemColors
            .also { transparentListItemColorsCached = it }

@Composable
-fun <T> EventEffect(
-    flow: Flow<T>,
-    vararg keys: Any?,
-    state: Lifecycle.State = Lifecycle.State.STARTED,
-    block: suspend (T) -> Unit
-) {
+fun <T> EventEffect(flow: Flow<T>, vararg keys: Any?, state: Lifecycle.State = Lifecycle.State.STARTED, block: suspend (T) -> Unit) {
    val lifecycleOwner = LocalLifecycleOwner.current
    val currentBlock by rememberUpdatedState(block)

@@ -216,36 +209,40 @@ fun <T> EventEffect(
 const val isScrollingUpSensitivity = 10

@Composable
-fun LazyListState.isScrollingUp() = produceState(true, this) {
-    var previousIndex = firstVisibleItemIndex
-    var previousScrollOffset = firstVisibleItemScrollOffset
+fun LazyListState.isScrollingUp(): State<Boolean> {
+    return remember(this) {
+        var previousIndex by mutableIntStateOf(firstVisibleItemIndex)
+        var previousScrollOffset by mutableIntStateOf(firstVisibleItemScrollOffset)

-    snapshotFlow {
-        firstVisibleItemIndex to firstVisibleItemScrollOffset
-    }.collect { (index, scrollOffset) ->
-        val indexChanged = previousIndex != index
-        val offsetChanged = abs(previousScrollOffset - scrollOffset) > isScrollingUpSensitivity
+        derivedStateOf {
+            val indexChanged = previousIndex != firstVisibleItemIndex
+            val offsetChanged =
+                kotlin.math.abs(previousScrollOffset - firstVisibleItemScrollOffset) > isScrollingUpSensitivity

-        value = when {
-            indexChanged -> previousIndex > index
-            offsetChanged -> previousScrollOffset > scrollOffset
-            else -> value
+            if (indexChanged) {
+                previousIndex > firstVisibleItemIndex
+            } else if (offsetChanged) {
+                previousScrollOffset > firstVisibleItemScrollOffset
+            } else {
+                true
+            }.also {
+                previousIndex = firstVisibleItemIndex
+                previousScrollOffset = firstVisibleItemScrollOffset
+            }
        }
-        previousIndex = index
-        previousScrollOffset = scrollOffset
    }
 }

+// TODO: support sensitivity
@Composable
-fun ScrollState.isScrollingUp() = produceState(true, this) {
-    var previousScrollOffset = this@isScrollingUp.value
-
-    snapshotFlow { this@isScrollingUp.value }.collect { scrollOffset ->
-        if (abs(previousScrollOffset - scrollOffset) > isScrollingUpSensitivity) {
-            value = previousScrollOffset >= scrollOffset
+fun ScrollState.isScrollingUp(): State<Boolean> {
+    return remember(this) {
+        var previousScrollOffset by mutableIntStateOf(value)
+        derivedStateOf {
+            (previousScrollOffset >= value).also {
+                previousScrollOffset = value
+            }
        }
-
-        previousScrollOffset = scrollOffset
    }
 }

--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -14,7 +14,7 @@ Second \"item\" text"</string>
 -->
 <resources>
    <string name="app_name">ReVanced Manager</string>
-    <string name="patcher">Patcher test</string>
+    <string name="patcher">Patcher</string>
    <string name="patches">Patches</string>
    <string name="cli">CLI</string>
    <string name="manager">Manager</string>
@@ -83,7 +83,7 @@ Second \"item\" text"</string>
    <string name="auto_updates_dialog_note">These settings can be changed later.</string>

    <string name="general">General</string>
-    <string name="general_description">Language, theme, dynamic color</string>
+    <string name="general_description">Theme, dynamic color</string>
    <string name="updates">Updates</string>
    <string name="updates_description">Check for updates and view changelogs</string>
    <string name="downloads">Downloads</string>
@@ -104,9 +104,6 @@ Second \"item\" text"</string>
    <string name="pure_black_theme_description">Use pure black backgrounds for dark theme</string>
    <string name="theme">Theme</string>
    <string name="theme_description">Choose between light or dark theme</string>
-    <string name="language">Language</string>
-    <string name="language_description">Choose the app display language</string>
-    <string name="language_system_default">System default</string>
    <string name="safeguards">Safeguards</string>
    <string name="patch_compat_check">Disable version compatibility check</string>
    <string name="patch_compat_check_description">Do not restrict patches to compatible app versions</string>
@@ -220,10 +217,6 @@ You will not be able to update the previously installed apps from this source."<
    <string name="light">Light</string>
    <string name="dark">Dark</string>
    <string name="appearance">Appearance</string>
-    <string name="networking">Networking</string>
-    <string name="allow_metered_networks">Allow metered networks</string>
-    <string name="allow_metered_networks_description">Permits automatic updates on metered networks.
-    The application might still warn about metered networks for manual operations.</string>
    <string name="downloaded_apps">Downloaded apps</string>
    <string name="process_runtime">Run Patcher in another process (experimental)</string>
    <string name="process_runtime_description">This is faster and allows Patcher to use more memory</string>
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,6 +6,5 @@ plugins {
    alias(libs.plugins.kotlin.serialization) apply false
    alias(libs.plugins.kotlin.parcelize) apply false
    alias(libs.plugins.about.libraries) apply false
-    alias(libs.plugins.about.libraries.android) apply false
    alias(libs.plugins.compose.compiler) apply false
 }
--- a/crowdin.yml
+++ b/crowdin.yml
@@ -1,9 +0,0 @@
-project_id_env: "CROWDIN_PROJECT_ID"
-api_token_env: "CROWDIN_PERSONAL_TOKEN"
-
-preserve_hierarchy: true
-files:
-    - source: app/src/main/res/values/strings.xml
-      dest: manager.xml
-      translation: app/src/main/res/values-%android_code%/strings.xml
-      skip_untranslated_strings: true
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,32 +1,32 @@
 [versions]
-ktx = "1.17.0"
-material3 = "1.4.0"
-ui-tooling = "1.10.0"
-viewmodel-lifecycle = "2.10.0"
-splash-screen = "1.2.0"
-activity = "1.12.2"
-appcompat = "1.7.1"
-preferences-datastore = "1.2.0"
-work-runtime = "2.11.0"
-compose-bom = "2025.12.01"
-navigation = "2.9.6"
-accompanist = "0.37.3"
-placeholder = "1.0.12"
-reorderable = "3.0.0"
-serialization = "1.9.0"
-collection = "0.4.0"
-datetime = "0.7.1"
-room-version = "2.8.4"
+ktx = "1.16.0"
+material3 = "1.3.2"
+ui-tooling = "1.8.1"
+viewmodel-lifecycle = "2.9.0"
+splash-screen = "1.0.1"
+activity = "1.10.1"
+appcompat = "1.7.0"
+preferences-datastore = "1.1.2"
+work-runtime = "2.10.1"
+compose-bom = "2025.05.00"
+navigation = "2.8.6"
+accompanist = "0.37.0"
+placeholder = "1.1.2"
+reorderable = "2.4.3"
+serialization = "1.8.0"
+collection = "0.3.8"
+datetime = "0.6.1"
+room-version = "2.7.1"
 revanced-patcher = "21.0.0"
 revanced-library = "3.0.2"
-koin = "4.1.1"
-ktor = "3.3.3"
-markdown-renderer = "0.39.0"
+koin = "3.5.3"
+ktor = "2.3.9"
+markdown-renderer = "0.30.0"
 fading-edges = "1.0.4"
-kotlin = "2.3.0"
-android-gradle-plugin = "8.13.2"
-dev-tools-gradle-plugin = "2.3.4"
-about-libraries = "13.2.1"
+kotlin = "2.1.10"
+android-gradle-plugin = "8.9.1"
+dev-tools-gradle-plugin = "2.1.10-1.0.29"
+about-libraries-gradle-plugin = "12.1.2"
 coil = "2.7.0"
 app-icon-loader-coil = "1.5.0"
 libsu = "6.0.0"
@@ -34,10 +34,9 @@ scrollbars = "1.0.4"
 enumutil = "1.1.1"
 compose-icons = "1.2.4"
 kotlin-process = "1.5.1"
-hidden-api-stub = "4.4.0"
-binary-compatibility-validator = "0.18.1"
+hidden-api-stub = "4.3.3"
+binary-compatibility-validator = "0.17.0"
 semver-parser = "3.0.0"
-ackpine = "0.19.1"

 [libraries]
 # AndroidX Core
@@ -68,7 +67,7 @@ coil-appiconloader = { group = "me.zhanghai.android.appiconloader", name = "appi
 accompanist-drawablepainter = { group = "com.google.accompanist", name = "accompanist-drawablepainter", version.ref = "accompanist" }

 # Placeholder
-placeholder-material3 = { group = "com.eygraber", name = "compose-placeholder-material3", version.ref = "placeholder" }
+placeholder-material3 = { group = "io.github.fornewid", name = "placeholder-material3", version.ref = "placeholder"}

 # Kotlinx
 kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "serialization" }
@@ -91,8 +90,7 @@ koin-compose-navigation = { group = "io.insert-koin", name = "koin-androidx-comp
 koin-workmanager = { group = "io.insert-koin", name = "koin-androidx-workmanager", version.ref = "koin" }

 # About Libraries
-about-libraries-core = { group = "com.mikepenz", name = "aboutlibraries-compose-core", version.ref = "about-libraries" }
-about-libraries-m3 = { group = "com.mikepenz", name = "aboutlibraries-compose-m3", version.ref = "about-libraries" }
+about-libraries = { group = "com.mikepenz", name = "aboutlibraries-compose", version.ref = "about-libraries-gradle-plugin" }

 # Ktor
 ktor-core = { group = "io.ktor", name = "ktor-client-core", version.ref = "ktor" }
@@ -135,10 +133,6 @@ compose-icons-fontawesome = { group = "com.github.BenjaminHalko.compose-icons",
 # Semantic versioning parser
 semver-parser = { module = "io.github.z4kn4fein:semver", version.ref = "semver-parser" }

-# Ackpine
-ackpine-core = { module = "ru.solrudev.ackpine:ackpine-core", version.ref = "ackpine" }
-ackpine-ktx = { module = "ru.solrudev.ackpine:ackpine-ktx", version.ref = "ackpine" }
-
 [plugins]
 android-application = { id = "com.android.application", version.ref = "android-gradle-plugin" }
 android-library = { id = "com.android.library", version.ref = "android-gradle-plugin" }
@@ -147,6 +141,5 @@ kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", versi
 kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 devtools = { id = "com.google.devtools.ksp", version.ref = "dev-tools-gradle-plugin" }
-about-libraries = { id = "com.mikepenz.aboutlibraries.plugin", version.ref = "about-libraries" }
-about-libraries-android = { id = "com.mikepenz.aboutlibraries.plugin.android", version.ref = "about-libraries" }
+about-libraries = { id = "com.mikepenz.aboutlibraries.plugin", version.ref = "about-libraries-gradle-plugin" }
 binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "binary-compatibility-validator" }