Enhance installation and cleanup processes(#29)

xihan123 · xihan123 · commit 7acc806918c6 · 2025-03-25T12:48:41.000+08:00
diff --git a/manager/src/main/AndroidManifest.xml b/manager/src/main/AndroidManifest.xml
@@ -6,6 +6,7 @@
         android:name="android.permission.QUERY_ALL_PACKAGES"
         tools:ignore="QueryAllPackagesPermission" />
     <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
 
     <application
         android:name=".LSPApplication"
@@ -44,6 +45,16 @@
             android:exported="true"
             android:multiprocess="false"
             android:permission="android.permission.INTERACT_ACROSS_USERS_FULL" />
+
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths" />
+        </provider>
     </application>
 
 </manifest>
diff --git a/manager/src/main/java/org/lsposed/lspatch/LSPApplication.kt b/manager/src/main/java/org/lsposed/lspatch/LSPApplication.kt
@@ -18,6 +18,7 @@ class LSPApplication : Application() {
 
     lateinit var prefs: SharedPreferences
     lateinit var tmpApkDir: File
+    lateinit var targetApkFile: File
 
     val globalScope = CoroutineScope(Dispatchers.Default)
 
diff --git a/manager/src/main/java/org/lsposed/lspatch/Patcher.kt b/manager/src/main/java/org/lsposed/lspatch/Patcher.kt
@@ -10,8 +10,8 @@ import org.lsposed.lspatch.share.Constants
 import org.lsposed.lspatch.share.PatchConfig
 import org.lsposed.patch.LSPatch
 import org.lsposed.patch.util.Logger
+import java.io.File
 import java.io.IOException
-import java.util.Collections.addAll
 
 object Patcher {
 
@@ -59,6 +59,9 @@ object Patcher {
                         ?: throw IOException("Failed to create output file")
                     val output = lspApp.contentResolver.openOutputStream(file.uri)
                         ?: throw IOException("Failed to open output stream")
+                    val apkFile = File(lspApp.externalCacheDir, apk.name)
+                    apk.copyTo(apkFile, overwrite = true)
+                    lspApp.targetApkFile = apkFile
                     output.use {
                         apk.inputStream().use { input ->
                             input.copyTo(output)
diff --git a/manager/src/main/java/org/lsposed/lspatch/ui/page/NewPatchScreen.kt b/manager/src/main/java/org/lsposed/lspatch/ui/page/NewPatchScreen.kt
@@ -48,8 +48,11 @@ import org.lsposed.lspatch.ui.component.settings.SettingsCheckBox
 import org.lsposed.lspatch.ui.component.settings.SettingsItem
 import org.lsposed.lspatch.ui.page.destinations.SelectAppsScreenDestination
 import org.lsposed.lspatch.ui.util.LocalSnackbarHost
+import org.lsposed.lspatch.ui.util.checkIsApkFixedByLSP
+import org.lsposed.lspatch.ui.util.installApk
 import org.lsposed.lspatch.ui.util.isScrolledToEnd
 import org.lsposed.lspatch.ui.util.lastItemIndex
+import org.lsposed.lspatch.ui.util.uninstallApkByPackageName
 import org.lsposed.lspatch.ui.viewmodel.NewPatchViewModel
 import org.lsposed.lspatch.ui.viewmodel.NewPatchViewModel.PatchState
 import org.lsposed.lspatch.ui.viewmodel.NewPatchViewModel.ViewAction
@@ -121,7 +124,10 @@ fun NewPatchScreen(
     when (viewModel.patchState) {
         PatchState.INIT -> {
             LaunchedEffect(Unit) {
-                LSPPackageManager.cleanTmpApkDir()
+                LSPPackageManager.apply {
+                    cleanTmpApkDir()
+                    cleanExternalTmpApkDir()
+                }
                 when (id) {
                     ACTION_STORAGE -> {
                         storageLauncher.launch(arrayOf("application/vnd.android.package-archive"))
@@ -435,10 +441,10 @@ private fun DoPatchBody(modifier: Modifier, navigator: DestinationsNavigator) {
                     val installSuccessfully = stringResource(R.string.patch_install_successfully)
                     val installFailed = stringResource(R.string.patch_install_failed)
                     val copyError = stringResource(R.string.copy_error)
-                    var installing by remember { mutableStateOf(false) }
-                    if (installing) InstallDialog(viewModel.patchApp) { status, message ->
+                    var installing by remember { mutableStateOf(0) }
+                    val onFinish: (Int, String?) -> Unit = { status, message ->
                         scope.launch {
-                            installing = false
+                            installing = 0
                             if (status == PackageInstaller.STATUS_SUCCESS) {
                                 lspApp.globalScope.launch { snackbarHost.showSnackbar(installSuccessfully) }
                                 navigator.navigateUp()
@@ -451,6 +457,7 @@ private fun DoPatchBody(modifier: Modifier, navigator: DestinationsNavigator) {
                             }
                         }
                     }
+                    if (installing == 1) InstallDialog(viewModel.patchApp, onFinish) else if (installing == 2) InstallDialog2(viewModel.patchApp, onFinish)
                     Row(Modifier.padding(top = 12.dp)) {
                         Button(
                             modifier = Modifier.weight(1f),
@@ -462,11 +469,9 @@ private fun DoPatchBody(modifier: Modifier, navigator: DestinationsNavigator) {
                             modifier = Modifier.weight(1f),
                             onClick = {
                                 if (!ShizukuApi.isPermissionGranted) {
-                                    scope.launch {
-                                        snackbarHost.showSnackbar(shizukuUnavailable)
-                                    }
+                                    installing = 2
                                 } else {
-                                    installing = true
+                                    installing = 1
                                 }
                             },
                             content = { Text(stringResource(R.string.install)) }
@@ -572,3 +577,71 @@ private fun InstallDialog(patchApp: AppInfo, onFinish: (Int, String?) -> Unit) {
         )
     }
 }
+
+@Composable
+private fun InstallDialog2(patchApp: AppInfo, onFinish: (Int, String?) -> Unit) {
+    val scope = rememberCoroutineScope()
+    var uninstallFirst by remember {
+        mutableStateOf(
+            checkIsApkFixedByLSP(
+                lspApp,
+                patchApp.app.packageName
+            )
+        )
+    }
+
+    fun doInstall() {
+        Log.i(TAG, "Installing app ${patchApp.app.packageName}")
+        installApk(lspApp, lspApp.targetApkFile)
+    }
+
+    LaunchedEffect(Unit) {
+        if (!uninstallFirst) {
+            onFinish(LSPPackageManager.STATUS_USER_CANCELLED, "User cancelled")
+            doInstall()
+        }
+    }
+
+    if (uninstallFirst) {
+        AlertDialog(
+            onDismissRequest = {
+                onFinish(
+                    LSPPackageManager.STATUS_USER_CANCELLED,
+                    "User cancelled"
+                )
+            },
+            confirmButton = {
+                TextButton(
+                    onClick = {
+                        onFinish(LSPPackageManager.STATUS_USER_CANCELLED, "Reset")
+                        scope.launch {
+                            Log.i(TAG, "Uninstalling app ${patchApp.app.packageName}")
+                            uninstallApkByPackageName(lspApp, patchApp.app.packageName)
+                            uninstallFirst = false
+                        }
+                    },
+                    content = { Text(stringResource(android.R.string.ok)) }
+                )
+            },
+            dismissButton = {
+                TextButton(
+                    onClick = {
+                        onFinish(
+                            LSPPackageManager.STATUS_USER_CANCELLED,
+                            "User cancelled"
+                        )
+                    },
+                    content = { Text(stringResource(android.R.string.cancel)) }
+                )
+            },
+            title = {
+                Text(
+                    modifier = Modifier.fillMaxWidth(),
+                    text = stringResource(R.string.uninstall),
+                    textAlign = TextAlign.Center
+                )
+            },
+            text = { Text(stringResource(R.string.patch_uninstall_text)) }
+        )
+    }
+}
diff --git a/manager/src/main/java/org/lsposed/lspatch/ui/page/manage/AppManagePage.kt b/manager/src/main/java/org/lsposed/lspatch/ui/page/manage/AppManagePage.kt
@@ -192,11 +192,7 @@ fun AppManageBody(
                             onClick = {
                                 expanded = false
                                 scope.launch {
-                                    if (!ShizukuApi.isPermissionGranted) {
-                                        snackbarHost.showSnackbar(shizukuUnavailable)
-                                    } else {
-                                        viewModel.dispatch(AppManageViewModel.ViewAction.UpdateLoader(it.first, it.second))
-                                    }
+                                    viewModel.dispatch(AppManageViewModel.ViewAction.UpdateLoader(it.first, it.second))
                                 }
                             }
                         )
diff --git a/manager/src/main/java/org/lsposed/lspatch/ui/util/Utils.kt b/manager/src/main/java/org/lsposed/lspatch/ui/util/Utils.kt
@@ -1,6 +1,13 @@
 package org.lsposed.lspatch.ui.util
 
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.util.Log
 import androidx.compose.foundation.lazy.LazyListState
+import androidx.core.content.FileProvider
+import androidx.core.net.toUri
+import java.io.File
 
 val LazyListState.lastVisibleItemIndex
     get() = layoutInfo.visibleItemsInfo.lastOrNull()?.index
@@ -10,3 +17,44 @@ val LazyListState.lastItemIndex
 
 val LazyListState.isScrolledToEnd
     get() = lastVisibleItemIndex == lastItemIndex
+
+fun checkIsApkFixedByLSP(context: Context, packageName: String): Boolean {
+    return try {
+        val app =
+            context.packageManager.getApplicationInfo(packageName, PackageManager.GET_META_DATA)
+        (app.metaData?.containsKey("lspatch") != true)
+    } catch (_: PackageManager.NameNotFoundException) {
+        Log.e("LSPatch", "Package not found: $packageName")
+        false
+    } catch (e: Exception) {
+        Log.e("LSPatch", "Unexpected error in checkIsApkFixedByLSP", e)
+        false
+    }
+}
+
+fun installApk(context: Context, apkFile: File) {
+    try {
+        val apkUri =
+            FileProvider.getUriForFile(context, "${context.packageName}.fileprovider", apkFile)
+
+        val intent = Intent(Intent.ACTION_VIEW).apply {
+            addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+            addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            addCategory("android.intent.category.DEFAULT")
+            setDataAndType(apkUri, "application/vnd.android.package-archive")
+        }
+        context.startActivity(intent)
+    } catch (e: Exception) {
+        Log.e("LSPatch", "installApk", e)
+    }
+}
+
+fun uninstallApkByPackageName(context: Context, packageName: String) = try {
+    val intent = Intent(Intent.ACTION_DELETE).apply {
+        data = "package:$packageName".toUri()
+        addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+    }
+    context.startActivity(intent)
+} catch (e: Exception) {
+    Log.e("LSPatch", "uninstallApkByPackageName", e)
+}
diff --git a/manager/src/main/java/org/lsposed/lspatch/ui/viewmodel/manage/AppManageViewModel.kt b/manager/src/main/java/org/lsposed/lspatch/ui/viewmodel/manage/AppManageViewModel.kt
@@ -17,6 +17,7 @@ import org.lsposed.lspatch.Patcher
 import org.lsposed.lspatch.lspApp
 import org.lsposed.lspatch.share.Constants
 import org.lsposed.lspatch.share.PatchConfig
+import org.lsposed.lspatch.ui.util.installApk
 import org.lsposed.lspatch.ui.viewstate.ProcessingState
 import org.lsposed.lspatch.util.LSPPackageManager
 import org.lsposed.lspatch.util.LSPPackageManager.AppInfo
@@ -86,7 +87,10 @@ class AppManageViewModel : ViewModel() {
         updateLoaderState = ProcessingState.Processing
         val result = runCatching {
             withContext(Dispatchers.IO) {
-                LSPPackageManager.cleanTmpApkDir()
+                LSPPackageManager.apply {
+                    cleanTmpApkDir()
+                    cleanExternalTmpApkDir()
+                }
                 val apkPaths = listOf(appInfo.app.sourceDir) + (appInfo.app.splitSourceDirs ?: emptyArray())
                 val patchPaths = mutableListOf<String>()
                 val embeddedModulePaths = mutableListOf<String>()
@@ -118,8 +122,12 @@ class AppManageViewModel : ViewModel() {
                     }
                 }
                 Patcher.patch(logger, Patcher.Options(false, config, patchPaths, embeddedModulePaths))
-                val (status, message) = LSPPackageManager.install()
-                if (status != PackageInstaller.STATUS_SUCCESS) throw RuntimeException(message)
+                if (!ShizukuApi.isPermissionGranted) {
+                    installApk(lspApp, lspApp.targetApkFile)
+                } else {
+                    val (status, message) = LSPPackageManager.install()
+                    if (status != PackageInstaller.STATUS_SUCCESS) throw RuntimeException(message)
+                }
             }
         }
         updateLoaderState = ProcessingState.Done(result)
diff --git a/manager/src/main/java/org/lsposed/lspatch/util/LSPPackageManager.kt b/manager/src/main/java/org/lsposed/lspatch/util/LSPPackageManager.kt
@@ -79,6 +79,12 @@ object LSPPackageManager {
         }
     }
 
+    suspend fun cleanExternalTmpApkDir(){
+        withContext(Dispatchers.IO) {
+            lspApp.externalCacheDir?.listFiles()?.forEach(File::delete)
+        }
+    }
+
     suspend fun install(): Pair<Int, String?> {
         Log.i(TAG, "Perform install patched apks")
         var status = PackageInstaller.STATUS_FAILURE
diff --git a/manager/src/main/res/xml/file_paths.xml b/manager/src/main/res/xml/file_paths.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths>
+    <external-path name="external_files" path="." />
+    <files-path name="files" path="." />
+</paths>

Original file line number	Diff line number	Diff line change
`@@ -192,11 +192,7 @@ fun AppManageBody(`
`192`	`192`	`onClick = {`
`193`	`193`	`expanded = false`
`194`	`194`	`scope.launch {`
`195`		`- if (!ShizukuApi.isPermissionGranted) {`
`196`		`- snackbarHost.showSnackbar(shizukuUnavailable)`
`197`		`- } else {`
`198`		`- viewModel.dispatch(AppManageViewModel.ViewAction.UpdateLoader(it.first, it.second))`
`199`		`- }`
	`195`	`+ viewModel.dispatch(AppManageViewModel.ViewAction.UpdateLoader(it.first, it.second))`
`200`	`196`	`}`
`201`	`197`	`}`
`202`	`198`	`)`
Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,12 @@ object LSPPackageManager {`
`79`	`79`	`}`
`80`	`80`	`}`
`81`	`81`
	`82`	`+ suspend fun cleanExternalTmpApkDir(){`
	`83`	`+ withContext(Dispatchers.IO) {`
	`84`	`+ lspApp.externalCacheDir?.listFiles()?.forEach(File::delete)`
	`85`	`+ }`
	`86`	`+ }`
	`87`	`+`
`82`	`88`	`suspend fun install(): Pair<Int, String?> {`
`83`	`89`	`Log.i(TAG, "Perform install patched apks")`
`84`	`90`	`var status = PackageInstaller.STATUS_FAILURE`