Android #48

src/android/app/build.gradle.kts

@@ -95,7 +95,6 @@ android {
         // builds a release build that doesn't need signing
         // Attaches 'debug' suffix to version and package name, allowing installation alongside the release build.
         register("relWithDebInfo") {
-            isDefault = true
             resValue("string", "app_name_suffixed", "yuzu Debug Release")
             signingConfig = signingConfigs.getByName("debug")
             isMinifyEnabled = true
@@ -123,7 +122,6 @@ android {
     flavorDimensions.add("version")
     productFlavors {
         create("mainline") {
-            isDefault = true
             dimension = "version"
             buildConfigField("Boolean", "PREMIUM", "false")
         }

src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/GameHelper.kt

@@ -11,7 +11,6 @@ import kotlinx.serialization.json.Json
 import org.yuzu.yuzu_emu.NativeLibrary
 import org.yuzu.yuzu_emu.YuzuApplication
 import org.yuzu.yuzu_emu.model.Game
-import org.yuzu.yuzu_emu.model.MinimalDocumentFile
 
 object GameHelper {
     const val KEY_GAME_PATH = "game_path"
@@ -30,7 +29,15 @@ object GameHelper {
         // Ensure keys are loaded so that ROM metadata can be decrypted.
         NativeLibrary.reloadKeys()
 
-        addGamesRecursive(games, FileUtil.listFiles(context, gamesUri), 3)
+        val children = FileUtil.listFiles(context, gamesUri)
+        for (file in children) {
+            if (!file.isDirectory) {
+                // Check that the file has an extension we care about before trying to read out of it.
+                if (Game.extensions.contains(FileUtil.getExtension(file.uri))) {
+                    games.add(getGame(file.uri))
+                }
+            }
+        }
 
         // Cache list of games found on disk
         val serializedGames = mutableSetOf<String>()
@@ -45,30 +52,6 @@ object GameHelper {
         return games.toList()
     }
 
-    private fun addGamesRecursive(
-        games: MutableList<Game>,
-        files: Array<MinimalDocumentFile>,
-        depth: Int
-    ) {
-        if (depth <= 0) {
-            return
-        }
-
-        files.forEach {
-            if (it.isDirectory) {
-                addGamesRecursive(
-                    games,
-                    FileUtil.listFiles(YuzuApplication.appContext, it.uri),
-                    depth - 1
-                )
-            } else {
-                if (Game.extensions.contains(FileUtil.getExtension(it.uri))) {
-                    games.add(getGame(it.uri))
-                }
-            }
-        }
-    }
-
     private fun getGame(uri: Uri): Game {
         val filePath = uri.toString()
         var name = NativeLibrary.getTitle(filePath)