From b68c21755479886f8655958d9eabd60e59b00c37 Mon Sep 17 00:00:00 2001
From: kichikuou <KichikuouChrome@gmail.com>
Date: Wed, 22 Dec 2021 21:41:59 +0900
Subject: [PATCH] Android: Get rid of Kotlin warnings

---
 .../io/github/kichikuou/xsystem35/GameActivity.kt    |  2 +-
 .../java/io/github/kichikuou/xsystem35/Launcher.kt   | 12 ++++++------
 .../github/kichikuou/xsystem35/LauncherActivity.kt   |  7 +++++--
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/android/app/src/main/java/io/github/kichikuou/xsystem35/GameActivity.kt b/android/app/src/main/java/io/github/kichikuou/xsystem35/GameActivity.kt
index 1a445c7..fff4214 100644
--- a/android/app/src/main/java/io/github/kichikuou/xsystem35/GameActivity.kt
+++ b/android/app/src/main/java/io/github/kichikuou/xsystem35/GameActivity.kt
@@ -162,7 +162,7 @@ private class CddaPlayer(private val playlistPath: File) {
             playlistPath.readLines()
         } catch (e: IOException) {
             Log.e("loadPlaylist", "Cannot load $playlistPath", e)
-            emptyList<String>()
+            emptyList()
         }
     private var currentTrack = 0
     private val player = MediaPlayer()
diff --git a/android/app/src/main/java/io/github/kichikuou/xsystem35/Launcher.kt b/android/app/src/main/java/io/github/kichikuou/xsystem35/Launcher.kt
index 3b5a943..a7bc865 100644
--- a/android/app/src/main/java/io/github/kichikuou/xsystem35/Launcher.kt
+++ b/android/app/src/main/java/io/github/kichikuou/xsystem35/Launcher.kt
@@ -109,7 +109,7 @@ class Launcher private constructor(private val rootDir: File) {
     private fun updateGameList() {
         var saveDirFound = false
         games.clear()
-        for (path in rootDir.listFiles()) {
+        for (path in rootDir.listFiles() ?: emptyArray()) {
             if (!path.isDirectory)
                 continue
             if (path.name == SAVE_DIR) {
@@ -144,7 +144,7 @@ class Launcher private constructor(private val rootDir: File) {
     // Throws IOException
     fun exportSaveData(output: OutputStream) {
         ZipOutputStream(output.buffered()).use { zip ->
-            for (path in File(rootDir, SAVE_DIR).listFiles()) {
+            for (path in File(rootDir, SAVE_DIR).listFiles() ?: emptyArray()) {
                 if (path.isDirectory || path.name.endsWith(".asd."))
                     continue
                 val pathInZip = "${SAVE_DIR}/${path.name}"
@@ -189,7 +189,7 @@ class Launcher private constructor(private val rootDir: File) {
                 val path = File(outDir, zipEntry.name)
                 if (zipEntry.isDirectory)
                     return@forEachZipEntry
-                path.parentFile.mkdirs()
+                path.parentFile?.mkdirs()
                 handler.sendMessage(handler.obtainMessage(PROGRESS, zipEntry.name))
                 FileOutputStream(path).buffered().use {
                     zip.copyTo(it)
@@ -234,7 +234,7 @@ class Launcher private constructor(private val rootDir: File) {
             val name = File(path).name
 
             specialResources[name.toLowerCase(Locale.US)]?.let {
-                grb.appendln("$it $path")
+                grb.appendLine("$it $path")
                 return
             }
             aldRegex.matchEntire(name)?.let {
@@ -246,7 +246,7 @@ class Launcher private constructor(private val rootDir: File) {
                 }
                 val id = it.groupValues[3].toUpperCase(Locale.US)
                 if (type != null) {
-                    grb.appendln("$type$id $path")
+                    grb.appendLine("$type$id $path")
                     basename = it.groupValues[1]
                 }
             }
@@ -261,7 +261,7 @@ class Launcher private constructor(private val rootDir: File) {
 
         fun write(outDir: File) {
             for (id in 'A' .. 'Z') {
-                grb.appendln("Save$id ../save/${basename}s${id.toLowerCase()}.asd")
+                grb.appendLine("Save$id ../save/${basename}s${id.toLowerCase()}.asd")
             }
             val gr = grb.toString()
             Log.i("xsystem35.gr", gr)
diff --git a/android/app/src/main/java/io/github/kichikuou/xsystem35/LauncherActivity.kt b/android/app/src/main/java/io/github/kichikuou/xsystem35/LauncherActivity.kt
index bc787d8..5b00a9a 100644
--- a/android/app/src/main/java/io/github/kichikuou/xsystem35/LauncherActivity.kt
+++ b/android/app/src/main/java/io/github/kichikuou/xsystem35/LauncherActivity.kt
@@ -189,8 +189,11 @@ class LauncherActivity : ListActivity(), AdapterView.OnItemLongClickListener, La
         val cursor = contentResolver.query(uri, null, null, null, null, null)
         cursor?.use {
             if (it.moveToFirst()) {
-                val fname = it.getString(it.getColumnIndex(OpenableColumns.DISPLAY_NAME))
-                return if (fname.endsWith(".zip", true)) fname.dropLast(4) else fname
+                val column = it.getColumnIndex(OpenableColumns.DISPLAY_NAME)
+                if (column >= 0) {
+                    val fname = it.getString(column)
+                    return if (fname.endsWith(".zip", true)) fname.dropLast(4) else fname
+                }
             }
         }
         return null