From 326afc95abe80a43b4ef560719906b5493616c01 Mon Sep 17 00:00:00 2001
From: NkBe <HSSkyBoy@outlook.com>
Date: Sun, 7 Sep 2025 14:38:14 +0800
Subject: [PATCH] feat: add FileProvider and refactor install logic
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

新增 FileProvider 到 AndroidManifest，使其能检测到修补后的 apk；简化 NewPatchScreen 的安装按钮逻辑；修正 AppManagePage 的闭包结构。
---
 manager/src/main/AndroidManifest.xml                  | 11 ++++++++++-
 .../org/lsposed/lspatch/ui/page/NewPatchScreen.kt     |  7 -------
 .../lsposed/lspatch/ui/page/manage/AppManagePage.kt   |  1 -
 .../java/org/lsposed/lspatch/share/Constants.java     |  2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/manager/src/main/AndroidManifest.xml b/manager/src/main/AndroidManifest.xml
index 02cabe9..7ee1757 100644
--- a/manager/src/main/AndroidManifest.xml
+++ b/manager/src/main/AndroidManifest.xml
@@ -71,6 +71,15 @@
             android:exported="true"
             android:multiprocess="false"
             android:permission="android.permission.INTERACT_ACROSS_USERS_FULL" />
-    </application>
 
+        <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>
\ No newline at end of file
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
index fc85776..4944f09 100644
--- a/manager/src/main/java/org/lsposed/lspatch/ui/page/NewPatchScreen.kt
+++ b/manager/src/main/java/org/lsposed/lspatch/ui/page/NewPatchScreen.kt
@@ -479,13 +479,6 @@ private fun DoPatchBody(modifier: Modifier, navigator: DestinationsNavigator) {
                         Button(
                             modifier = Modifier.weight(1f),
                             onClick = {
-                                if (!ShizukuApi.isPermissionGranted) {
-                                    scope.launch {
-                                        snackbarHost.showSnackbar(shizukuUnavailable)
-                                    }
-                                } else {
-                                    installing = true
-                                }
                                 installation = if (!ShizukuApi.isPermissionGranted) NewPatchViewModel.InstallMethod.SYSTEM else NewPatchViewModel.InstallMethod.SHIZUKU
                                 Log.d(TAG, "Installation method: $installation")
                             },
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
index 119c2f8..45345cd 100644
--- 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
@@ -197,7 +197,6 @@ fun AppManageBody(
                                 scope.launch {
                                     viewModel.dispatch(AppManageViewModel.ViewAction.UpdateLoader(it.first, it.second))
                                 }
-                                }
                             }
                         )
                     }
diff --git a/share/java/src/main/java/org/lsposed/lspatch/share/Constants.java b/share/java/src/main/java/org/lsposed/lspatch/share/Constants.java
index f8a8f7f..dd1d9b6 100644
--- a/share/java/src/main/java/org/lsposed/lspatch/share/Constants.java
+++ b/share/java/src/main/java/org/lsposed/lspatch/share/Constants.java
@@ -10,7 +10,7 @@ public class Constants {
 
     final static public String PATCH_FILE_SUFFIX = "-lspatched.apk";
     final static public String PROXY_APP_COMPONENT_FACTORY = "org.lsposed.lspatch.metaloader.LSPAppComponentFactoryStub";
-    final static public String MANAGER_PACKAGE_NAME = "org.lsposed.lspatch";
+    final static public String MANAGER_PACKAGE_NAME = "org.lsposed.npatch";
     final static public int MIN_ROLLING_VERSION_CODE = 348;
 
     final static public int SIGBYPASS_LV_DISABLE = 0;