Bugfix: File Not Found Exception (#88) (#89)

* Get file extension from mimeTypeMap
* Use single file if there is just one file within the list (gallery provider)
* Updated dependencies versions
* Release 2.3.21

Co-authored-by: Hossein Abbasi <[email protected]>

Author: Catlandor

imagepicker/src/androidTest/java/com/github/drjacky/imagepicker/FileUriUtilsTests.kt

@@ -0,0 +1,20 @@
+package com.github.drjacky.imagepicker
+
+import android.net.Uri
+import androidx.test.platform.app.InstrumentationRegistry
+import com.github.drjacky.imagepicker.util.FileUriUtils
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+class FileUriUtilsTests {
+    @Test
+    fun getImageExtension_AndroidPhotoPickerPath_returnsJpg() {
+        val uri =
+            Uri.parse("content://media/picker/0/com.android.providers.media.photopicker/media/1000000033")
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+
+        val extension = FileUriUtils.getImageExtension(appContext, uri)
+
+        assertEquals(".jpg", extension)
+    }
+}

imagepicker/src/main/kotlin/com/github/drjacky/imagepicker/ImagePickerActivity.kt

@@ -6,6 +6,7 @@ import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
 import android.util.Log
+import androidx.activity.addCallback
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import com.github.drjacky.imagepicker.constant.ImageProvider
@@ -72,6 +73,11 @@ class ImagePickerActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         restoreInstanceState(savedInstanceState)
         loadBundle(savedInstanceState)
+
+        onBackPressedDispatcher.addCallback(this) {
+            // Back is pressed... Finishing the activity
+            setResultCancel()
+        }
     }
 
     /**
@@ -146,13 +152,6 @@ class ImagePickerActivity : AppCompatActivity() {
         mGalleryProvider?.onRequestPermissionsResult(requestCode)
     }
 
-    /**
-     * Handle Activity Back Press
-     */
-    override fun onBackPressed() {
-        setResultCancel()
-    }
-
     /**
      * {@link CameraProvider} and {@link GalleryProvider} Result will be available here.
      *

imagepicker/src/main/kotlin/com/github/drjacky/imagepicker/provider/GalleryProvider.kt

@@ -168,7 +168,16 @@ class GalleryProvider(
                 fileList!!.add(uri)
             }
             activity.selectedNumberOfImages = fileList!!.size
-            activity.setMultipleImage(fileList!!)
+
+            try {
+                if (activity.selectedNumberOfImages == 1) {
+                    activity.setImage(fileList!!.single(), isCamera = false)
+                } else {
+                    activity.setMultipleImage(fileList!!)
+                }
+            } catch (ex: IOException) {
+                setError(R.string.error_failed_pick_gallery_image)
+            }
         } ?: run {
             val uri = data?.data
             if (uri != null) {