From e8970ab7f2866cbba0fa9da93d9f2748b010c805 Mon Sep 17 00:00:00 2001
From: Tanmay Gupta <119003089+savsch@users.noreply.github.com>
Date: Sun, 15 Dec 2024 17:51:30 +0530
Subject: [PATCH] FilePicker: Fix error when multiple images are returned from
 Documents based picker (#6033)

* FilePicker: Correctly handle Documents result

* Empty commit to re-trigger CI checks
---
 .../fr/free/nrw/commons/filepicker/FilePicker.kt    | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/filepicker/FilePicker.kt b/app/src/main/java/fr/free/nrw/commons/filepicker/FilePicker.kt
index 6bf8a1061..2ed573740 100644
--- a/app/src/main/java/fr/free/nrw/commons/filepicker/FilePicker.kt
+++ b/app/src/main/java/fr/free/nrw/commons/filepicker/FilePicker.kt
@@ -263,17 +263,8 @@ object FilePicker : Constants {
     ) {
         if (result.resultCode == Activity.RESULT_OK && !isPhoto(result.data)) {
             try {
-                val photoPath = result.data?.data
-                val photoFile = PickedFiles.pickedExistingPicture(activity, photoPath!!)
-                callbacks.onImagesPicked(
-                    singleFileList(photoFile),
-                    ImageSource.DOCUMENTS,
-                    restoreType(activity)
-                )
-
-                if (configuration(activity).shouldCopyPickedImagesToPublicGalleryAppFolder()) {
-                    PickedFiles.copyFilesInSeparateThread(activity, singleFileList(photoFile))
-                }
+                val files = getFilesFromGalleryPictures(result.data, activity)
+                callbacks.onImagesPicked(files, ImageSource.DOCUMENTS, restoreType(activity))
             } catch (e: Exception) {
                 e.printStackTrace()
                 callbacks.onImagePickerError(e, ImageSource.DOCUMENTS, restoreType(activity))