Fix parsing paths containing # in FileUriMapper. (#1466)

* Fix parsing paths containing # in FileUriMapper. * Rename test.
coil-kt · Sep 19, 2022 · 822b5c1 · 822b5c1
1 parent a234e81
commit 822b5c1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/coil-base/src/androidTest/java/coil/map/FileUriMapperTest.kt b/coil-base/src/androidTest/java/coil/map/FileUriMapperTest.kt
@@ -46,4 +46,11 @@ class FileUriMapperTest {
         val uri = "generic_string".toUri()
         assertNull(mapper.map(uri, Options(context)))
     }
+
+    @Test
+    fun parsesPoundCharacterCorrectly() {
+        val path = "/sdcard/fi#le.jpg"
+        assertEquals(File(path), mapper.map(path.toUri(), Options(context)))
+        assertEquals(File(path), mapper.map("file://$path".toUri(), Options(context)))
+    }
 }
diff --git a/coil-base/src/main/java/coil/map/FileUriMapper.kt b/coil-base/src/main/java/coil/map/FileUriMapper.kt
@@ -11,7 +11,8 @@ internal class FileUriMapper : Mapper<Uri, File> {
 
     override fun map(data: Uri, options: Options): File? {
         if (!isApplicable(data)) return null
-        return File(data.path!!)
+        val uri = if (data.scheme == null) data else data.buildUpon().scheme(null).build()
+        return File(uri.toString())
     }
 
     private fun isApplicable(data: Uri): Boolean {