Fix: Save all option overrides attachment files

Author: mohitsatr

legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/AttachmentController.kt

@@ -4,6 +4,7 @@ import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
+import android.provider.DocumentsContract
 import android.widget.Toast
 import androidx.annotation.WorkerThread
 import app.k9mail.legacy.message.controller.SimpleMessagingListener
@@ -66,6 +67,21 @@ class AttachmentController internal constructor(
         }
     }
 
+    fun saveAttachmentToDirectory(scope: CoroutineScope, directoryUri: Uri?) {
+        if (directoryUri == null) return
+        scope.launch {
+            if (!attachment.isContentAvailable) {
+                val success = downloadAttachment()
+                if (success) {
+                    attachmentDisplayController.refreshAttachmentThumbnail(attachment)
+                    saveLocalAttachmentToDirectory(directoryUri)
+                }
+            } else {
+                saveLocalAttachmentToDirectory(directoryUri)
+            }
+        }
+    }
+
     private suspend fun saveLocalAttachmentTo(documentUri: Uri) {
         val success = withContext(ioDispatcher) {
             try {
@@ -79,6 +95,33 @@ class AttachmentController internal constructor(
         if (!success) displayAttachmentNotSavedMessage()
     }
 
+    private suspend fun saveLocalAttachmentToDirectory(directoryUri: Uri) {
+        val success = withContext(ioDispatcher) {
+            try {
+                val contentResolver = context.contentResolver
+                val treeId = DocumentsContract.getTreeDocumentId(directoryUri)
+                val rootDocUri = DocumentsContract.buildDocumentUriUsingTree(directoryUri, treeId)
+
+                val documentUri = attachment.mimeType?.let {
+                    attachment.displayName?.let { displayName ->
+                        DocumentsContract.createDocument(
+                            contentResolver,
+                            rootDocUri,
+                            it,
+                            displayName
+                        )
+                    }
+                } ?: return@withContext false
+                writeAttachment(documentUri)
+                true
+            } catch (e: IOException) {
+                logger.error(throwable = e) { "Error saving attachment to directory" }
+                false
+            }
+        }
+        if (!success) displayAttachmentNotSavedMessage()
+    }
+
     private suspend fun downloadAttachment(): Boolean = suspendCancellableCoroutine { continuation ->
         attachmentDisplayController.showAttachmentLoadingDialog()
         controller.loadAttachment(

legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.kt

@@ -20,6 +20,7 @@ import android.view.ViewGroup
 import android.view.inputmethod.InputMethodManager
 import android.widget.Toast
 import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.platform.ComposeView
@@ -119,6 +120,10 @@ class MessageViewFragment :
         registerForActivityResult(CreateDocumentResultContract()) { documentUri ->
             onCreateDocumentResult(documentUri)
         }
+    private val openDocumentTreeLauncher: ActivityResultLauncher<Uri?> =
+        registerForActivityResult(ActivityResultContracts.OpenDocumentTree()) { directoryUri ->
+            onOpenDocumentTreeResult(directoryUri)
+        }
     private val chooseFolderForCopyLauncher: ActivityResultLauncher<ChooseFolderResultContract.Input> =
         registerForActivityResult(ChooseFolderResultContract(ChooseFolderActivity.Action.COPY)) { result ->
             onChooseFolderCopyResult(result)
@@ -245,11 +250,7 @@ class MessageViewFragment :
                             onSaveClick = { attachment ->
                                 onSaveAttachment(attachment)
                             },
-                            onSaveAllClick = {
-                                attachments.forEach { item ->
-                                    onSaveAttachment(item.attachment)
-                                }
-                            },
+                            onSaveAllClick = { onSaveAllAttachments() },
                         )
                     }
                 }
@@ -828,6 +829,18 @@ class MessageViewFragment :
         }
     }
 
+    private fun onOpenDocumentTreeResult(directoryUri: Uri?) {
+        if (directoryUri == null) return
+
+        val messageView = mMessageViewInfo ?: return
+        val attachments = messageView.attachments.filter { !it.inlineAttachment }
+        attachments.forEach {
+            currentAttachmentViewInfo = it
+                createAttachmentController(it)
+                    .saveAttachmentToDirectory(lifecycleScope ,directoryUri)
+        }
+    }
+
     private fun onChooseFolderMoveResult(result: ChooseFolderResultContract.Result?) {
         if (result == null) return
 
@@ -1190,6 +1203,14 @@ class MessageViewFragment :
         createAttachmentController(attachment).viewAttachment(lifecycleScope)
     }
 
+    fun onSaveAllAttachments() {
+        try {
+            openDocumentTreeLauncher.launch(null)
+        } catch (_: ActivityNotFoundException) {
+            Toast.makeText(requireContext(), R.string.error_activity_not_found, Toast.LENGTH_LONG).show()
+        }
+    }
+
     override fun onSaveAttachment(attachment: AttachmentViewInfo) {
         currentAttachmentViewInfo = attachment