Improved determining of file type

Waboodoo · Jan 4, 2023 · 448826d · 448826d
1 parent c750c81
commit 448826d
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/HTTPShortcuts/app/build.gradle.kts b/HTTPShortcuts/app/build.gradle.kts
@@ -45,7 +45,7 @@ android {
         // Version name and code must remain as literals so that F-Droid can read them
         versionName = "2.28.0"
         // 11,(2 digits major),(2 digits minor),(2 digits patch),(2 digits build)
-        versionCode = 1102280000
+        versionCode = 1102280001
 
         buildConfigField("String", "BUGSNAG_API_KEY", "\"$bugsnagAPIKey\"")
         buildConfigField("String", "BUILD_TIMESTAMP", "\"${rootProject.ext["buildTimestamp"]}\"")

diff --git a/...app/src/main/kotlin/ch/rmy/android/http_shortcuts/activities/misc/share/ShareViewModel.kt b/...app/src/main/kotlin/ch/rmy/android/http_shortcuts/activities/misc/share/ShareViewModel.kt
@@ -267,6 +267,10 @@ class ShareViewModel(application: Application) : BaseViewModel<ShareViewModel.In
                                         ?.let { fileName ->
                                             FileUtil.putCacheFileOriginalName(file, fileName)
                                         }
+                                    context.contentResolver.getType(fileUri)
+                                        ?.let { fileType ->
+                                            FileUtil.putCacheFileOriginalType(file, fileType)
+                                        }
                                     stream.copyTo(context.contentResolver.openOutputStream(file)!!)
                                 }
                         }

diff --git a/HTTPShortcuts/app/src/main/kotlin/ch/rmy/android/http_shortcuts/http/FileUploadManager.kt b/HTTPShortcuts/app/src/main/kotlin/ch/rmy/android/http_shortcuts/http/FileUploadManager.kt
@@ -58,8 +58,13 @@ class FileUploadManager internal constructor(
         registerFiles(fileUris.map(::uriToFile))
     }
 
-    private fun getType(file: Uri): String =
-        contentResolver.getType(file) ?: FALLBACK_TYPE
+    private fun getType(file: Uri): String {
+        val cachedFileType = FileUtil.getCacheFileOriginalType(file)
+        if (cachedFileType != null && cachedFileType != FALLBACK_TYPE) {
+            return cachedFileType
+        }
+        return contentResolver.getType(file) ?: FALLBACK_TYPE
+    }
 
     private fun uriToFile(uri: Uri): File =
         getType(uri).let { type ->

diff --git a/HTTPShortcuts/framework/src/main/kotlin/ch/rmy/android/framework/utils/FileUtil.kt b/HTTPShortcuts/framework/src/main/kotlin/ch/rmy/android/framework/utils/FileUtil.kt
@@ -17,6 +17,7 @@ import kotlin.time.Duration
 object FileUtil {
 
     private val cacheFileNames: MutableMap<Uri, String> = ConcurrentHashMap()
+    private val cacheFileTypes: MutableMap<Uri, String> = ConcurrentHashMap()
 
     fun createCacheFile(context: Context, file: String, deleteIfExists: Boolean = false): Uri =
         getUriFromFile(
@@ -83,4 +84,11 @@ object FileUtil {
     fun putCacheFileOriginalName(cacheFileUri: Uri, name: String) {
         cacheFileNames[cacheFileUri] = name
     }
+
+    fun getCacheFileOriginalType(cacheFileUri: Uri): String? =
+        cacheFileTypes[cacheFileUri]
+
+    fun putCacheFileOriginalType(cacheFileUri: Uri, name: String) {
+        cacheFileTypes[cacheFileUri] = name
+    }
 }