fix crash when no thumbnail

aliernfrog · Sep 14, 2024 · aa903b8 · aa903b8
1 parent 58c6cf5
commit aa903b8
Showing 1 changed file with 13 additions and 10 deletions.
diff --git a/app/src/main/java/com/aliernfrog/pftool/impl/MapFile.kt b/app/src/main/java/com/aliernfrog/pftool/impl/MapFile.kt
@@ -120,14 +120,17 @@ class MapFile(
                 is DocumentFileCompat -> if (file.isDirectory()) file.findFile(thumbnailFileName)?.uri?.toString() else null
                 is ServiceFile -> if (!file.isFile) {
                     if (cachedThumbnailModel != null) return cachedThumbnailModel
-                    val fd = shizukuViewModel.fileService!!.getFd("$path/$thumbnailFileName")
-                    val input = ParcelFileDescriptor.AutoCloseInputStream(fd)
-                    val output = ByteArrayOutputStream()
-                    input.copyTo(output)
-                    cachedThumbnailModel = output.toByteArray()
-                    output.close()
-                    input.close()
-                    fd.close()
+                    val thumbnailPath = "$path/$thumbnailFileName"
+                    if (shizukuViewModel.fileService!!.exists(thumbnailPath)) {
+                        val fd = shizukuViewModel.fileService!!.getFd("$path/$thumbnailFileName")
+                        val input = ParcelFileDescriptor.AutoCloseInputStream(fd)
+                        val output = ByteArrayOutputStream()
+                        input.copyTo(output)
+                        cachedThumbnailModel = output.toByteArray()
+                        output.close()
+                        input.close()
+                        fd.close()
+                    }
                     return cachedThumbnailModel
                 } else null
                 else -> null
@@ -351,9 +354,9 @@ class MapFile(
      */
     fun getThumbnailFile(): Any? {
         return when (file) {
-            is File -> File("${file.absolutePath}/$thumbnailFileName")
+            is File -> File("$path/$thumbnailFileName")
             is DocumentFileCompat -> file.findFile(thumbnailFileName)
-            is ServiceFile -> shizukuViewModel.fileService!!.getFile("${file.path}/$thumbnailFileName")
+            is ServiceFile -> shizukuViewModel.fileService!!.getFile("$path/$thumbnailFileName")
             else -> throw IllegalArgumentException("MapFile/getThumbnailFile: unexpected class")
         }
     }