From 9a548ff388d9b3cd803b42166d1d403a236580cc Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Fri, 29 Jan 2021 11:04:15 +0100
Subject: [PATCH] Allow to pick multiple files in chat message picker

---
 .../chat/fragments/DetailChatRoomFragment.kt  | 12 +--
 .../fragments/ContactEditorFragment.kt        |  2 +-
 .../sidemenu/fragments/SideMenuFragment.kt    |  2 +-
 .../java/org/linphone/utils/ImageUtils.kt     | 85 +++++++++++++++----
 4 files changed, 76 insertions(+), 25 deletions(-)

diff --git a/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt b/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt
index 1855c8d21..9c5270f62 100644
--- a/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt
@@ -338,12 +338,10 @@ class DetailChatRoomFragment : MasterFragment<ChatRoomDetailFragmentBinding, Cha
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         if (resultCode == Activity.RESULT_OK) {
             lifecycleScope.launch {
-                val fileToUploadPath = ImageUtils.getImageFilePathFromPickerIntent(
-                    data,
-                    chatSendingViewModel.temporaryFileUploadPath
-                )
-                if (fileToUploadPath != null) {
-                    chatSendingViewModel.addAttachment(fileToUploadPath)
+                for (fileToUploadPath in ImageUtils.getFilesPathFromPickerIntent(data, chatSendingViewModel.temporaryFileUploadPath)) {
+                    if (fileToUploadPath != null) {
+                        chatSendingViewModel.addAttachment(fileToUploadPath)
+                    }
                 }
             }
         }
@@ -481,6 +479,7 @@ class DetailChatRoomFragment : MasterFragment<ChatRoomDetailFragmentBinding, Cha
         val galleryIntent = Intent(Intent.ACTION_PICK)
         galleryIntent.type = "*/*"
         galleryIntent.putExtra(Intent.EXTRA_MIME_TYPES, arrayOf("image/*", "video/*"))
+        galleryIntent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true)
 
         if (PermissionHelper.get().hasCameraPermission()) {
             // Allows to capture directly from the camera
@@ -497,6 +496,7 @@ class DetailChatRoomFragment : MasterFragment<ChatRoomDetailFragmentBinding, Cha
             // Finally allow any kind of file
             val fileIntent = Intent(Intent.ACTION_GET_CONTENT)
             fileIntent.type = "*/*"
+            fileIntent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true)
             cameraIntents.add(fileIntent)
         }
 
diff --git a/app/src/main/java/org/linphone/activities/main/contact/fragments/ContactEditorFragment.kt b/app/src/main/java/org/linphone/activities/main/contact/fragments/ContactEditorFragment.kt
index 19426b14d..63f3fb0ed 100644
--- a/app/src/main/java/org/linphone/activities/main/contact/fragments/ContactEditorFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/contact/fragments/ContactEditorFragment.kt
@@ -132,7 +132,7 @@ class ContactEditorFragment : GenericFragment<ContactEditorFragmentBinding>(), S
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         if (resultCode == Activity.RESULT_OK) {
             lifecycleScope.launch {
-                val contactImageFilePath = ImageUtils.getImageFilePathFromPickerIntent(data, temporaryPicturePath)
+                val contactImageFilePath = ImageUtils.getFilePathFromPickerIntent(data, temporaryPicturePath)
                 if (contactImageFilePath != null) {
                     viewModel.setPictureFromPath(contactImageFilePath)
                 }
diff --git a/app/src/main/java/org/linphone/activities/main/sidemenu/fragments/SideMenuFragment.kt b/app/src/main/java/org/linphone/activities/main/sidemenu/fragments/SideMenuFragment.kt
index ab5030750..39e14b925 100644
--- a/app/src/main/java/org/linphone/activities/main/sidemenu/fragments/SideMenuFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/sidemenu/fragments/SideMenuFragment.kt
@@ -120,7 +120,7 @@ class SideMenuFragment : GenericFragment<SideMenuFragmentBinding>() {
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         if (resultCode == Activity.RESULT_OK) {
             lifecycleScope.launch {
-                val contactImageFilePath = ImageUtils.getImageFilePathFromPickerIntent(data, temporaryPicturePath)
+                val contactImageFilePath = ImageUtils.getFilePathFromPickerIntent(data, temporaryPicturePath)
                 if (contactImageFilePath != null) {
                     viewModel.setPictureFromPath(contactImageFilePath)
                 }
diff --git a/app/src/main/java/org/linphone/utils/ImageUtils.kt b/app/src/main/java/org/linphone/utils/ImageUtils.kt
index cc1e43238..607da2843 100644
--- a/app/src/main/java/org/linphone/utils/ImageUtils.kt
+++ b/app/src/main/java/org/linphone/utils/ImageUtils.kt
@@ -71,17 +71,64 @@ class ImageUtils {
             return ThumbnailUtils.createVideoThumbnail(path, MediaStore.Images.Thumbnails.MINI_KIND)
         }
 
-        suspend fun getImageFilePathFromPickerIntent(data: Intent?, temporaryImageFilePath: File?): String? {
+        suspend fun getFilesPathFromPickerIntent(data: Intent?, temporaryImageFilePath: File?): List<String> {
             var imageFilePath: String? = null
             if (temporaryImageFilePath != null) {
                 if (data != null) {
-                    val dataUri = data.data
-                    if (dataUri != null) {
-                        imageFilePath = dataUri.toString()
-                        Log.i("[Image Utils] Using data URI $imageFilePath")
-                    } else if (temporaryImageFilePath.exists()) {
-                        imageFilePath = temporaryImageFilePath.absolutePath
-                        Log.i("[Image Utils] Data URI is null, using $imageFilePath")
+                    val clipData = data.clipData
+                    if (clipData != null) { // Multiple selection
+                        Log.i("[Image Utils] Found ${clipData.itemCount} elements")
+                        val list = arrayListOf<String>()
+                        for (i in 0 until clipData.itemCount) {
+                            val dataUri = clipData.getItemAt(i).uri
+                            if (dataUri != null) {
+                                imageFilePath = dataUri.toString()
+                                Log.i("[Image Utils] Using data URI $imageFilePath")
+                            }
+                            imageFilePath = cleanFilePath(imageFilePath)
+                            if (imageFilePath != null) list.add(imageFilePath)
+                        }
+                        return list
+                    } else { // Single selection
+                        val dataUri = data.data
+                        if (dataUri != null) {
+                            imageFilePath = dataUri.toString()
+                            Log.i("[Image Utils] Using data URI $imageFilePath")
+                        } else if (temporaryImageFilePath.exists()) {
+                            imageFilePath = temporaryImageFilePath.absolutePath
+                            Log.i("[Image Utils] Data URI is null, using $imageFilePath")
+                        }
+                        imageFilePath = cleanFilePath(imageFilePath)
+                        if (imageFilePath != null) return arrayListOf(imageFilePath)
+                    }
+                } else if (temporaryImageFilePath.exists()) {
+                    imageFilePath = temporaryImageFilePath.absolutePath
+                    Log.i("[Image Utils] Data is null, using $imageFilePath")
+                    imageFilePath = cleanFilePath(imageFilePath)
+                    if (imageFilePath != null) return arrayListOf(imageFilePath)
+                }
+            }
+            return arrayListOf()
+        }
+
+        suspend fun getFilePathFromPickerIntent(data: Intent?, temporaryImageFilePath: File?): String? {
+            var imageFilePath: String? = null
+            if (temporaryImageFilePath != null) {
+                if (data != null) {
+                    val clipData = data.clipData
+                    if (clipData != null) { // Multiple selection
+                        for (i in 0 until clipData.itemCount) {
+                            val uri = clipData.getItemAt(i).uri
+                        }
+                    } else { // Single selection
+                        val dataUri = data.data
+                        if (dataUri != null) {
+                            imageFilePath = dataUri.toString()
+                            Log.i("[Image Utils] Using data URI $imageFilePath")
+                        } else if (temporaryImageFilePath.exists()) {
+                            imageFilePath = temporaryImageFilePath.absolutePath
+                            Log.i("[Image Utils] Data URI is null, using $imageFilePath")
+                        }
                     }
                 } else if (temporaryImageFilePath.exists()) {
                     imageFilePath = temporaryImageFilePath.absolutePath
@@ -89,20 +136,24 @@ class ImageUtils {
                 }
             }
 
-            if (imageFilePath != null) {
-                if (imageFilePath.startsWith("content://") ||
-                    imageFilePath.startsWith("file://")
+            return cleanFilePath(imageFilePath)
+        }
+
+        private suspend fun cleanFilePath(filePath: String?): String? {
+            if (filePath != null) {
+                if (filePath.startsWith("content://") ||
+                    filePath.startsWith("file://")
                 ) {
-                    val uriToParse = Uri.parse(imageFilePath)
-                    imageFilePath = FileUtils.getFilePath(coreContext.context, uriToParse)
-                    Log.i("[Image Utils] Path was using a content or file scheme, real path is: $imageFilePath")
-                    if (imageFilePath == null) {
+                    val uriToParse = Uri.parse(filePath)
+                    val result = FileUtils.getFilePath(coreContext.context, uriToParse)
+                    Log.i("[Image Utils] Path was using a content or file scheme, real path is: $filePath")
+                    if (result == null) {
                         Log.e("[Image Utils] Failed to get access to file $uriToParse")
                     }
+                    return result
                 }
             }
-
-            return imageFilePath
+            return filePath
         }
 
         private fun getRoundBitmap(bitmap: Bitmap): Bitmap? {