Merge branch 'compose-dev' of https://github.com/ReVanced/revanced-manager into fix/minor-issues

2025-04-30 22:14:25 +02:00 · 2024-07-03 03:55:12 +03:00 · 2024-07-03 03:55:12 +03:00 · 397a1f8f9c
commit 397a1f8f9c
parent a0f187354f 1ce56af3b1
23 changed files with 194 additions and 125 deletions
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@ -29,7 +29,7 @@ android {
    buildTypes {
        debug {
            applicationIdSuffix = ".debug"
-            resValue("string", "app_name", "ReVanced Manager Debug")
+            resValue("string", "app_name", "ReVanced Manager (dev)")

            buildConfigField("long", "BUILD_ID", "${Random.nextLong()}L")
        }
--- a/app/src/main/java/app/revanced/manager/data/room/bundles/PatchBundleDao.kt
+++ b/app/src/main/java/app/revanced/manager/data/room/bundles/PatchBundleDao.kt
@ -9,7 +9,7 @@ interface PatchBundleDao {
    suspend fun all(): List<PatchBundleEntity>

    @Query("SELECT version, integrations_version, auto_update FROM patch_bundles WHERE uid = :uid")
-    fun getPropsById(uid: Int): Flow<BundleProperties>
+    fun getPropsById(uid: Int): Flow<BundleProperties?>

    @Query("UPDATE patch_bundles SET version = :patches, integrations_version = :integrations WHERE uid = :uid")
    suspend fun updateVersion(uid: Int, patches: String?, integrations: String?)
@ -17,6 +17,9 @@ interface PatchBundleDao {
    @Query("UPDATE patch_bundles SET auto_update = :value WHERE uid = :uid")
    suspend fun setAutoUpdate(uid: Int, value: Boolean)

+    @Query("UPDATE patch_bundles SET name = :value WHERE uid = :uid")
+    suspend fun setName(uid: Int, value: String)
+
    @Query("DELETE FROM patch_bundles WHERE uid != 0")
    suspend fun purgeCustomBundles()

--- a/app/src/main/java/app/revanced/manager/domain/bundles/LocalPatchBundle.kt
+++ b/app/src/main/java/app/revanced/manager/domain/bundles/LocalPatchBundle.kt
@ -7,7 +7,8 @@ import java.io.InputStream
 import java.nio.file.Files
 import java.nio.file.StandardCopyOption

-class LocalPatchBundle(name: String, id: Int, directory: File) : PatchBundleSource(name, id, directory) {
+class LocalPatchBundle(name: String, id: Int, directory: File) :
+    PatchBundleSource(name, id, directory) {
    suspend fun replace(patches: InputStream? = null, integrations: InputStream? = null) {
        withContext(Dispatchers.IO) {
            patches?.let { inputStream ->
@ -16,10 +17,16 @@ class LocalPatchBundle(name: String, id: Int, directory: File) : PatchBundleSour
                }
            }
            integrations?.let {
-                Files.copy(it, this@LocalPatchBundle.integrationsFile.toPath(), StandardCopyOption.REPLACE_EXISTING)
+                Files.copy(
+                    it,
+                    this@LocalPatchBundle.integrationsFile.toPath(),
+                    StandardCopyOption.REPLACE_EXISTING
+                )
            }
        }

-        reload()
+        reload()?.also {
+            saveVersion(it.readManifestAttribute("Version"), null)
+        }
    }
 }
--- a/app/src/main/java/app/revanced/manager/domain/bundles/PatchBundleSource.kt
+++ b/app/src/main/java/app/revanced/manager/domain/bundles/PatchBundleSource.kt
@ -1,12 +1,20 @@
 package app.revanced.manager.domain.bundles

+import android.app.Application
 import android.util.Log
+import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Stable
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import app.revanced.manager.R
+import app.revanced.manager.domain.repository.PatchBundlePersistenceRepository
 import app.revanced.manager.patcher.patch.PatchBundle
 import app.revanced.manager.util.tag
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.map
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
 import java.io.File
 import java.io.OutputStream

@ -14,13 +22,21 @@ import java.io.OutputStream
 * A [PatchBundle] source.
 */
@Stable
-sealed class PatchBundleSource(val name: String, val uid: Int, directory: File) {
+sealed class PatchBundleSource(initialName: String, val uid: Int, directory: File) : KoinComponent {
+    protected val configRepository: PatchBundlePersistenceRepository by inject()
+    private val app: Application by inject()
    protected val patchesFile = directory.resolve("patches.jar")
    protected val integrationsFile = directory.resolve("integrations.apk")

    private val _state = MutableStateFlow(load())
    val state = _state.asStateFlow()

+    private val _nameFlow = MutableStateFlow(initialName)
+    val nameFlow =
+        _nameFlow.map { it.ifEmpty { app.getString(if (isDefault) R.string.bundle_name_default else R.string.bundle_name_fallback) } }
+
+    suspend fun getName() = nameFlow.first()
+
    /**
     * Returns true if the bundle has been downloaded to local storage.
     */
@ -42,13 +58,38 @@ sealed class PatchBundleSource(val name: String, val uid: Int, directory: File)
        return try {
            State.Loaded(PatchBundle(patchesFile, integrationsFile.takeIf(File::exists)))
        } catch (t: Throwable) {
-            Log.e(tag, "Failed to load patch bundle $name", t)
+            Log.e(tag, "Failed to load patch bundle with UID $uid", t)
            State.Failed(t)
        }
    }

-    fun reload() {
-        _state.value = load()
+    suspend fun reload(): PatchBundle? {
+        val newState = load()
+        _state.value = newState
+
+        val bundle = newState.patchBundleOrNull()
+        // Try to read the name from the patch bundle manifest if the bundle does not have a name.
+        if (bundle != null && _nameFlow.value.isEmpty()) {
+            bundle.readManifestAttribute("Name")?.let { setName(it) }
+        }
+
+        return bundle
+    }
+
+    /**
+     * Create a flow that emits the [app.revanced.manager.data.room.bundles.BundleProperties] of this [PatchBundleSource].
+     * The flow will emit null if the associated [PatchBundleSource] is deleted.
+     */
+    fun propsFlow() = configRepository.getProps(uid)
+    suspend fun getProps() = configRepository.getProps(uid).first()!!
+
+    suspend fun currentVersion() = getProps().versionInfo
+    protected suspend fun saveVersion(patches: String?, integrations: String?) =
+        configRepository.updateVersion(uid, patches, integrations)
+
+    suspend fun setName(name: String) {
+        configRepository.setName(uid, name)
+        _nameFlow.value = name
    }

    sealed interface State {
@ -61,9 +102,12 @@ sealed class PatchBundleSource(val name: String, val uid: Int, directory: File)
        }
    }

-    companion object {
-        val PatchBundleSource.isDefault get() = uid == 0
-        val PatchBundleSource.asRemoteOrNull get() = this as? RemotePatchBundle
-        fun PatchBundleSource.propsOrNullFlow() = asRemoteOrNull?.propsFlow() ?: flowOf(null)
+    companion object Extensions {
+        val PatchBundleSource.isDefault inline get() = uid == 0
+        val PatchBundleSource.asRemoteOrNull inline get() = this as? RemotePatchBundle
+        val PatchBundleSource.nameState
+            @Composable inline get() = nameFlow.collectAsStateWithLifecycle(
+                ""
+            )
    }
 }
--- a/app/src/main/java/app/revanced/manager/domain/bundles/RemotePatchBundle.kt
+++ b/app/src/main/java/app/revanced/manager/domain/bundles/RemotePatchBundle.kt
@ -2,7 +2,6 @@ package app.revanced.manager.domain.bundles

 import androidx.compose.runtime.Stable
 import app.revanced.manager.data.room.bundles.VersionInfo
-import app.revanced.manager.domain.repository.PatchBundlePersistenceRepository
 import app.revanced.manager.network.api.ReVancedAPI
 import app.revanced.manager.network.api.ReVancedAPI.Extensions.findAssetByType
 import app.revanced.manager.network.dto.BundleAsset
@ -15,17 +14,14 @@ import io.ktor.client.request.url
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.coroutineScope
-import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 import java.io.File

@Stable
 sealed class RemotePatchBundle(name: String, id: Int, directory: File, val endpoint: String) :
-    PatchBundleSource(name, id, directory), KoinComponent {
-    private val configRepository: PatchBundlePersistenceRepository by inject()
+    PatchBundleSource(name, id, directory) {
    protected val http: HttpService by inject()

    protected abstract suspend fun getLatestInfo(): BundleInfo
@ -70,17 +66,11 @@ sealed class RemotePatchBundle(name: String, id: Int, directory: File, val endpo
        true
    }

-    private suspend fun currentVersion() = configRepository.getProps(uid).first().versionInfo
-    private suspend fun saveVersion(patches: String, integrations: String) =
-        configRepository.updateVersion(uid, patches, integrations)
-
    suspend fun deleteLocalFiles() = withContext(Dispatchers.Default) {
        arrayOf(patchesFile, integrationsFile).forEach(File::delete)
        reload()
    }

-    fun propsFlow() = configRepository.getProps(uid)
-
    suspend fun setAutoUpdate(value: Boolean) = configRepository.setAutoUpdate(uid, value)

    companion object {
--- a/app/src/main/java/app/revanced/manager/domain/repository/PatchBundlePersistenceRepository.kt
+++ b/app/src/main/java/app/revanced/manager/domain/repository/PatchBundlePersistenceRepository.kt
@ -5,7 +5,6 @@ import app.revanced.manager.data.room.AppDatabase.Companion.generateUid
 import app.revanced.manager.data.room.bundles.PatchBundleEntity
 import app.revanced.manager.data.room.bundles.Source
 import app.revanced.manager.data.room.bundles.VersionInfo
-import io.ktor.http.*
 import kotlinx.coroutines.flow.distinctUntilChanged

 class PatchBundlePersistenceRepository(db: AppDatabase) {
@ -23,7 +22,6 @@ class PatchBundlePersistenceRepository(db: AppDatabase) {

    suspend fun reset() = dao.reset()

-
    suspend fun create(name: String, source: Source, autoUpdate: Boolean = false) =
        PatchBundleEntity(
            uid = generateUid(),
@ -37,17 +35,19 @@ class PatchBundlePersistenceRepository(db: AppDatabase) {

    suspend fun delete(uid: Int) = dao.remove(uid)

-    suspend fun updateVersion(uid: Int, patches: String, integrations: String) =
+    suspend fun updateVersion(uid: Int, patches: String?, integrations: String?) =
        dao.updateVersion(uid, patches, integrations)

    suspend fun setAutoUpdate(uid: Int, value: Boolean) = dao.setAutoUpdate(uid, value)

+    suspend fun setName(uid: Int, name: String) = dao.setName(uid, name)
+
    fun getProps(id: Int) = dao.getPropsById(id).distinctUntilChanged()

    private companion object {
        val defaultSource = PatchBundleEntity(
            uid = 0,
-            name = "Main",
+            name = "",
            versionInfo = VersionInfo(),
            source = Source.API,
            autoUpdate = 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
@ -137,16 +137,16 @@ class PatchBundleRepository(
    private fun addBundle(patchBundle: PatchBundleSource) =
        _sources.update { it.toMutableMap().apply { put(patchBundle.uid, patchBundle) } }

-    suspend fun createLocal(name: String, patches: InputStream, integrations: InputStream?) {
-        val id = persistenceRepo.create(name, SourceInfo.Local).uid
-        val bundle = LocalPatchBundle(name, id, directoryOf(id))
+    suspend fun createLocal(patches: InputStream, integrations: InputStream?) {
+        val uid = persistenceRepo.create("", SourceInfo.Local).uid
+        val bundle = LocalPatchBundle("", uid, directoryOf(uid))

        bundle.replace(patches, integrations)
        addBundle(bundle)
    }

-    suspend fun createRemote(name: String, url: String, autoUpdate: Boolean) {
-        val entity = persistenceRepo.create(name, SourceInfo.from(url), autoUpdate)
+    suspend fun createRemote(url: String, autoUpdate: Boolean) {
+        val entity = persistenceRepo.create("", SourceInfo.from(url), autoUpdate)
        addBundle(entity.load())
    }

@ -174,8 +174,8 @@ class PatchBundleRepository(

                getBundlesByType<RemotePatchBundle>().forEach {
                    launch {
-                        if (!it.propsFlow().first().autoUpdate) return@launch
-                        Log.d(tag, "Updating patch bundle: ${it.name}")
+                        if (!it.getProps().autoUpdate) return@launch
+                        Log.d(tag, "Updating patch bundle: ${it.getName()}")
                        it.update()
                    }
                }
--- a/app/src/main/java/app/revanced/manager/patcher/Session.kt
+++ b/app/src/main/java/app/revanced/manager/patcher/Session.kt
@ -47,7 +47,7 @@ class Session(
        var nextPatchIndex = 0

        updateProgress(
-            name = androidContext.getString(R.string.applying_patch, selectedPatches[nextPatchIndex]),
+            name = androidContext.getString(R.string.executing_patch, selectedPatches[nextPatchIndex]),
            state = State.RUNNING
        )

@ -56,7 +56,7 @@ class Session(

            if (exception != null) {
                updateProgress(
-                    name = androidContext.getString(R.string.failed_to_apply_patch, patch.name),
+                    name = androidContext.getString(R.string.failed_to_execute_patch, patch.name),
                    state = State.FAILED,
                    message = exception.stackTraceToString()
                )
@ -72,7 +72,7 @@ class Session(

            selectedPatches.getOrNull(nextPatchIndex)?.let { nextPatch ->
                updateProgress(
-                    name = androidContext.getString(R.string.applying_patch, nextPatch.name)
+                    name = androidContext.getString(R.string.executing_patch, nextPatch.name)
                )
            }

@ -82,7 +82,7 @@ class Session(
        updateProgress(
            state = State.COMPLETED,
            name = androidContext.resources.getQuantityString(
-                R.plurals.patches_applied,
+                R.plurals.patches_executed,
                selectedPatches.size,
                selectedPatches.size
            )
@ -105,7 +105,6 @@ class Session(
            logger.info("Merging integrations")
            acceptIntegrations(integrations.toSet())
            acceptPatches(selectedPatches.toSet())
-            updateProgress(state = State.COMPLETED) // Merging

            logger.info("Applying patches...")
            applyPatchesVerbose(selectedPatches.sortedBy { it.name })
--- a/app/src/main/java/app/revanced/manager/patcher/patch/PatchBundle.kt
+++ b/app/src/main/java/app/revanced/manager/patcher/patch/PatchBundle.kt
@ -5,6 +5,8 @@ import app.revanced.manager.util.tag
 import app.revanced.patcher.PatchBundleLoader
 import app.revanced.patcher.patch.Patch
 import java.io.File
+import java.io.IOException
+import java.util.jar.JarFile

 class PatchBundle(val patchesJar: File, val integrations: File?) {
    private val loader = object : Iterable<Patch<*>> {
@ -25,6 +27,17 @@ class PatchBundle(val patchesJar: File, val integrations: File?) {
     */
    val patches = loader.map(::PatchInfo)

+    /**
+     * The [java.util.jar.Manifest] of [patchesJar].
+     */
+    private val manifest = try {
+        JarFile(patchesJar).use { it.manifest }
+    } catch (_: IOException) {
+        null
+    }
+
+    fun readManifestAttribute(name: String) = manifest?.mainAttributes?.getValue(name)
+
    /**
     * Load all patches compatible with the specified package.
     */
--- a/app/src/main/java/app/revanced/manager/patcher/worker/PatcherWorker.kt
+++ b/app/src/main/java/app/revanced/manager/patcher/worker/PatcherWorker.kt
@ -184,11 +184,11 @@ class PatcherWorker(
            Log.i(tag, "Patching succeeded".logFmt())
            Result.success()
        } catch (e: ProcessRuntime.RemoteFailureException) {
-            Log.e(tag, "An exception occured in the remote process while patching. ${e.originalStackTrace}".logFmt())
+            Log.e(tag, "An exception occurred in the remote process while patching. ${e.originalStackTrace}".logFmt())
            updateProgress(state = State.FAILED, message = e.originalStackTrace)
            Result.failure()
        } catch (e: Exception) {
-            Log.e(tag, "An exception occured while patching".logFmt(), e)
+            Log.e(tag, "An exception occurred while patching".logFmt(), e)
            updateProgress(state = State.FAILED, message = e.stackTraceToString())
            Result.failure()
        } finally {
--- a/app/src/main/java/app/revanced/manager/ui/component/bundle/BaseBundleDialog.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/bundle/BaseBundleDialog.kt
@ -30,7 +30,7 @@ import app.revanced.manager.util.isDebuggable
 fun BaseBundleDialog(
    modifier: Modifier = Modifier,
    isDefault: Boolean,
-    name: String,
+    name: String?,
    onNameChange: ((String) -> Unit)? = null,
    remoteUrl: String?,
    onRemoteUrlChange: ((String) -> Unit)? = null,
@ -52,32 +52,34 @@ fun BaseBundleDialog(
            )
            .then(modifier)
    ) {
-        var showNameInputDialog by rememberSaveable {
-            mutableStateOf(false)
-        }
-        if (showNameInputDialog) {
-            TextInputDialog(
-                initial = name,
-                title = stringResource(R.string.bundle_input_name),
-                onDismissRequest = {
-                    showNameInputDialog = false
-                },
-                onConfirm = {
-                    showNameInputDialog = false
-                    onNameChange?.invoke(it)
-                },
-                validator = {
-                    it.length in 1..19
+        if (name != null) {
+            var showNameInputDialog by rememberSaveable {
+                mutableStateOf(false)
+            }
+            if (showNameInputDialog) {
+                TextInputDialog(
+                    initial = name,
+                    title = stringResource(R.string.bundle_input_name),
+                    onDismissRequest = {
+                        showNameInputDialog = false
+                    },
+                    onConfirm = {
+                        showNameInputDialog = false
+                        onNameChange?.invoke(it)
+                    },
+                    validator = {
+                        it.length in 1..19
+                    }
+                )
+            }
+            BundleListItem(
+                headlineText = stringResource(R.string.bundle_input_name),
+                supportingText = name.ifEmpty { stringResource(R.string.field_not_set) },
+                modifier = Modifier.clickable(enabled = onNameChange != null) {
+                    showNameInputDialog = true
                }
            )
        }
-        BundleListItem(
-            headlineText = stringResource(R.string.bundle_input_name),
-            supportingText = name.ifEmpty { stringResource(R.string.field_not_set) },
-            modifier = Modifier.clickable(enabled = onNameChange != null) {
-                showNameInputDialog = true
-            }
-        )

        remoteUrl?.takeUnless { isDefault }?.let { url ->
            var showUrlInputDialog by rememberSaveable {
--- a/app/src/main/java/app/revanced/manager/ui/component/bundle/BundleInformationDialog.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/bundle/BundleInformationDialog.kt
@ -4,7 +4,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.outlined.DeleteOutline
-import androidx.compose.material.icons.outlined.Refresh
+import androidx.compose.material.icons.outlined.Update
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
@ -23,9 +23,9 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import app.revanced.manager.R
 import app.revanced.manager.domain.bundles.LocalPatchBundle
 import app.revanced.manager.domain.bundles.PatchBundleSource
-import app.revanced.manager.domain.bundles.PatchBundleSource.Companion.asRemoteOrNull
-import app.revanced.manager.domain.bundles.PatchBundleSource.Companion.isDefault
-import app.revanced.manager.domain.bundles.PatchBundleSource.Companion.propsOrNullFlow
+import app.revanced.manager.domain.bundles.PatchBundleSource.Extensions.asRemoteOrNull
+import app.revanced.manager.domain.bundles.PatchBundleSource.Extensions.isDefault
+import app.revanced.manager.domain.bundles.PatchBundleSource.Extensions.nameState
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch

@ -44,7 +44,7 @@ fun BundleInformationDialog(
        bundle.state.map { it.patchBundleOrNull()?.patches?.size ?: 0 }
    }.collectAsStateWithLifecycle(0)
    val props by remember(bundle) {
-        bundle.propsOrNullFlow()
+        bundle.propsFlow()
    }.collectAsStateWithLifecycle(null)

    if (viewCurrentBundlePatches) {
@ -63,10 +63,12 @@ fun BundleInformationDialog(
            dismissOnBackPress = true
        )
    ) {
+        val bundleName by bundle.nameState
+
        Scaffold(
            topBar = {
                BundleTopBar(
-                    title = bundle.name,
+                    title = bundleName,
                    onBackClick = onDismissRequest,
                    onBackIcon = {
                        Icon(
@ -86,7 +88,7 @@ fun BundleInformationDialog(
                        if (!isLocal) {
                            IconButton(onClick = onRefreshButton) {
                                Icon(
-                                    Icons.Outlined.Refresh,
+                                    Icons.Outlined.Update,
                                    stringResource(R.string.refresh)
                                )
                            }
@ -98,7 +100,8 @@ fun BundleInformationDialog(
            BaseBundleDialog(
                modifier = Modifier.padding(paddingValues),
                isDefault = bundle.isDefault,
-                name = bundle.name,
+                name = bundleName,
+                onNameChange = { composableScope.launch { bundle.setName(it) } },
                remoteUrl = bundle.asRemoteOrNull?.endpoint,
                patchCount = patchCount,
                version = props?.versionInfo?.patches,
--- a/app/src/main/java/app/revanced/manager/ui/component/bundle/BundleItem.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/bundle/BundleItem.kt
@ -27,7 +27,7 @@ import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import app.revanced.manager.R
 import app.revanced.manager.domain.bundles.PatchBundleSource
-import app.revanced.manager.domain.bundles.PatchBundleSource.Companion.propsOrNullFlow
+import app.revanced.manager.domain.bundles.PatchBundleSource.Extensions.nameState
 import kotlinx.coroutines.flow.map

@OptIn(ExperimentalFoundationApi::class)
@ -45,8 +45,9 @@ fun BundleItem(
    val state by bundle.state.collectAsStateWithLifecycle()

    val version by remember(bundle) {
-        bundle.propsOrNullFlow().map { props -> props?.versionInfo?.patches }
+        bundle.propsFlow().map { props -> props?.versionInfo?.patches }
    }.collectAsStateWithLifecycle(null)
+    val name by bundle.nameState

    if (viewBundleDialogPage) {
        BundleInformationDialog(
@ -77,10 +78,10 @@ fun BundleItem(
            }
        } else null,

-        headlineContent = { Text(text = bundle.name) },
+        headlineContent = { Text(name) },
        supportingContent = {
            state.patchBundleOrNull()?.patches?.size?.let { patchCount ->
-                Text(text = pluralStringResource(R.plurals.patch_count, patchCount, patchCount))
+                Text(pluralStringResource(R.plurals.patch_count, patchCount, patchCount))
            }
        },
        trailingContent = {
@ -95,7 +96,7 @@ fun BundleItem(

                icon?.let { (vector, description) ->
                    Icon(
-                        imageVector = vector,
+                        vector,
                        contentDescription = stringResource(description),
                        modifier = Modifier.size(24.dp),
                        tint = MaterialTheme.colorScheme.error
--- a/app/src/main/java/app/revanced/manager/ui/component/bundle/BundleSelector.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/bundle/BundleSelector.kt
@ -12,10 +12,12 @@ import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import app.revanced.manager.domain.bundles.PatchBundleSource
+import app.revanced.manager.domain.bundles.PatchBundleSource.Extensions.nameState

@OptIn(ExperimentalMaterial3Api::class)
@Composable
@ -51,6 +53,7 @@ fun BundleSelector(bundles: List<PatchBundleSource>, onFinish: (PatchBundleSourc
                )
            }
            bundles.forEach {
+                val name by it.nameState
                Row(
                    verticalAlignment = Alignment.CenterVertically,
                    horizontalArrangement = Arrangement.Center,
@ -62,7 +65,7 @@ fun BundleSelector(bundles: List<PatchBundleSource>, onFinish: (PatchBundleSourc
                        }
                ) {
                    Text(
-                        text = it.name,
+                        name,
                        style = MaterialTheme.typography.titleMedium,
                        color = MaterialTheme.colorScheme.onSurface
                    )
--- a/app/src/main/java/app/revanced/manager/ui/component/bundle/ImportBundleDialog.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/bundle/ImportBundleDialog.kt
@ -44,8 +44,8 @@ import app.revanced.manager.util.JAR_MIMETYPE
@Composable
 fun ImportPatchBundleDialog(
    onDismiss: () -> Unit,
-    onRemoteSubmit: (String, String, Boolean) -> Unit,
-    onLocalSubmit: (String, Uri, Uri?) -> Unit
+    onRemoteSubmit: (String, Boolean) -> Unit,
+    onLocalSubmit: (Uri, Uri?) -> Unit
 ) {
    var currentStep by rememberSaveable { mutableIntStateOf(0) }
    var bundleType by rememberSaveable { mutableStateOf(BundleType.Remote) }
@ -59,11 +59,19 @@ fun ImportPatchBundleDialog(
            uri?.let { patchBundle = it }
        }

+    fun launchPatchActivity() {
+        patchActivityLauncher.launch(JAR_MIMETYPE)
+    }
+
    val integrationsActivityLauncher =
        rememberLauncherForActivityResult(ActivityResultContracts.GetContent()) { uri ->
            uri?.let { integrations = it }
        }

+    fun launchIntegrationsActivity() {
+        integrationsActivityLauncher.launch(APK_MIMETYPE)
+    }
+
    val steps = listOf<@Composable () -> Unit>(
        {
            SelectBundleTypeStep(bundleType) { selectedType ->
@ -77,8 +85,8 @@ fun ImportPatchBundleDialog(
                integrations,
                remoteUrl,
                autoUpdate,
-                { patchActivityLauncher.launch(JAR_MIMETYPE) },
-                { integrationsActivityLauncher.launch(APK_MIMETYPE) },
+                { launchPatchActivity() },
+                { launchIntegrationsActivity() },
                { remoteUrl = it },
                { autoUpdate = it }
            )
@ -108,13 +116,12 @@ fun ImportPatchBundleDialog(
                        when (bundleType) {
                            BundleType.Local -> patchBundle?.let {
                                onLocalSubmit(
-                                    "BundleName",
                                    it,
                                    integrations
                                )
                            }

-                            BundleType.Remote -> onRemoteSubmit("BundleName", remoteUrl, autoUpdate)
+                            BundleType.Remote -> onRemoteSubmit(remoteUrl, autoUpdate)
                        }
                    }
                ) {
--- a/app/src/main/java/app/revanced/manager/ui/model/BundleInfo.kt
+++ b/app/src/main/java/app/revanced/manager/ui/model/BundleInfo.kt
@ -75,7 +75,7 @@ data class BundleInfo(
                        targetList.add(it)
                    }

-                    BundleInfo(source.name, source.uid, supported, unsupported, universal)
+                    BundleInfo(source.getName(), source.uid, supported, unsupported, universal)
                }
            }
    }
--- a/app/src/main/java/app/revanced/manager/ui/screen/DashboardScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/DashboardScreen.kt
@ -46,7 +46,7 @@ import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import app.revanced.manager.R
 import app.revanced.manager.data.room.apps.installed.InstalledApp
-import app.revanced.manager.domain.bundles.PatchBundleSource.Companion.isDefault
+import app.revanced.manager.domain.bundles.PatchBundleSource.Extensions.isDefault
 import app.revanced.manager.patcher.aapt.Aapt
 import app.revanced.manager.ui.component.AppTopBar
 import app.revanced.manager.ui.component.AutoUpdatesDialog
@ -96,13 +96,13 @@ fun DashboardScreen(
    if (showAddBundleDialog) {
        ImportPatchBundleDialog(
            onDismiss = { showAddBundleDialog = false },
-            onLocalSubmit = { name, patches, integrations ->
+            onLocalSubmit = { patches, integrations ->
                showAddBundleDialog = false
-                vm.createLocalSource(name, patches, integrations)
+                vm.createLocalSource(patches, integrations)
            },
-            onRemoteSubmit = { name, url, autoUpdate ->
+            onRemoteSubmit = { url, autoUpdate ->
                showAddBundleDialog = false
-                vm.createRemoteSource(name, url, autoUpdate)
+                vm.createRemoteSource(url, autoUpdate)
            }
        )
    }
--- a/app/src/main/java/app/revanced/manager/ui/screen/PatchesSelectorScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/PatchesSelectorScreen.kt
@ -9,8 +9,8 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyListScope
+import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.items
-import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.pager.HorizontalPager
 import androidx.compose.foundation.pager.rememberPagerState
 import androidx.compose.material.icons.Icons
@ -94,6 +94,8 @@ fun PatchesSelectorScreen(
        derivedStateOf { vm.selectionIsValid(bundles) }
    }

+    val patchLazyListStates = remember(bundles) { List(bundles.size) { LazyListState() } }
+
    if (showBottomSheet) {
        ModalBottomSheet(
            onDismissRequest = {
@ -255,7 +257,6 @@ fun PatchesSelectorScreen(
        }
    }

-    val patchLazyListState = rememberLazyListState()
    Scaffold(
        topBar = {
            AppTopBar(
@ -284,7 +285,7 @@ fun PatchesSelectorScreen(
            ExtendedFloatingActionButton(
                text = { Text(stringResource(R.string.save)) },
                icon = { Icon(Icons.Outlined.Save, null) },
-                expanded = patchLazyListState.isScrollingUp,
+                expanded = patchLazyListStates.getOrNull(pagerState.currentPage)?.isScrollingUp ?: true,
                onClick = {
                    // TODO: only allow this if all required options have been set.
                    onSave(vm.getCustomSelection(), vm.getOptions())
@ -324,11 +325,13 @@ fun PatchesSelectorScreen(
                state = pagerState,
                userScrollEnabled = true,
                pageContent = { index ->
+                    // Avoid crashing if the lists have not been fully initialized yet.
+                    if (index > bundles.lastIndex || bundles.size != patchLazyListStates.size) return@HorizontalPager
                    val bundle = bundles[index]

                    LazyColumnWithScrollbar(
                        modifier = Modifier.fillMaxSize(),
-                        state = patchLazyListState
+                        state = patchLazyListStates[index]
                    ) {
                        patchList(
                            uid = bundle.uid,
--- a/app/src/main/java/app/revanced/manager/ui/viewmodel/DashboardViewModel.kt
+++ b/app/src/main/java/app/revanced/manager/ui/viewmodel/DashboardViewModel.kt
@ -12,7 +12,7 @@ import androidx.lifecycle.viewModelScope
 import app.revanced.manager.R
 import app.revanced.manager.data.platform.NetworkInfo
 import app.revanced.manager.domain.bundles.PatchBundleSource
-import app.revanced.manager.domain.bundles.PatchBundleSource.Companion.asRemoteOrNull
+import app.revanced.manager.domain.bundles.PatchBundleSource.Extensions.asRemoteOrNull
 import app.revanced.manager.domain.bundles.RemotePatchBundle
 import app.revanced.manager.domain.manager.PreferencesManager
 import app.revanced.manager.domain.repository.PatchBundleRepository
@ -80,20 +80,17 @@ class DashboardViewModel(
    fun cancelSourceSelection() {
        selectedSources.clear()
    }
-    fun createLocalSource(name: String, patchBundle: Uri, integrations: Uri?) =
+    fun createLocalSource(patchBundle: Uri, integrations: Uri?) =
        viewModelScope.launch {
            contentResolver.openInputStream(patchBundle)!!.use { patchesStream ->
-                val integrationsStream = integrations?.let { contentResolver.openInputStream(it) }
-                try {
-                    patchBundleRepository.createLocal(name, patchesStream, integrationsStream)
-                } finally {
-                    integrationsStream?.close()
+                integrations?.let { contentResolver.openInputStream(it) }.use { integrationsStream ->
+                    patchBundleRepository.createLocal(patchesStream, integrationsStream)
                }
            }
        }

-    fun createRemoteSource(name: String, apiUrl: String, autoUpdate: Boolean) =
-        viewModelScope.launch { patchBundleRepository.createRemote(name, apiUrl, autoUpdate) }
+    fun createRemoteSource(apiUrl: String, autoUpdate: Boolean) =
+        viewModelScope.launch { patchBundleRepository.createRemote(apiUrl, autoUpdate) }

    fun delete(bundle: PatchBundleSource) =
        viewModelScope.launch { patchBundleRepository.remove(bundle) }
@ -107,9 +104,9 @@ class DashboardViewModel(
            RemotePatchBundle.updateFailMsg
        ) {
            if (bundle.update())
-                app.toast(app.getString(R.string.bundle_update_success, bundle.name))
+                app.toast(app.getString(R.string.bundle_update_success, bundle.getName()))
            else
-                app.toast(app.getString(R.string.bundle_update_unavailable, bundle.name))
+                app.toast(app.getString(R.string.bundle_update_unavailable, bundle.getName()))
        }
    }
 }
--- a/app/src/main/java/app/revanced/manager/ui/viewmodel/MainViewModel.kt
+++ b/app/src/main/java/app/revanced/manager/ui/viewmodel/MainViewModel.kt
@ -11,7 +11,7 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import app.revanced.manager.R
-import app.revanced.manager.domain.bundles.PatchBundleSource.Companion.asRemoteOrNull
+import app.revanced.manager.domain.bundles.PatchBundleSource.Extensions.asRemoteOrNull
 import app.revanced.manager.domain.manager.KeystoreManager
 import app.revanced.manager.domain.manager.PreferencesManager
 import app.revanced.manager.domain.repository.PatchBundleRepository
--- a/app/src/main/java/app/revanced/manager/ui/viewmodel/PatcherViewModel.kt
+++ b/app/src/main/java/app/revanced/manager/ui/viewmodel/PatcherViewModel.kt
@ -316,13 +316,9 @@ class PatcherViewModel(
                    context.getString(R.string.patcher_step_unpack),
                    StepCategory.PREPARING
                ),
-                Step(
-                    context.getString(R.string.patcher_step_integrations),
-                    StepCategory.PREPARING
-                ),

                Step(
-                    context.getString(R.string.apply_patches),
+                    context.getString(R.string.execute_patches),
                    StepCategory.PATCHING
                ),

--- a/app/src/main/res/values/plurals.xml
+++ b/app/src/main/res/values/plurals.xml
@ -4,8 +4,8 @@
        <item quantity="one">%d patch</item>
        <item quantity="other">%d patches</item>
    </plurals>
-    <plurals name="patches_applied">
-        <item quantity="one">Applied %d patch</item>
-        <item quantity="other">Applied %d patches</item>
+    <plurals name="patches_executed">
+        <item quantity="one">Executed %d patch</item>
+        <item quantity="other">Executed %d patches</item>
    </plurals>
 </resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -25,6 +25,8 @@

    <string name="bundle_missing">Missing</string>
    <string name="bundle_error">Error</string>
+    <string name="bundle_name_default">Default</string>
+    <string name="bundle_name_fallback">Unnamed</string>

    <string name="selected_app_meta">%1$s • %2$d available patches</string>

@ -162,7 +164,7 @@
    <string name="continue_anyways">Continue anyways</string>
    <string name="download_another_version">Download another version</string>
    <string name="download_app">Download app</string>
-    <string name="download_apk">Download APK</string>
+    <string name="download_apk">Download APK file</string>
    <string name="source_download_fail">Failed to download patch bundle: %s</string>
    <string name="source_replace_fail">Failed to load updated patch bundle: %s</string>
    <string name="source_replace_integrations_fail">Failed to update integrations: %s</string>
@ -248,16 +250,15 @@

    <string name="patcher_step_group_preparing">Preparing</string>
    <string name="patcher_step_load_patches">Load patches</string>
-    <string name="patcher_step_unpack">Unpack APK</string>
-    <string name="patcher_step_integrations">Merge Integrations</string>
+    <string name="patcher_step_unpack">Read APK file</string>
    <string name="patcher_step_group_patching">Patching</string>
    <string name="patcher_step_group_saving">Saving</string>
-    <string name="patcher_step_write_patched">Write patched APK</string>
-    <string name="patcher_step_sign_apk">Sign APK</string>
+    <string name="patcher_step_write_patched">Write patched APK file</string>
+    <string name="patcher_step_sign_apk">Sign patched APK file</string>
    <string name="patcher_notification_message">Patching in progress…</string>
-    <string name="apply_patches">Apply patches</string>
-    <string name="applying_patch">Applying %s</string>
-    <string name="failed_to_apply_patch">Failed to apply %s</string>
+    <string name="execute_patches">Execute patches</string>
+    <string name="executing_patch">Execute %s</string>
+    <string name="failed_to_execute_patch">Failed to execute %s</string>

    <string name="step_completed">completed</string>
    <string name="step_failed">failed</string>