fix contentProvider security exceptions

Atwa · Jul 2, 2024 · 64591ef · 64591ef
1 parent afef2dc
commit 64591ef
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 14 deletions.
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/.idea/migrations.xml b/.idea/migrations.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/filepicker/build.gradle b/filepicker/build.gradle
@@ -46,7 +46,7 @@ afterEvaluate {
 
                 groupId = 'com.github.atwa'
                 artifactId = 'filepicker'
-                version = '1.0.9'
+                version = '1.0.10'
             }
         }
         repositories {

diff --git a/filepicker/src/main/AndroidManifest.xml b/filepicker/src/main/AndroidManifest.xml
@@ -8,7 +8,7 @@
 
         <provider
             android:name="androidx.core.content.FileProvider"
-            android:authorities="com.atwa.filepicker.provider"
+            android:authorities="${applicationId}.provider"
             android:exported="false"
             android:grantUriPermissions="true">
             <meta-data

diff --git a/filepicker/src/main/java/com/atwa/filepicker/core/FilePickerProcessor.kt b/filepicker/src/main/java/com/atwa/filepicker/core/FilePickerProcessor.kt
@@ -42,7 +42,7 @@ class FilePickerProcessor(private val configuration: PickerConfiguration) : File
 
     override fun captureCameraImage(onImagePicked: (ImageMeta?) -> Unit) {
         with(configuration) {
-            val photoURI = decoder.createFile()
+            val photoURI = decoder.generateURI()
             captureIntent.apply { putExtra(MediaStore.EXTRA_OUTPUT, photoURI) }.onPick {
                 decoder.getCameraImage(photoURI, onImagePicked)
             }

diff --git a/filepicker/src/main/java/com/atwa/filepicker/core/PickIntent.kt b/filepicker/src/main/java/com/atwa/filepicker/core/PickIntent.kt
@@ -12,7 +12,14 @@ object PickIntent {
         )
     }
 
-    internal val captureIntent by lazy { Intent(MediaStore.ACTION_IMAGE_CAPTURE) }
+    internal val captureIntent
+        get() =
+            Intent(MediaStore.ACTION_IMAGE_CAPTURE).apply {
+                addFlags(
+                    Intent.FLAG_GRANT_READ_URI_PERMISSION and
+                            Intent.FLAG_GRANT_WRITE_URI_PERMISSION
+                )
+            }
 
     internal val pdfIntent by lazy {
         Intent(Intent.ACTION_GET_CONTENT).apply {

diff --git a/filepicker/src/main/java/com/atwa/filepicker/decoder/Decoder.kt b/filepicker/src/main/java/com/atwa/filepicker/decoder/Decoder.kt
@@ -6,7 +6,7 @@ import com.atwa.filepicker.result.ImageMeta
 import com.atwa.filepicker.result.VideoMeta
 
 interface Decoder {
-    fun createFile(): Uri?
+    fun generateURI(): Uri?
     fun getStorageImage(imageUri: Uri?, onImagePicked: (ImageMeta?) -> Unit)
     fun getStoragePDF(pdfUri: Uri?, onPdfPicked: (FileMeta?) -> Unit)
     fun getStorageFile(fileUri: Uri?, onFilePicked: (FileMeta?) -> Unit)

diff --git a/filepicker/src/main/java/com/atwa/filepicker/decoder/UriDecoder.kt b/filepicker/src/main/java/com/atwa/filepicker/decoder/UriDecoder.kt
@@ -10,7 +10,6 @@ import android.os.ParcelFileDescriptor
 import android.provider.MediaStore
 import android.provider.OpenableColumns
 import androidx.core.content.FileProvider
-import com.atwa.filepicker.BuildConfig
 import com.atwa.filepicker.core.Executors
 import com.atwa.filepicker.result.FileMeta
 import com.atwa.filepicker.result.ImageMeta
@@ -31,13 +30,13 @@ internal class UriDecoder(
 
     private val contentResolver by lazy { context?.contentResolver }
 
-    override fun createFile(): Uri? = try {
+    override fun generateURI(): Uri? = try {
         context?.let {
             val timeStamp = TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis()).toString()
             val file = File.createTempFile(timeStamp, ".jpg", context.cacheDir)
             FileProvider.getUriForFile(
                 it,
-                "${BuildConfig.LIBRARY_PACKAGE_NAME}.provider",
+                "${context.packageName}.provider",
                 file
             )
         }