Merge pull request #30 from wxxsfxyzm/notification-fix

Add InstallFailedHyperOSIsolationViolation exception and related strings

Author: wxxsfxyzm

app/src/main/java/com/rosan/installer/data/app/model/exception/InstallFailedHyperOSIsolationViolation.kt

@@ -0,0 +1,7 @@
+package com.rosan.installer.data.app.model.exception
+
+class InstallFailedHyperOSIsolationViolation : Exception {
+    constructor() : super()
+
+    constructor(message: String?) : super(message)
+}

app/src/main/java/com/rosan/installer/data/app/util/PackageManagerUtil.kt

@@ -10,6 +10,7 @@ import com.rosan.installer.data.app.model.exception.InstallFailedContainerErrorE
 import com.rosan.installer.data.app.model.exception.InstallFailedCpuAbiIncompatibleException
 import com.rosan.installer.data.app.model.exception.InstallFailedDexOptException
 import com.rosan.installer.data.app.model.exception.InstallFailedDuplicatePackageException
+import com.rosan.installer.data.app.model.exception.InstallFailedHyperOSIsolationViolation
 import com.rosan.installer.data.app.model.exception.InstallFailedInsufficientStorageException
 import com.rosan.installer.data.app.model.exception.InstallFailedInvalidAPKException
 import com.rosan.installer.data.app.model.exception.InstallFailedInvalidInstallLocationException
@@ -86,6 +87,8 @@ class PackageManagerUtil {
 
         const val INSTALL_FAILED_REJECTED_BY_BUILDTYPE = -3001
 
+        const val INSTALL_FAILED_HYPEROS_ISOLATION_VIOLATION = -1000
+
         fun installResultVerify(
             context: Context,
             receiver: IBinderInstallerRepoImpl.LocalIntentReceiver
@@ -169,6 +172,10 @@ class PackageManagerUtil {
                     ecpMsg
                 )
 
+                INSTALL_FAILED_HYPEROS_ISOLATION_VIOLATION -> InstallFailedHyperOSIsolationViolation(
+                    ecpMsg
+                )
+
                 else -> IllegalStateException(ecpMsg)
             }
         }

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

@@ -10,6 +10,7 @@ import com.rosan.installer.data.app.model.exception.InstallFailedContainerErrorE
 import com.rosan.installer.data.app.model.exception.InstallFailedCpuAbiIncompatibleException
 import com.rosan.installer.data.app.model.exception.InstallFailedDexOptException
 import com.rosan.installer.data.app.model.exception.InstallFailedDuplicatePackageException
+import com.rosan.installer.data.app.model.exception.InstallFailedHyperOSIsolationViolation
 import com.rosan.installer.data.app.model.exception.InstallFailedInsufficientStorageException
 import com.rosan.installer.data.app.model.exception.InstallFailedInvalidAPKException
 import com.rosan.installer.data.app.model.exception.InstallFailedInvalidInstallLocationException
@@ -72,6 +73,7 @@ private fun Throwable.getStringResourceId(): Int {
         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 InstallFailedHyperOSIsolationViolation -> R.string.exception_install_failed_hyperos_isolation_violation
         is ShizukuNotWorkException -> R.string.exception_shizuku_not_work
         is DhizukuNotWorkException -> R.string.exception_dhizuku_not_work
         is RootNotWorkException -> R.string.exception_root_not_work

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

@@ -175,4 +175,5 @@
     <string name="new_version_prefix">新</string>
     <string name="install_choice">安装包选择</string>
     <string name="installer_error_reason">错误原因</string>
+    <string name="exception_install_failed_hyperos_isolation_violation">HyperOS安装系统app需要声明有效安装者！</string>
 </resources>

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

@@ -174,4 +174,5 @@
     <string name="new_version_prefix">新</string>
     <string name="install_choice">安裝包選擇</string>
     <string name="installer_error_reason">錯誤原因</string>
+    <string name="exception_install_failed_hyperos_isolation_violation">HyperOS 安裝系統應用程式需要聲明有效的安裝者！</string>
 </resources>

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

@@ -171,6 +171,7 @@
     <string name="exception_install_failed_uid_changed">The UID has changed, please uninstall and try again</string>
     <string name="exception_install_failed_version_downgrade">Downgrade failed, please uninstall the app and try again</string>
     <string name="exception_install_failed_rejected_by_build_type">Rejected by system build type</string>
+    <string name="exception_install_failed_hyperos_isolation_violation">Please Add a valid install source for installing system app</string>
 
     <string name="exception_shizuku_not_work">Please activate Sui or Shizuku and grant permission</string>
     <string name="exception_dhizuku_not_work">Please activate Dhizuku and grant permission</string>
@@ -179,4 +180,5 @@
     <string name="old_version_prefix">Current</string>
     <string name="new_version_prefix">New</string>
     <string name="install_choice">Select PKG</string>
+
 </resources>