franklinblanco/yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

android: frontend: Modify ROM load messaging for invalid keys.

Browse Source
This commit is contained in:
bunnei 2023-02-04 01:42:52 -08:00
parent 93cf8c3090
commit ddf10cdb18
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.java
View File

@ -496,20 +496,24 @@ public final class NativeLibrary {
final int ShutdownRequested = 11; final int ShutdownRequested = 11;
final int ErrorUnknown = 12; 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(); final EmulationActivity emulationActivity = sEmulationActivity.get();
if (emulationActivity == null) { if (emulationActivity == null) {
Log.warning("[NativeLibrary] EmulationActivity is null, can't exit."); Log.warning("[NativeLibrary] EmulationActivity is null, can't exit.");
return; 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) AlertDialog.Builder builder = new AlertDialog.Builder(emulationActivity)
.setTitle(captionId) .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()) .setPositiveButton(android.R.string.ok, (dialog, whichButton) -> emulationActivity.finish())
.setOnDismissListener(dialogInterface -> emulationActivity.finish()); .setOnDismissListener(dialogInterface -> emulationActivity.finish());
emulationActivity.runOnUiThread(() -> { emulationActivity.runOnUiThread(() -> {

2
src/android/app/src/main/res/values/strings.xml
View File

@ -62,7 +62,7 @@
<!-- ROM loading errors --> <!-- ROM loading errors -->
<string name="loader_error_encrypted">Your ROM is encrypted</string> <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 --> <!-- Emulation Menu -->
<string name="emulation_exit">Exit Emulation</string> <string name="emulation_exit">Exit Emulation</string>