Merge pull request #12076 from JosJuice/android-when-or

Android: Fix SettingsActivity.onActivityResult
dolphin-emu · Jul 28, 2023 · bed3874 · bed3874
2 parents 17fa9df + b5b8282
commit bed3874
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/...roid/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivity.kt b/...roid/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivity.kt
@@ -181,11 +181,11 @@ class SettingsActivity : AppCompatActivity(), SettingsActivityView {
                 fragment!!.adapter!!.onFilePickerConfirmation(path!!)
             }
 
-            MainPresenter.REQUEST_GAME_FILE
-                or MainPresenter.REQUEST_SD_FILE
-                or MainPresenter.REQUEST_WAD_FILE
-                or MainPresenter.REQUEST_WII_SAVE_FILE
-                or MainPresenter.REQUEST_NAND_BIN_FILE -> {
+            MainPresenter.REQUEST_GAME_FILE,
+            MainPresenter.REQUEST_SD_FILE,
+            MainPresenter.REQUEST_WAD_FILE,
+            MainPresenter.REQUEST_WII_SAVE_FILE,
+            MainPresenter.REQUEST_NAND_BIN_FILE -> {
                 val uri = canonicalizeIfPossible(result!!.data!!)
                 val validExtensions: Set<String> =
                     if (requestCode == MainPresenter.REQUEST_GAME_FILE) FileBrowserHelper.GAME_EXTENSIONS else FileBrowserHelper.RAW_EXTENSION