From 5adf053b6f506dbeda71e6bbde1e69787ca7873b Mon Sep 17 00:00:00 2001
From: Liuxinyu176 <1041316040@qq.com>
Date: Fri, 9 Oct 2026 09:38:52 +0800
Subject: [PATCH] =?UTF-8?q?fix(update):=20=E5=A3=B0=E6=98=8E=20REQUEST=5FI?=
 =?UTF-8?q?NSTALL=5FPACKAGES=20=E6=9D=83=E9=99=90=E5=B9=B6=E5=8A=A0?=
 =?UTF-8?q?=E5=9B=BA=E5=AE=89=E8=A3=85=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 缺少该权限时部分 ROM 启动系统安装器会被拒绝/闪退
- install() 整体容错：FileProvider URI 失败、ACTION_VIEW 失败均捕获并回退 ACTION_INSTALL_PACKAGE
- 版本升至 1.6.8
---
 app/build.gradle.kts                          |  4 +--
 app/src/main/AndroidManifest.xml              |  1 +
 .../token/ui/settings/UpdateViewModel.kt      | 30 +++++++++++++------
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index b952496..35cef3b 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -16,8 +16,8 @@ android {
         applicationId = "com.rainy.token"
         minSdk = 31
         targetSdk = 35
-        versionCode = 17
-        versionName = "1.6.7"
+        versionCode = 18
+        versionName = "1.6.8"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9cd6552..83aafee 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 
diff --git a/app/src/main/java/com/rainy/token/ui/settings/UpdateViewModel.kt b/app/src/main/java/com/rainy/token/ui/settings/UpdateViewModel.kt
index 6cd9d95..41183ff 100644
--- a/app/src/main/java/com/rainy/token/ui/settings/UpdateViewModel.kt
+++ b/app/src/main/java/com/rainy/token/ui/settings/UpdateViewModel.kt
@@ -80,19 +80,31 @@ class UpdateViewModel @Inject constructor(
     }
 
     fun install(file: File) {
-        if (context.packageManager.canRequestPackageInstalls()) {
-            _uiState.update { it.copy(phase = Phase.Ready(file)) }
-            val authority = context.packageName + ".fileprovider"
-            val uri = FileProvider.getUriForFile(context, authority, file)
-            val intent = Intent(Intent.ACTION_VIEW).apply {
+        if (!context.packageManager.canRequestPackageInstalls()) {
+            _uiState.update { it.copy(phase = Phase.NeedInstallPermission) }
+            return
+        }
+        _uiState.update { it.copy(phase = Phase.Ready(file)) }
+        val authority = context.packageName + ".fileprovider"
+        val uri = try {
+            FileProvider.getUriForFile(context, authority, file)
+        } catch (e: Exception) {
+            _uiState.update { it.copy(phase = Phase.Error("安装文件无效：" + (e.message ?: "未知错误"))) }
+            return
+        }
+        val actionView = Intent(Intent.ACTION_VIEW).apply {
+            setDataAndType(uri, "application/vnd.android.package-archive")
+            addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_ACTIVITY_NEW_TASK)
+        }
+        val started = runCatching { context.startActivity(actionView) }
+        if (started.isFailure) {
+            val actionInstall = Intent(Intent.ACTION_INSTALL_PACKAGE).apply {
                 setDataAndType(uri, "application/vnd.android.package-archive")
                 addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_ACTIVITY_NEW_TASK)
             }
-            runCatching { context.startActivity(intent) }.onFailure { e ->
-                _uiState.update { it.copy(phase = Phase.Error(e.message ?: "cannot start installer")) }
+            runCatching { context.startActivity(actionInstall) }.onFailure { e ->
+                _uiState.update { it.copy(phase = Phase.Error(e.message ?: "无法启动安装器")) }
             }
-        } else {
-            _uiState.update { it.copy(phase = Phase.NeedInstallPermission) }
         }
     }
 }