From 64591ef8db157462de7b94769ff1895d6b82f446 Mon Sep 17 00:00:00 2001
From: Ahmed Atwa <a.atwaa94@gmail.com>
Date: Tue, 2 Jul 2024 04:04:49 +0300
Subject: [PATCH] fix contentProvider security exceptions

---
 .idea/compiler.xml                                     |  2 +-
 .idea/gradle.xml                                       |  4 +---
 .idea/kotlinc.xml                                      |  6 ++++++
 .idea/migrations.xml                                   | 10 ++++++++++
 .idea/misc.xml                                         |  3 +--
 filepicker/build.gradle                                |  2 +-
 filepicker/src/main/AndroidManifest.xml                |  2 +-
 .../com/atwa/filepicker/core/FilePickerProcessor.kt    |  2 +-
 .../main/java/com/atwa/filepicker/core/PickIntent.kt   |  9 ++++++++-
 .../main/java/com/atwa/filepicker/decoder/Decoder.kt   |  2 +-
 .../java/com/atwa/filepicker/decoder/UriDecoder.kt     |  5 ++---
 11 files changed, 33 insertions(+), 14 deletions(-)
 create mode 100644 .idea/kotlinc.xml
 create mode 100644 .idea/migrations.xml

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index fb7f4a8..b589d56 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
+    <bytecodeTargetLevel target="17" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index efdc028..87254e3 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,10 +4,8 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="GRADLE" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="11" />
+        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
new file mode 100644
index 0000000..7e340a7
--- /dev/null
+++ b/.idea/kotlinc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="KotlinJpsPluginSettings">
+    <option name="version" value="1.6.21" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/migrations.xml b/.idea/migrations.xml
new file mode 100644
index 0000000..f8051a6
--- /dev/null
+++ b/.idea/migrations.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectMigrations">
+    <option name="MigrateToGradleLocalJavaHome">
+      <set>
+        <option value="$PROJECT_DIR$" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 02e564c..b38ca0c 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
@@ -7,7 +6,7 @@
       </map>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/filepicker/build.gradle b/filepicker/build.gradle
index f29197d..c5ffee3 100644
--- 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
index 9d15174..7d6496e 100644
--- 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
index 6bfb440..e574e88 100644
--- 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
index 0555570..db503d9 100644
--- 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
index 72acc15..8aa9df7 100644
--- 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
index e45eb5a..fbba055 100644
--- 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
             )
         }