Fix PR comments

tchapgouv · Apr 10, 2024 · efdec04 · efdec04
1 parent 8341f46
commit efdec04
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 22 deletions.
diff --git a/library/multipicker/src/main/java/im/vector/lib/multipicker/AudioPicker.kt b/library/multipicker/src/main/java/im/vector/lib/multipicker/AudioPicker.kt
@@ -31,9 +31,8 @@ class AudioPicker : Picker<MultiPickerAudioType>() {
      * Returns selected audio files or empty list if user did not select any files.
      */
     override fun getSelectedFiles(context: Context, data: Intent?): List<MultiPickerAudioType> {
-        return getSelectedUriList(data).mapNotNull { selectedUri ->
-            // Tchap: Grant permission to access the selected file.
-            context.grantUriPermission(context.applicationContext.packageName, selectedUri, Intent.FLAG_GRANT_READ_URI_PERMISSION)
+        // Tchap: Grant permission to access the selected file.
+        return getSelectedUriList(context, data).mapNotNull { selectedUri ->
             selectedUri.toMultiPickerAudioType(context)
         }
     }

diff --git a/library/multipicker/src/main/java/im/vector/lib/multipicker/ContactPicker.kt b/library/multipicker/src/main/java/im/vector/lib/multipicker/ContactPicker.kt
@@ -40,9 +40,6 @@ class ContactPicker : Picker<MultiPickerContactType>() {
         val contactList = mutableListOf<MultiPickerContactType>()
 
         data?.data?.let { selectedUri ->
-            // Tchap: Grant permission to access the selected URI.
-            context.grantUriPermission(context.applicationContext.packageName, selectedUri, Intent.FLAG_GRANT_READ_URI_PERMISSION)
-
             val projection = arrayOf(
                     ContactsContract.Contacts.DISPLAY_NAME,
                     ContactsContract.Contacts.PHOTO_URI,

diff --git a/library/multipicker/src/main/java/im/vector/lib/multipicker/FilePicker.kt b/library/multipicker/src/main/java/im/vector/lib/multipicker/FilePicker.kt
@@ -41,10 +41,8 @@ class FilePicker : Picker<MultiPickerBaseType>() {
      * Returns selected files or empty list if user did not select any files.
      */
     override fun getSelectedFiles(context: Context, data: Intent?): List<MultiPickerBaseType> {
-        return getSelectedUriList(data).mapNotNull { selectedUri ->
-            // Tchap: Grant permission to access the selected file.
-            context.grantUriPermission(context.applicationContext.packageName, selectedUri, Intent.FLAG_GRANT_READ_URI_PERMISSION)
-
+        // Tchap: Grant permission to access the selected file.
+        return getSelectedUriList(context, data).mapNotNull { selectedUri ->
             val type = context.contentResolver.getType(selectedUri)
 
             when {

diff --git a/library/multipicker/src/main/java/im/vector/lib/multipicker/ImagePicker.kt b/library/multipicker/src/main/java/im/vector/lib/multipicker/ImagePicker.kt
@@ -31,9 +31,8 @@ class ImagePicker : Picker<MultiPickerImageType>() {
      * Returns selected image files or empty list if user did not select any files.
      */
     override fun getSelectedFiles(context: Context, data: Intent?): List<MultiPickerImageType> {
-        return getSelectedUriList(data).mapNotNull { selectedUri ->
-            // Tchap: Grant permission to access the selected file.
-            context.grantUriPermission(context.applicationContext.packageName, selectedUri, Intent.FLAG_GRANT_READ_URI_PERMISSION)
+        // Tchap: Grant permission to access the selected file.
+        return getSelectedUriList(context, data).mapNotNull { selectedUri ->
             selectedUri.toMultiPickerImageType(context)
         }
     }

diff --git a/library/multipicker/src/main/java/im/vector/lib/multipicker/MediaPicker.kt b/library/multipicker/src/main/java/im/vector/lib/multipicker/MediaPicker.kt
@@ -33,10 +33,8 @@ class MediaPicker : Picker<MultiPickerBaseMediaType>() {
      * Returns selected image/video files or empty list if user did not select any files.
      */
     override fun getSelectedFiles(context: Context, data: Intent?): List<MultiPickerBaseMediaType> {
-        return getSelectedUriList(data).mapNotNull { selectedUri ->
-            // Tchap: Grant permission to access the selected file.
-            context.grantUriPermission(context.applicationContext.packageName, selectedUri, Intent.FLAG_GRANT_READ_URI_PERMISSION)
-
+        // Tchap: Grant permission to access the selected file.
+        return getSelectedUriList(context, data).mapNotNull { selectedUri ->
             val mimeType = context.contentResolver.getType(selectedUri)
 
             if (mimeType.isMimeTypeVideo()) {

diff --git a/library/multipicker/src/main/java/im/vector/lib/multipicker/Picker.kt b/library/multipicker/src/main/java/im/vector/lib/multipicker/Picker.kt
@@ -91,7 +91,7 @@ abstract class Picker<T> {
         activityResultLauncher.launch(createIntent().apply { addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION) })
     }
 
-    protected fun getSelectedUriList(data: Intent?): List<Uri> {
+    protected fun getSelectedUriList(context: Context, data: Intent?): List<Uri> {
         val selectedUriList = mutableListOf<Uri>()
         val dataUri = data?.data
         val clipData = data?.clipData
@@ -113,6 +113,7 @@ abstract class Picker<T> {
                 }
             }
         }
-        return selectedUriList
+        // Tchap: Grant permission to access the selected file.
+        return selectedUriList.onEach { context.grantUriPermission(context.applicationContext.packageName, it, Intent.FLAG_GRANT_READ_URI_PERMISSION) }
     }
 }
diff --git a/library/multipicker/src/main/java/im/vector/lib/multipicker/VideoPicker.kt b/library/multipicker/src/main/java/im/vector/lib/multipicker/VideoPicker.kt
@@ -31,9 +31,8 @@ class VideoPicker : Picker<MultiPickerVideoType>() {
      * Returns selected video files or empty list if user did not select any files.
      */
     override fun getSelectedFiles(context: Context, data: Intent?): List<MultiPickerVideoType> {
-        return getSelectedUriList(data).mapNotNull { selectedUri ->
-            // Tchap: Grant permission to access the selected file.
-            context.grantUriPermission(context.applicationContext.packageName, selectedUri, Intent.FLAG_GRANT_READ_URI_PERMISSION)
+        // Tchap: Grant permission to access the selected file.
+        return getSelectedUriList(context, data).mapNotNull { selectedUri ->
             selectedUri.toMultiPickerVideoType(context)
         }
     }