From cf44be1de6bbfcbd92e765621bece91d2391714e Mon Sep 17 00:00:00 2001
From: Charles Lombardo <clombardo169@gmail.com>
Date: Tue, 26 Sep 2023 13:55:17 -0400
Subject: android: Adjust failure dialogs for user data and firmware installers

---
 .../src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt  | 12 ++++++++++--
 src/android/app/src/main/res/values/strings.xml              |  4 +++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt
index 0cb701476..0cef6072b 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt
@@ -676,7 +676,11 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
                     }
                 }
                 if (!isYuzuBackup) {
-                    return@newInstance getString(R.string.invalid_yuzu_backup)
+                    return@newInstance MessageDialogFragment.newInstance(
+                        this,
+                        titleId = R.string.invalid_yuzu_backup,
+                        descriptionId = R.string.user_data_import_failed_description
+                    )
                 }
 
                 // Clear existing user data
@@ -689,7 +693,11 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
                         File(DirectoryInitialization.userDirectory!!)
                     )
                 } catch (e: Exception) {
-                    return@newInstance getString(R.string.invalid_yuzu_backup)
+                    return@newInstance MessageDialogFragment.newInstance(
+                        this,
+                        titleId = R.string.import_failed,
+                        descriptionId = R.string.user_data_import_failed_description
+                    )
                 }
 
                 // Reinitialize relevant data
diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml
index 485d4c1dd..44845bfbf 100644
--- a/src/android/app/src/main/res/values/strings.xml
+++ b/src/android/app/src/main/res/values/strings.xml
@@ -100,7 +100,7 @@
     <string name="firmware_installing">Installing firmware</string>
     <string name="firmware_installed_success">Firmware installed successfully</string>
     <string name="firmware_installed_failure">Firmware installation failed</string>
-    <string name="firmware_installed_failure_description">Verify that the ZIP contains valid firmware and try again.</string>
+    <string name="firmware_installed_failure_description">Make sure the firmware nca files are at the root of the zip and try again.</string>
     <string name="share_log">Share debug logs</string>
     <string name="share_log_description">Share yuzu\'s log file to debug issues</string>
     <string name="share_log_missing">No log file found</string>
@@ -140,6 +140,7 @@
     <string name="user_data_export_success">User data exported successfully</string>
     <string name="user_data_import_success">User data imported successfully</string>
     <string name="user_data_export_cancelled">Export cancelled</string>
+    <string name="user_data_import_failed_description">Make sure the user data folders are at the root of the zip folder and contain a config file at config/config.ini and try again.</string>
     <string name="support_link">https://discord.gg/u77vRWY</string>
     <string name="website_link">https://yuzu-emu.org/</string>
     <string name="github_link">https://github.com/yuzu-emu</string>
@@ -230,6 +231,7 @@
     <string name="string_import">Import</string>
     <string name="export">Export</string>
     <string name="export_failed">Export failed</string>
+    <string name="import_failed">Import failed</string>
     <string name="cancelling">Cancelling</string>
 
     <!-- GPU driver installation -->
-- 
cgit v1.2.3