From 65ec62c117211b3be69e58dd652fa79383ae3840 Mon Sep 17 00:00:00 2001
From: Thibault Deckers <thibault.deckers@gmail.com>
Date: Tue, 17 May 2022 10:19:56 +0900
Subject: [PATCH] fixed crash from IllegalStateException on mkdir

---
 .../thibault/aves/utils/StorageUtils.kt       | 47 +++++++++----------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/utils/StorageUtils.kt b/android/app/src/main/kotlin/deckers/thibault/aves/utils/StorageUtils.kt
index 9e5b51ced..8a0e3d2a0 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/utils/StorageUtils.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/utils/StorageUtils.kt
@@ -21,7 +21,6 @@ import deckers.thibault.aves.utils.MimeTypes.isVideo
 import deckers.thibault.aves.utils.PermissionManager.getGrantedDirForPath
 import deckers.thibault.aves.utils.UriUtils.tryParseId
 import java.io.File
-import java.io.FileNotFoundException
 import java.io.InputStream
 import java.io.OutputStream
 import java.util.*
@@ -404,37 +403,37 @@ object StorageUtils {
     // returns the directory `DocumentFile` (from tree URI when scoped storage is required, `File` otherwise)
     // returns null if directory does not exist and could not be created
     fun createDirectoryDocIfAbsent(context: Context, dirPath: String): DocumentFileCompat? {
-        val cleanDirPath = ensureTrailingSeparator(dirPath)
-        return if (requireAccessPermission(context, cleanDirPath) && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            val grantedDir = getGrantedDirForPath(context, cleanDirPath) ?: return null
-            val rootTreeDocumentUri = convertDirPathToTreeDocumentUri(context, grantedDir) ?: return null
-            var parentFile: DocumentFileCompat? = DocumentFileCompat.fromTreeUri(context, rootTreeDocumentUri) ?: return null
-            val pathIterator = getPathStepIterator(context, cleanDirPath, grantedDir)
-            while (pathIterator?.hasNext() == true) {
-                val dirName = pathIterator.next()
-                var dirFile = findDocumentFileIgnoreCase(parentFile, dirName)
-                if (dirFile == null || !dirFile.exists()) {
-                    try {
+        try {
+            val cleanDirPath = ensureTrailingSeparator(dirPath)
+            return if (requireAccessPermission(context, cleanDirPath) && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                val grantedDir = getGrantedDirForPath(context, cleanDirPath) ?: return null
+                val rootTreeDocumentUri = convertDirPathToTreeDocumentUri(context, grantedDir) ?: return null
+                var parentFile: DocumentFileCompat? = DocumentFileCompat.fromTreeUri(context, rootTreeDocumentUri) ?: return null
+                val pathIterator = getPathStepIterator(context, cleanDirPath, grantedDir)
+                while (pathIterator?.hasNext() == true) {
+                    val dirName = pathIterator.next()
+                    var dirFile = findDocumentFileIgnoreCase(parentFile, dirName)
+                    if (dirFile == null || !dirFile.exists()) {
                         dirFile = parentFile?.createDirectory(dirName)
                         if (dirFile == null) {
                             Log.e(LOG_TAG, "failed to create directory with name=$dirName from parent=$parentFile")
                             return null
                         }
-                    } catch (e: FileNotFoundException) {
-                        Log.e(LOG_TAG, "failed to create directory with name=$dirName from parent=$parentFile", e)
-                        return null
                     }
+                    parentFile = dirFile
                 }
-                parentFile = dirFile
+                parentFile
+            } else {
+                val directory = File(cleanDirPath)
+                if (!directory.exists() && !directory.mkdirs()) {
+                    Log.e(LOG_TAG, "failed to create directories at path=$cleanDirPath")
+                    return null
+                }
+                DocumentFileCompat.fromFile(directory)
             }
-            parentFile
-        } else {
-            val directory = File(cleanDirPath)
-            if (!directory.exists() && !directory.mkdirs()) {
-                Log.e(LOG_TAG, "failed to create directories at path=$cleanDirPath")
-                return null
-            }
-            DocumentFileCompat.fromFile(directory)
+        } catch (e: Exception) {
+            Log.e(LOG_TAG, "failed to create directory at path=$dirPath", e)
+            return null
         }
     }