Fix issue #92

anggrayudi · Jul 15, 2022 · 193adb5 · 193adb5
1 parent 710dc65
commit 193adb5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/storage/src/main/java/com/anggrayudi/storage/file/DocumentFileExt.kt b/storage/src/main/java/com/anggrayudi/storage/file/DocumentFileExt.kt
@@ -357,7 +357,7 @@ fun DocumentFile.getBasePath(context: Context): String {
         isRawFile -> File(path).getBasePath(context)
 
         isDocumentsDocument -> {
-            "Documents/${path.substringAfterLast("/document/home:", "")}".trimEnd('/')
+            "${Environment.DIRECTORY_DOCUMENTS}/${path.substringAfterLast("/document/home:", "")}".trimEnd('/')
         }
 
         isExternalStorageDocument && path.contains("/document/$storageID:") -> {

diff --git a/storage/src/main/java/com/anggrayudi/storage/file/MimeType.kt b/storage/src/main/java/com/anggrayudi/storage/file/MimeType.kt
@@ -82,7 +82,7 @@ object MimeType {
      */
     @JvmStatic
     fun getMimeTypeFromExtension(fileExtension: String): String {
-        return if (fileExtension == "bin") BINARY_FILE else MimeTypeMap.getSingleton().getMimeTypeFromExtension(fileExtension) ?: UNKNOWN
+        return if (fileExtension.equals("bin", ignoreCase = true)) BINARY_FILE else MimeTypeMap.getSingleton().getMimeTypeFromExtension(fileExtension) ?: UNKNOWN
     }
 
     @JvmStatic

diff --git a/storage/src/main/java/com/anggrayudi/storage/media/FileDescription.kt b/storage/src/main/java/com/anggrayudi/storage/media/FileDescription.kt
@@ -13,7 +13,14 @@ class FileDescription @JvmOverloads constructor(
     private var _mimeType: String? = MimeType.BINARY_FILE
 
     val mimeType: String
-        get() = _mimeType ?: MimeType.getMimeTypeFromFileName(name)
+        get() {
+            var type = _mimeType
+            if (type.isNullOrEmpty() || MimeType.hasExtension(name) && (type == MimeType.BINARY_FILE || type == MimeType.UNKNOWN)) {
+                type = MimeType.getMimeTypeFromFileName(name)
+            }
+            _mimeType = type
+            return type
+        }
 
     constructor(name: String, subFolder: String, mimeType: String?) : this(name, subFolder) {
         _mimeType = mimeType?.takeIf { !it.contains("*") }