diff --git a/app/src/main/java/app/revanced/manager/ui/screen/PatcherScreen.kt b/app/src/main/java/app/revanced/manager/ui/screen/PatcherScreen.kt index 0296eea..f803652 100644 --- a/app/src/main/java/app/revanced/manager/ui/screen/PatcherScreen.kt +++ b/app/src/main/java/app/revanced/manager/ui/screen/PatcherScreen.kt @@ -38,7 +38,7 @@ fun PatcherScreen( Scaffold(floatingActionButton = { FloatingActionButton( enabled = hasAppSelected && viewModel.anyPatchSelected(), - onClick = { if (viewModel.checkSplitApk()) { showDialog = true } else onClickPatch()}, + onClick = { if (viewModel.checkSplitApk()) { showDialog = true } else {onClickPatch(); viewModel.loadPatches0()}}, icon = { Icon(Icons.Default.Build, contentDescription = "Patch") }, text = { Text(text = "Patch") } ) @@ -50,7 +50,7 @@ fun PatcherScreen( .padding(16.dp), ) { if (showDialog) - SplitAPKDialog(onDismiss = { showDialog = false }, onConfirm = onClickPatch) + SplitAPKDialog(onDismiss = { showDialog = false }, onConfirm = onClickPatch) // TODO: replace this with something better Card( modifier = Modifier .padding(4.dp) diff --git a/app/src/main/java/app/revanced/manager/ui/viewmodel/PatcherScreenViewModel.kt b/app/src/main/java/app/revanced/manager/ui/viewmodel/PatcherScreenViewModel.kt index b47d801..a4bb1ef 100644 --- a/app/src/main/java/app/revanced/manager/ui/viewmodel/PatcherScreenViewModel.kt +++ b/app/src/main/java/app/revanced/manager/ui/viewmodel/PatcherScreenViewModel.kt @@ -84,16 +84,16 @@ class PatcherScreenViewModel(private val app: Application, private val api: API) try { val file = api.downloadPatchBundle(app.filesDir) patchBundleFile = file.absolutePath - loadPatches0(file.absolutePath) + loadPatches0() } catch (e: Exception) { Log.e("ReVancedManager", "An error occurred while loading patches", e) } } - private fun loadPatches0(path: String) { + fun loadPatches0() { val patchClasses = PatchBundle.Dex( - path, DexClassLoader( - path, + patchBundleFile, DexClassLoader( + patchBundleFile, app.codeCacheDir.absolutePath, null, javaClass.classLoader