MirrorRepos/azahar
1
0
Fork 0
mirror of https://github.com/azahar-emu/azahar.git synced 2026-06-08 11:43:40 -04:00
Code Issues Projects Releases Packages Wiki Activity

android: Use more descriptive loader error codes

Browse source
This commit is contained in:
PabloMK7 2026-05-07 01:53:16 +02:00
parent 7649cd5975
commit 67e3c832ae
2 changed files with 43 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/android/app/src/main/java/org/citra/citra_emu/NativeLibrary.kt
View file

@ -19,6 +19,7 @@ import android.view.Surface
import android.view.View
import android.widget.TextView
import androidx.annotation.Keep
import androidx.annotation.StringRes
import androidx.core.content.ContextCompat
import androidx.core.net.toUri
import androidx.fragment.app.DialogFragment
@ -482,7 +483,8 @@ object NativeLibrary {
else if (result == CoreError.ErrorLoader_ErrorEncrypted.value)
getString(R.string.loader_error_encrypted_desc)
else
getString(R.string.loader_error_generic, result),
getString(R.string.loader_error_generic,
getString(CoreError.fromInt(result).stringRes), result),
Html.FROM_HTML_MODE_LEGACY
)
)
@ -850,23 +852,29 @@ object NativeLibrary {
FileUtil.deleteDocument(path)
}
enum class CoreError(val value: Int) {
Success(0),
ErrorNotInitialized(1),
ErrorGetLoader(2),
ErrorSystemMode(3),
ErrorLoader(4),
ErrorLoader_ErrorEncrypted(5),
ErrorLoader_ErrorInvalidFormat(6),
ErrorLoader_ErrorGBATitle(7),
ErrorSystemFiles(8),
ErrorSavestate(9),
ErrorArticDisconnected(10),
ErrorN3DSApplication(11),
ErrorCoreExceptionRaised(12),
ErrorMemoryExceptionRaised(13),
ShutdownRequested(14),
ErrorUnknown(15)
enum class CoreError(val value: Int, @StringRes val stringRes: Int) {
Success(0, R.string.core_error_success),
ErrorNotInitialized(1, R.string.core_error_not_initialized),
ErrorGetLoader(2, R.string.core_error_get_loader),
ErrorSystemMode(3, R.string.core_error_system_mode),
ErrorLoader(4, R.string.core_error_loader),
ErrorLoader_ErrorEncrypted(5, R.string.core_error_loader_encrypted),
ErrorLoader_ErrorInvalidFormat(6, R.string.core_error_loader_invalid_format),
ErrorLoader_ErrorGBATitle(7, R.string.core_error_loader_gba_title),
ErrorSystemFiles(8, R.string.core_error_system_files),
ErrorSavestate(9, R.string.core_error_savestate),
ErrorArticDisconnected(10, R.string.core_error_artic_disconnected),
ErrorN3DSApplication(11, R.string.core_error_n3ds_application),
ErrorCoreExceptionRaised(12, R.string.core_error_core_exception_raised),
ErrorMemoryExceptionRaised(13, R.string.core_error_memory_exception_raised),
ShutdownRequested(14, R.string.core_error_shutdown_requested),
ErrorUnknown(15, R.string.core_error_unknown);
companion object {
fun fromInt(value: Int): CoreError {
return entries.find { it.value == value } ?: ErrorUnknown
}
}
}
enum class InstallStatus {

18
src/android/app/src/main/res/values/strings.xml
View file

@ -440,7 +440,23 @@
<string name="loader_error_invalid_format">Invalid ROM format</string>
<string name="loader_error_file_not_found">ROM file does not exist</string>
<string name="no_game_present">No bootable game present!</string>
<string name="loader_error_generic">An error occurred while loading ROM: %d</string>
<string name="loader_error_generic">An error occurred while loading ROM: \"%s (%d)\"</string>
<string name="core_error_success">Success</string>
<string name="core_error_not_initialized">Not initialized</string>
<string name="core_error_get_loader">Loader for file not found, incompatible file type</string>
<string name="core_error_system_mode">Failed to parse file</string>
<string name="core_error_loader">Generic loader error</string>
<string name="core_error_loader_encrypted">Encrypted file</string>
<string name="core_error_loader_invalid_format">Corrupted file</string>
<string name="core_error_loader_gba_title">File is GBA title</string>
<string name="core_error_system_files">Missing system files</string>
<string name="core_error_savestate">Savestate failed</string>
<string name="core_error_artic_disconnected">Artic Base disconnected</string>
<string name="core_error_n3ds_application">File is New 3DS application</string>
<string name="core_error_core_exception_raised">Core exception raised</string>
<string name="core_error_memory_exception_raised">Memory exception raised</string>
<string name="core_error_shutdown_requested">Shutdown requested</string>
<string name="core_error_unknown">Unknown error</string>
<!-- Emulation Menu -->
<string name="emulation_menu_help">Press Back to access the menu.</string>