summaryrefslogtreecommitdiffstats
path: root/src/android
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2023-02-04 10:42:52 +0100
committerbunnei <bunneidev@gmail.com>2023-06-03 09:05:29 +0200
commitddf10cdb1800e39d21b47385eeb2205a1a106715 (patch)
treeabf1b3164ea81a34a92175b8f0b1a9bbe9d8481e /src/android
parentandroid: frontend: Integrate key installation for SAF. (diff)
downloadyuzu-ddf10cdb1800e39d21b47385eeb2205a1a106715.tar
yuzu-ddf10cdb1800e39d21b47385eeb2205a1a106715.tar.gz
yuzu-ddf10cdb1800e39d21b47385eeb2205a1a106715.tar.bz2
yuzu-ddf10cdb1800e39d21b47385eeb2205a1a106715.tar.lz
yuzu-ddf10cdb1800e39d21b47385eeb2205a1a106715.tar.xz
yuzu-ddf10cdb1800e39d21b47385eeb2205a1a106715.tar.zst
yuzu-ddf10cdb1800e39d21b47385eeb2205a1a106715.zip
Diffstat (limited to 'src/android')
-rw-r--r--src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.java16
-rw-r--r--src/android/app/src/main/res/values/strings.xml2
2 files changed, 11 insertions, 7 deletions
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.java b/src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.java
index 44869b233..75395bd4c 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.java
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.java
@@ -496,20 +496,24 @@ public final class NativeLibrary {
final int ShutdownRequested = 11;
final int ErrorUnknown = 12;
+ int captionId = R.string.loader_error_invalid_format;
+ if (resultCode == ErrorLoader_ErrorEncrypted) {
+ captionId = R.string.loader_error_encrypted;
+ }
+
+ String formatedText = "Please follow the guides to redump your <a href=\"https://yuzu-emu.org/help/quickstart/#dumping-cartridge-games\">game cartidges</a> or <a href=\"https://yuzu-emu.org/help/quickstart/#dumping-installed-titles-eshop\">installed titles</a>.";
+ if (!ReloadKeys()) {
+ formatedText = "Please ensure your <a href=\"https://yuzu-emu.org/help/quickstart/#dumping-prodkeys-and-titlekeys\">prod.keys</a> file is installed so that games can be decrypted.";
+ }
final EmulationActivity emulationActivity = sEmulationActivity.get();
if (emulationActivity == null) {
Log.warning("[NativeLibrary] EmulationActivity is null, can't exit.");
return;
}
- int captionId = R.string.loader_error_invalid_format;
- if (resultCode == ErrorLoader_ErrorEncrypted) {
- captionId = R.string.loader_error_encrypted;
- }
-
AlertDialog.Builder builder = new AlertDialog.Builder(emulationActivity)
.setTitle(captionId)
- .setMessage(Html.fromHtml("Please follow the guides to redump your <a href=\"https://citra-emu.org/wiki/dumping-game-cartridges/\">game cartidges</a> or <a href=\"https://citra-emu.org/wiki/dumping-installed-titles/\">installed titles</a>.", Html.FROM_HTML_MODE_LEGACY))
+ .setMessage(Html.fromHtml(formatedText, Html.FROM_HTML_MODE_LEGACY))
.setPositiveButton(android.R.string.ok, (dialog, whichButton) -> emulationActivity.finish())
.setOnDismissListener(dialogInterface -> emulationActivity.finish());
emulationActivity.runOnUiThread(() -> {
diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml
index 1c6858a60..5535f9ded 100644
--- a/src/android/app/src/main/res/values/strings.xml
+++ b/src/android/app/src/main/res/values/strings.xml
@@ -62,7 +62,7 @@
<!-- ROM loading errors -->
<string name="loader_error_encrypted">Your ROM is encrypted</string>
- <string name="loader_error_invalid_format">Invalid ROM format</string>
+ <string name="loader_error_invalid_format">Unable to load ROM</string>
<!-- Emulation Menu -->
<string name="emulation_exit">Exit Emulation</string>