summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.java40
-rw-r--r--src/android/app/src/main/res/values/strings.xml4
2 files changed, 25 insertions, 19 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 6f76c3f95..067e9938d 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
@@ -508,26 +508,28 @@ public final class NativeLibrary {
508 final int Success = 0; 508 final int Success = 0;
509 final int ErrorNotInitialized = 1; 509 final int ErrorNotInitialized = 1;
510 final int ErrorGetLoader = 2; 510 final int ErrorGetLoader = 2;
511 final int ErrorSystemMode = 3; 511 final int ErrorSystemFiles = 3;
512 final int ErrorLoader = 4; 512 final int ErrorSharedFont = 4;
513 final int ErrorLoader_ErrorEncrypted = 5; 513 final int ErrorVideoCore = 5;
514 final int ErrorLoader_ErrorInvalidFormat = 6; 514 final int ErrorUnknown = 6;
515 final int ErrorSystemFiles = 7; 515 final int ErrorLoader = 7;
516 final int ErrorVideoCore = 8; 516
517 final int ErrorVideoCore_ErrorGenericDrivers = 9; 517 int captionId;
518 final int ErrorVideoCore_ErrorBelowGL33 = 10; 518 int descriptionId;
519 final int ShutdownRequested = 11; 519 switch (resultCode) {
520 final int ErrorUnknown = 12; 520 case ErrorVideoCore:
521 521 captionId = R.string.loader_error_video_core;
522 int captionId = R.string.loader_error_invalid_format; 522 descriptionId = R.string.loader_error_video_core_description;
523 if (resultCode == ErrorLoader_ErrorEncrypted) { 523 break;
524 captionId = R.string.loader_error_encrypted; 524 default:
525 captionId = R.string.loader_error_encrypted;
526 descriptionId = R.string.loader_error_encrypted_roms_description;
527 if (!ReloadKeys()) {
528 descriptionId = R.string.loader_error_encrypted_keys_description;
529 }
530 break;
525 } 531 }
526 532
527 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>.";
528 if (!ReloadKeys()) {
529 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.";
530 }
531 final EmulationActivity emulationActivity = sEmulationActivity.get(); 533 final EmulationActivity emulationActivity = sEmulationActivity.get();
532 if (emulationActivity == null) { 534 if (emulationActivity == null) {
533 Log.warning("[NativeLibrary] EmulationActivity is null, can't exit."); 535 Log.warning("[NativeLibrary] EmulationActivity is null, can't exit.");
@@ -536,7 +538,7 @@ public final class NativeLibrary {
536 538
537 AlertDialog.Builder builder = new AlertDialog.Builder(emulationActivity) 539 AlertDialog.Builder builder = new AlertDialog.Builder(emulationActivity)
538 .setTitle(captionId) 540 .setTitle(captionId)
539 .setMessage(Html.fromHtml(formatedText, Html.FROM_HTML_MODE_LEGACY)) 541 .setMessage(Html.fromHtml(emulationActivity.getString(descriptionId), Html.FROM_HTML_MODE_LEGACY))
540 .setPositiveButton(android.R.string.ok, (dialog, whichButton) -> emulationActivity.finish()) 542 .setPositiveButton(android.R.string.ok, (dialog, whichButton) -> emulationActivity.finish())
541 .setOnDismissListener(dialogInterface -> emulationActivity.finish()); 543 .setOnDismissListener(dialogInterface -> emulationActivity.finish());
542 emulationActivity.runOnUiThread(() -> { 544 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 c5e6a4e27..aa0cef521 100644
--- a/src/android/app/src/main/res/values/strings.xml
+++ b/src/android/app/src/main/res/values/strings.xml
@@ -76,6 +76,10 @@
76 76
77 <!-- ROM loading errors --> 77 <!-- ROM loading errors -->
78 <string name="loader_error_encrypted">Your ROM is encrypted</string> 78 <string name="loader_error_encrypted">Your ROM is encrypted</string>
79 <string name="loader_error_encrypted_roms_description"><![CDATA[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>.]]></string>
80 <string name="loader_error_encrypted_keys_description"><![CDATA[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.]]></string>
81 <string name="loader_error_video_core">An error occurred initializing the video core</string>
82 <string name="loader_error_video_core_description">This is usually caused by an incompatible GPU drivers. Installing a custom GPU driver may resolve this problem.</string>
79 <string name="loader_error_invalid_format">Unable to load ROM</string> 83 <string name="loader_error_invalid_format">Unable to load ROM</string>
80 84
81 <!-- Emulation Menu --> 85 <!-- Emulation Menu -->