Skip to content

Commit 5f6ebd8

Browse files
committed
Fix 3DS emulator launch intents and add Azahar support
- Fix Citra MMJ: correct activity class and use GamePath extra with file path - Fix Lime3DS: remove redundant SelectedGame extra, use ACTION_VIEW data - Fix Citra: use FilePath instead of FileUri for better compatibility - Add Azahar emulator (successor to Citra/Lime3DS) - Update recommended 3DS emulator order
1 parent 080ac7e commit 5f6ebd8

2 files changed

Lines changed: 18 additions & 8 deletions

File tree

app/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ android {
2222
applicationId = "com.nendo.argosy"
2323
minSdk = 26
2424
targetSdk = 34
25-
versionCode = 17
26-
versionName = "0.5.10"
25+
versionCode = 18
26+
versionName = "0.5.11"
2727

2828
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2929
vectorDrawables {

app/src/main/kotlin/com/nendo/argosy/data/emulator/EmulatorRegistry.kt

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,14 +107,15 @@ object EmulatorRegistry {
107107
supportedPlatforms = setOf("gc", "ngc", "wii"),
108108
downloadUrl = "https://play.google.com/store/apps/details?id=org.dolphinemu.dolphinemu"
109109
),
110+
// NOTE: Original Citra is discontinued - most users should use Lime3DS or Azahar
110111
EmulatorDef(
111112
id = "citra",
112113
packageName = "org.citra.citra_emu",
113114
displayName = "Citra",
114115
supportedPlatforms = setOf("3ds"),
115116
launchConfig = LaunchConfig.Custom(
116117
activityClass = "org.citra.citra_emu.activities.EmulationActivity",
117-
intentExtras = mapOf("SelectedGame" to ExtraValue.FileUri)
118+
intentExtras = mapOf("SelectedGame" to ExtraValue.FilePath)
118119
),
119120
downloadUrl = "https://github.com/citra-emu/citra-android/releases"
120121
),
@@ -124,8 +125,8 @@ object EmulatorRegistry {
124125
displayName = "Citra MMJ",
125126
supportedPlatforms = setOf("3ds"),
126127
launchConfig = LaunchConfig.Custom(
127-
activityClass = "org.citra.emu.activities.EmulationActivity",
128-
intentExtras = mapOf("SelectedGame" to ExtraValue.FileUri)
128+
activityClass = "org.citra.emu.ui.EmulationActivity",
129+
intentExtras = mapOf("GamePath" to ExtraValue.FilePath)
129130
),
130131
downloadUrl = "https://github.com/weihuoya/citra/releases"
131132
),
@@ -135,11 +136,20 @@ object EmulatorRegistry {
135136
displayName = "Lime3DS",
136137
supportedPlatforms = setOf("3ds"),
137138
launchConfig = LaunchConfig.Custom(
138-
activityClass = "io.github.lime3ds.android.activities.EmulationActivity",
139-
intentExtras = mapOf("SelectedGame" to ExtraValue.FileUri)
139+
activityClass = "io.github.lime3ds.android.activities.EmulationActivity"
140140
),
141141
downloadUrl = "https://github.com/Lime3DS/Lime3DS/releases"
142142
),
143+
EmulatorDef(
144+
id = "azahar",
145+
packageName = "io.github.azahar_emu.azahar",
146+
displayName = "Azahar",
147+
supportedPlatforms = setOf("3ds"),
148+
launchConfig = LaunchConfig.Custom(
149+
activityClass = "io.github.azahar_emu.azahar.activities.EmulationActivity"
150+
),
151+
downloadUrl = "https://github.com/azahar-emu/azahar/releases"
152+
),
143153
EmulatorDef(
144154
id = "yuzu",
145155
packageName = "org.yuzu.yuzu_emu",
@@ -372,7 +382,7 @@ object EmulatorRegistry {
372382
"vita" to listOf("vita3k"),
373383
"n64" to listOf("mupen64plus_fz", "retroarch", "retroarch_64"),
374384
"nds" to listOf("drastic", "melonds", "retroarch", "retroarch_64"),
375-
"3ds" to listOf("lime3ds", "citra", "citra_mmj"),
385+
"3ds" to listOf("azahar", "lime3ds", "citra_mmj", "citra"),
376386
"gc" to listOf("dolphin", "retroarch", "retroarch_64"),
377387
"ngc" to listOf("dolphin", "retroarch", "retroarch_64"),
378388
"wii" to listOf("dolphin"),

0 commit comments

Comments
 (0)