Enhance error handling in installer notifications with detailed messages

Author: wxxsfxyzm

app/src/main/java/com/rosan/installer/data/app/model/impl/installer/IBinderInstallerRepoImpl.kt

@@ -239,7 +239,7 @@ abstract class IBinderInstallerRepoImpl : InstallerRepo, KoinComponent {
     ) {
         fun special() = null
         val authorizer = config.authorizer
-        Log.d("useUserservice", "calling useUserService...")
+        Log.d("useUserService", "calling useUserService...")
         useUserService(
             config, if (authorizer == ConfigEntity.Authorizer.None
                 || authorizer == ConfigEntity.Authorizer.Dhizuku

app/src/main/java/com/rosan/installer/data/installer/model/impl/installer/ForegroundInfoHandler.kt

@@ -17,6 +17,7 @@ import com.rosan.installer.R
 import com.rosan.installer.data.app.util.getInfo
 import com.rosan.installer.data.installer.model.entity.ProgressEntity
 import com.rosan.installer.data.installer.repo.InstallerRepo
+import com.rosan.installer.util.getErrorMessage
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
@@ -237,10 +238,22 @@ class ForegroundInfoHandler(scope: CoroutineScope, installer: InstallerRepo) :
             .addAction(0, getString(R.string.cancel), finishIntent).build()
     }
 
-    private fun onInstallFailed(builder: NotificationCompat.Builder): Notification {
+    private fun onInstallFailed(
+        builder: NotificationCompat.Builder
+    ): Notification {
         val info = installer.entities.filter { it.selected }.map { it.app }.getInfo(context)
+        val reason = installer.error.getErrorMessage(context)
+        val contentText = getString(R.string.installer_install_failed)
+        val bigTextStyle = NotificationCompat.BigTextStyle()
+            .setBigContentTitle(info.title)
+            .bigText(
+                "$contentText\n" +
+                        getString(R.string.installer_error_reason) +
+                        ": $reason"
+            )
         return builder.setContentTitle(info.title)
-            .setContentText(getString(R.string.installer_install_failed))
+            .setContentText(contentText)
+            .setStyle(bigTextStyle)
             .setLargeIcon(info.icon?.toBitmapOrNull())
             .addAction(0, getString(R.string.retry), installIntent)
             .addAction(0, getString(R.string.cancel), finishIntent).build()

app/src/main/java/com/rosan/installer/util/ThrowableUtil.kt

@@ -1,5 +1,6 @@
 package com.rosan.installer.util
 
+import android.content.Context
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import com.rosan.installer.R
@@ -34,40 +35,71 @@ import com.rosan.installer.data.recycle.model.exception.DhizukuNotWorkException
 import com.rosan.installer.data.recycle.model.exception.RootNotWorkException
 import com.rosan.installer.data.recycle.model.exception.ShizukuNotWorkException
 
+/**
+ * [公共实现]
+ *
+ * 一个私有的辅助函数，它作为唯一的真实来源，
+ * 负责将一个 Throwable 映射到其对应的字符串资源 ID。
+ *
+ * @return R.string 的资源 ID。
+ */
+private fun Throwable.getStringResourceId(): Int {
+    return when (this) {
+        is InstallFailedAlreadyExistsException -> R.string.exception_install_failed_already_exists
+        is InstallFailedInvalidAPKException -> R.string.exception_install_failed_invalid_apk
+        is InstallFailedInvalidURIException -> R.string.exception_install_failed_invalid_uri
+        is InstallFailedInsufficientStorageException -> R.string.exception_install_failed_insufficient_storage
+        is InstallFailedDuplicatePackageException -> R.string.exception_install_failed_duplicate_package
+        is InstallFailedNoSharedUserException -> R.string.exception_install_failed_no_shared_user
+        is InstallFailedUpdateIncompatibleException -> R.string.exception_install_failed_update_incompatible
+        is InstallFailedSharedUserIncompatibleException -> R.string.exception_install_failed_shared_user_incompatible
+        is InstallFailedMissingSharedLibraryException -> R.string.exception_install_failed_missing_shared_library
+        is InstallFailedReplaceCouldntDeleteException -> R.string.exception_install_failed_replace_couldnt_delete
+        is InstallFailedDexOptException -> R.string.exception_install_failed_dexopt
+        is InstallFailedOlderSdkException -> R.string.exception_install_failed_older_sdk
+        is InstallFailedConflictingProviderException -> R.string.exception_install_failed_conflicting_provider
+        is InstallFailedNewerSDKException -> R.string.exception_install_failed_newer_sdk
+        is InstallFailedTestOnlyException -> R.string.exception_install_failed_test_only
+        is InstallFailedCpuAbiIncompatibleException -> R.string.exception_install_failed_cpu_abi_incompatible
+        is InstallFailedMissingFeatureException -> R.string.exception_install_failed_missing_feature
+        is InstallFailedContainerErrorException -> R.string.exception_install_failed_container_error
+        is InstallFailedInvalidInstallLocationException -> R.string.exception_install_failed_invalid_install_location
+        is InstallFailedMediaUnavailableException -> R.string.exception_install_failed_media_unavailable
+        is InstallFailedVerificationTimeoutException -> R.string.exception_install_failed_verification_timeout
+        is InstallFailedVerificationFailureException -> R.string.exception_install_failed_verification_failure
+        is InstallFailedPackageChangedException -> R.string.exception_install_failed_package_changed
+        is InstallFailedUidChangedException -> R.string.exception_install_failed_uid_changed
+        is InstallFailedVersionDowngradeException -> R.string.exception_install_failed_version_downgrade
+        is InstallFailedRejectedByBuildTypeException -> R.string.exception_install_failed_rejected_by_build_type
+        is ShizukuNotWorkException -> R.string.exception_shizuku_not_work
+        is DhizukuNotWorkException -> R.string.exception_dhizuku_not_work
+        is RootNotWorkException -> R.string.exception_root_not_work
+        is AppProcessNotWorkException -> R.string.exception_app_process_not_work
+        else -> R.string.exception_install_failed_unknown
+    }
+}
+
+/**
+ * [公开API - Composable]
+ *
+ * 用于在 Jetpack Compose UI 中获取用户友好的错误信息。
+ */
 @Composable
 fun Throwable.help(): String {
-    return when (this) {
-        is InstallFailedAlreadyExistsException -> stringResource(R.string.exception_install_failed_already_exists)
-        is InstallFailedInvalidAPKException -> stringResource(R.string.exception_install_failed_invalid_apk)
-        is InstallFailedInvalidURIException -> stringResource(R.string.exception_install_failed_invalid_uri)
-        is InstallFailedInsufficientStorageException -> stringResource(R.string.exception_install_failed_insufficient_storage)
-        is InstallFailedDuplicatePackageException -> stringResource(R.string.exception_install_failed_duplicate_package)
-        is InstallFailedNoSharedUserException -> stringResource(R.string.exception_install_failed_no_shared_user)
-        is InstallFailedUpdateIncompatibleException -> stringResource(R.string.exception_install_failed_update_incompatible)
-        is InstallFailedSharedUserIncompatibleException -> stringResource(R.string.exception_install_failed_shared_user_incompatible)
-        is InstallFailedMissingSharedLibraryException -> stringResource(R.string.exception_install_failed_missing_shared_library)
-        is InstallFailedReplaceCouldntDeleteException -> stringResource(R.string.exception_install_failed_replace_couldnt_delete)
-        is InstallFailedDexOptException -> stringResource(R.string.exception_install_failed_dexopt)
-        is InstallFailedOlderSdkException -> stringResource(R.string.exception_install_failed_older_sdk)
-        is InstallFailedConflictingProviderException -> stringResource(R.string.exception_install_failed_conflicting_provider)
-        is InstallFailedNewerSDKException -> stringResource(R.string.exception_install_failed_newer_sdk)
-        is InstallFailedTestOnlyException -> stringResource(R.string.exception_install_failed_test_only)
-        is InstallFailedCpuAbiIncompatibleException -> stringResource(R.string.exception_install_failed_cpu_abi_incompatible)
-        is InstallFailedMissingFeatureException -> stringResource(R.string.exception_install_failed_missing_feature)
-        is InstallFailedContainerErrorException -> stringResource(R.string.exception_install_failed_container_error)
-        is InstallFailedInvalidInstallLocationException -> stringResource(R.string.exception_install_failed_invalid_install_location)
-        is InstallFailedMediaUnavailableException -> stringResource(R.string.exception_install_failed_media_unavailable)
-        is InstallFailedVerificationTimeoutException -> stringResource(R.string.exception_install_failed_verification_timeout)
-        is InstallFailedVerificationFailureException -> stringResource(R.string.exception_install_failed_verification_failure)
-        is InstallFailedPackageChangedException -> stringResource(R.string.exception_install_failed_package_changed)
-        is InstallFailedUidChangedException -> stringResource(R.string.exception_install_failed_uid_changed)
-        is InstallFailedVersionDowngradeException -> stringResource(R.string.exception_install_failed_version_downgrade)
-        is InstallFailedRejectedByBuildTypeException -> stringResource(R.string.exception_install_failed_rejected_by_build_type)
+    // 1. 调用私有函数获取资源 ID
+    val resourceId = this.getStringResourceId()
+    // 2. 使用 Composable 的方式获取字符串
+    return stringResource(resourceId)
+}
 
-        is ShizukuNotWorkException -> stringResource(R.string.exception_shizuku_not_work)
-        is DhizukuNotWorkException -> stringResource(R.string.exception_dhizuku_not_work)
-        is RootNotWorkException -> stringResource(R.string.exception_root_not_work)
-        is AppProcessNotWorkException -> stringResource(R.string.exception_app_process_not_work)
-        else -> stringResource(R.string.exception_install_failed_unknown)
-    }
+/**
+ * [公开API - Non-Composable]
+ *
+ * 用于在 Service, BroadcastReceiver, Handler 等非 Compose 环境中获取用户友好的错误信息。
+ */
+fun Throwable.getErrorMessage(context: Context): String {
+    // 1. 调用私有函数获取资源 ID
+    val resourceId = this.getStringResourceId()
+    // 2. 使用标准 Context 的方式获取字符串
+    return context.getString(resourceId)
 }

app/src/main/res/values-zh-rCN/strings.xml

@@ -127,6 +127,7 @@
     <string name="installer_install_failed">安装失败</string>
     <string name="installer_install_success">安装成功</string>
 
+    <string name="installer_unknown_error">未知错误</string>
     <string name="installer_channel_name">安装通知</string>
     <string name="installer_progress_channel_name">安装过程通知</string>
     <string name="installer_background_channel_name">后台通知</string>
@@ -173,4 +174,5 @@
     <string name="old_version_prefix">当前</string>
     <string name="new_version_prefix">新</string>
     <string name="install_choice">安装包选择</string>
+    <string name="installer_error_reason">错误原因</string>
 </resources>

app/src/main/res/values-zh-rTW/strings.xml

@@ -126,6 +126,7 @@
     <string name="installer_install_failed">安裝失敗</string>
     <string name="installer_install_success">安裝成功</string>
 
+    <string name="installer_unknown_error">未知錯誤</string>
     <string name="installer_channel_name">安裝通知</string>
     <string name="installer_progress_channel_name">安裝過程通知</string>
     <string name="installer_background_channel_name">後臺通知</string>
@@ -172,4 +173,5 @@
     <string name="old_version_prefix">當前</string>
     <string name="new_version_prefix">新</string>
     <string name="install_choice">安裝包選擇</string>
+    <string name="installer_error_reason">錯誤原因</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -128,6 +128,8 @@
     <string name="installer_installing">Installing…</string>
     <string name="installer_install_failed">Install failed</string>
     <string name="installer_install_success">Install complete</string>
+    <string name="installer_error_reason">Error Reason</string>
+    <string name="installer_unknown_error">Unknown Error</string>
 
     <string name="installer_channel_name">Install Notification</string>
     <string name="installer_progress_channel_name">Install Process Notification</string>