diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.java | 16 | ||||
| -rw-r--r-- | src/android/app/src/main/res/values/strings.xml | 2 |
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 { | |||
| 496 | final int ShutdownRequested = 11; | 496 | final int ShutdownRequested = 11; |
| 497 | final int ErrorUnknown = 12; | 497 | final int ErrorUnknown = 12; |
| 498 | 498 | ||
| 499 | int captionId = R.string.loader_error_invalid_format; | ||
| 500 | if (resultCode == ErrorLoader_ErrorEncrypted) { | ||
| 501 | captionId = R.string.loader_error_encrypted; | ||
| 502 | } | ||
| 503 | |||
| 504 | 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>."; | ||
| 505 | if (!ReloadKeys()) { | ||
| 506 | 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."; | ||
| 507 | } | ||
| 499 | final EmulationActivity emulationActivity = sEmulationActivity.get(); | 508 | final EmulationActivity emulationActivity = sEmulationActivity.get(); |
| 500 | if (emulationActivity == null) { | 509 | if (emulationActivity == null) { |
| 501 | Log.warning("[NativeLibrary] EmulationActivity is null, can't exit."); | 510 | Log.warning("[NativeLibrary] EmulationActivity is null, can't exit."); |
| 502 | return; | 511 | return; |
| 503 | } | 512 | } |
| 504 | 513 | ||
| 505 | int captionId = R.string.loader_error_invalid_format; | ||
| 506 | if (resultCode == ErrorLoader_ErrorEncrypted) { | ||
| 507 | captionId = R.string.loader_error_encrypted; | ||
| 508 | } | ||
| 509 | |||
| 510 | AlertDialog.Builder builder = new AlertDialog.Builder(emulationActivity) | 514 | AlertDialog.Builder builder = new AlertDialog.Builder(emulationActivity) |
| 511 | .setTitle(captionId) | 515 | .setTitle(captionId) |
| 512 | .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)) | 516 | .setMessage(Html.fromHtml(formatedText, Html.FROM_HTML_MODE_LEGACY)) |
| 513 | .setPositiveButton(android.R.string.ok, (dialog, whichButton) -> emulationActivity.finish()) | 517 | .setPositiveButton(android.R.string.ok, (dialog, whichButton) -> emulationActivity.finish()) |
| 514 | .setOnDismissListener(dialogInterface -> emulationActivity.finish()); | 518 | .setOnDismissListener(dialogInterface -> emulationActivity.finish()); |
| 515 | emulationActivity.runOnUiThread(() -> { | 519 | 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 @@ | |||
| 62 | 62 | ||
| 63 | <!-- ROM loading errors --> | 63 | <!-- ROM loading errors --> |
| 64 | <string name="loader_error_encrypted">Your ROM is encrypted</string> | 64 | <string name="loader_error_encrypted">Your ROM is encrypted</string> |
| 65 | <string name="loader_error_invalid_format">Invalid ROM format</string> | 65 | <string name="loader_error_invalid_format">Unable to load ROM</string> |
| 66 | 66 | ||
| 67 | <!-- Emulation Menu --> | 67 | <!-- Emulation Menu --> |
| 68 | <string name="emulation_exit">Exit Emulation</string> | 68 | <string name="emulation_exit">Exit Emulation</string> |