Merge pull request #22 from ChochaNaresh/Dev

- permission bug fixed for android 13
ChochaNaresh · Jun 12, 2023 · 540e5e4 · 540e5e4
2 parents 322f1d2 + 669481b
commit 540e5e4
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 6 deletions.
diff --git a/...ary/src/main/java/com/nareshchocha/filepickerlibrary/ui/activitys/ImageCaptureActivity.kt b/...ary/src/main/java/com/nareshchocha/filepickerlibrary/ui/activitys/ImageCaptureActivity.kt
@@ -80,7 +80,7 @@ internal class ImageCaptureActivity : AppCompatActivity() {
                     .w("File Uri ::: ${imageFileUri?.toString()}")
                 Timber.tag(Const.LogTag.FILE_RESULT).w("filePath ::: ${imageFile?.absoluteFile}")
                 Timber.tag(Const.LogTag.FILE_RESULT).w("file read:: ${imageFile?.canRead()}")
-                setSuccessResult(imageFileUri, imageFile?.absolutePath)
+                setSuccessResult(imageFileUri, imageFile?.absolutePath, true)
             } else {
                 Timber.tag(Const.LogTag.FILE_PICKER_ERROR)
                     .e(getString(R.string.err_capture_error, "imageCapture"))

diff --git a/...ary/src/main/java/com/nareshchocha/filepickerlibrary/ui/activitys/VideoCaptureActivity.kt b/...ary/src/main/java/com/nareshchocha/filepickerlibrary/ui/activitys/VideoCaptureActivity.kt
@@ -80,7 +80,7 @@ internal class VideoCaptureActivity : AppCompatActivity() {
                 Timber.tag(Const.LogTag.FILE_RESULT)
                     .w("File Uri ::: ${videoFileUri?.toString()}")
                 Timber.tag(Const.LogTag.FILE_RESULT).w("filePath ::: ${videoFile?.absoluteFile}")
-                setSuccessResult(videoFileUri, videoFile?.absolutePath)
+                setSuccessResult(videoFileUri, videoFile?.absolutePath, true)
             } else {
                 Timber.tag(Const.LogTag.FILE_PICKER_ERROR)
                     .e(getString(R.string.err_capture_error, "videoCapture"))

diff --git a/...brary/src/main/java/com/nareshchocha/filepickerlibrary/utilities/extentions/Extentions.kt b/...brary/src/main/java/com/nareshchocha/filepickerlibrary/utilities/extentions/Extentions.kt
@@ -130,23 +130,42 @@ internal fun Context.getSettingIntent(): Intent {
     return intent
 }
 
-internal fun Activity.setSuccessResult(fileUri: Uri?, filePath: String? = null) {
+internal fun Activity.setSuccessResult(
+    fileUri: Uri?,
+    filePath: String? = null,
+    isFromCapture: Boolean = false,
+) {
     setResult(
         Activity.RESULT_OK,
         Intent().also { mIntent ->
-            mIntent.flags = Intent.FLAG_GRANT_WRITE_URI_PERMISSION + Intent.FLAG_GRANT_READ_URI_PERMISSION
+            mIntent.flags =
+                if (isFromCapture) {
+                    Intent.FLAG_GRANT_WRITE_URI_PERMISSION + Intent.FLAG_GRANT_READ_URI_PERMISSION
+                } else {
+                    Intent.FLAG_GRANT_READ_URI_PERMISSION
+                }
+
             fileUri?.let { mIntent.data = fileUri }
             filePath?.let { mIntent.putExtra(Const.BundleExtras.FILE_PATH, it) }
         },
     )
     finish()
 }
 
-internal fun Activity.setSuccessResult(fileUri: List<Uri>?, filePath: ArrayList<String>? = null) {
+internal fun Activity.setSuccessResult(
+    fileUri: List<Uri>?,
+    filePath: ArrayList<String>? = null,
+    isFromCapture: Boolean = false,
+) {
     setResult(
         Activity.RESULT_OK,
         Intent().also { mIntent ->
-            mIntent.flags = Intent.FLAG_GRANT_WRITE_URI_PERMISSION + Intent.FLAG_GRANT_READ_URI_PERMISSION
+            mIntent.flags =
+                if (isFromCapture) {
+                    Intent.FLAG_GRANT_WRITE_URI_PERMISSION + Intent.FLAG_GRANT_READ_URI_PERMISSION
+                } else {
+                    Intent.FLAG_GRANT_READ_URI_PERMISSION
+                }
             if (!fileUri.isNullOrEmpty()) {
                 val mClipData = ClipData.newUri(contentResolver, "uris", fileUri.first())
                 fileUri.subList(1, fileUri.size).forEach {