fix: improve keystore import error handling and show toast

Author: CnC-Robert

app/src/main/java/app/revanced/manager/ui/screen/settings/ImportExportSettingsScreen.kt

@@ -37,6 +37,7 @@ import app.revanced.manager.ui.component.bundle.BundleSelector
 import app.revanced.manager.ui.component.settings.SettingsListItem
 import app.revanced.manager.ui.viewmodel.ImportExportViewModel
 import app.revanced.manager.util.toast
+import app.revanced.manager.util.uiSafe
 import kotlinx.coroutines.launch
 import org.koin.androidx.compose.koinViewModel
 
@@ -86,8 +87,10 @@ fun ImportExportSettingsScreen(
             onDismissRequest = vm::cancelKeystoreImport,
             onSubmit = { cn, pass ->
                 vm.viewModelScope.launch {
-                    val result = vm.tryKeystoreImport(cn, pass)
-                    if (!result) context.toast(context.getString(R.string.import_keystore_wrong_credentials))
+                    uiSafe(context, R.string.failed_to_import_keystore, "Failed to import keystore") {
+                        val result = vm.tryKeystoreImport(cn, pass)
+                        if (!result) context.toast(context.getString(R.string.import_keystore_wrong_credentials))
+                    }
                 }
             }
         )

app/src/main/java/app/revanced/manager/ui/viewmodel/ImportExportViewModel.kt

@@ -69,25 +69,27 @@ class ImportExportViewModel(
     }
 
     fun startKeystoreImport(content: Uri) = viewModelScope.launch {
-        val path = withContext(Dispatchers.IO) {
-            File.createTempFile("signing", "ks", app.cacheDir).toPath().also {
-                Files.copy(
-                    contentResolver.openInputStream(content)!!,
-                    it,
-                    StandardCopyOption.REPLACE_EXISTING
-                )
+        uiSafe(app, R.string.failed_to_import_keystore, "Failed to import keystore") {
+            val path = withContext(Dispatchers.IO) {
+                File.createTempFile("signing", "ks", app.cacheDir).toPath().also {
+                    Files.copy(
+                        contentResolver.openInputStream(content)!!,
+                        it,
+                        StandardCopyOption.REPLACE_EXISTING
+                    )
+                }
             }
-        }
 
-        aliases.forEach { alias ->
-            knownPasswords.forEach { pass ->
-                if (tryKeystoreImport(alias, pass, path)) {
-                    return@launch
+            aliases.forEach { alias ->
+                knownPasswords.forEach { pass ->
+                    if (tryKeystoreImport(alias, pass, path)) {
+                        return@launch
+                    }
                 }
             }
-        }
 
-        keystoreImportPath = path
+            keystoreImportPath = path
+        }
     }
 
     fun cancelKeystoreImport() {

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

@@ -419,4 +419,5 @@
     <string name="never_show_again">Never show again</string>
     <string name="show_manager_update_dialog_on_launch">Show update message on launch</string>
     <string name="show_manager_update_dialog_on_launch_description">Shows a popup notification whenever there is a new update available on launch.</string>
+    <string name="failed_to_import_keystore">Failed to import keystore</string>
 </resources>