From 7c205909b645a78870155a984e72c6c7876067d1 Mon Sep 17 00:00:00 2001 From: Kevin Boulongne Date: Mon, 29 Apr 2024 10:59:14 +0200 Subject: [PATCH 1/3] Only save Draft when adding Attachment --- .../com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt index ce610e50db..f1a3958b4e 100644 --- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt +++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt @@ -475,7 +475,8 @@ class NewMessageFragment : Fragment() { if (isFirstTime) { isFirstTime = false observeImportAttachments() - } else { + } else if (attachments.count() > attachmentAdapter.itemCount) { + // If we are adding Attachments, directly save the Draft, so the Attachments' upload starts now. saveDraft() } From f59647f19dad6431b77dbbba9e2ad9158644e05d Mon Sep 17 00:00:00 2001 From: Kevin Boulongne Date: Wed, 1 May 2024 10:29:06 +0200 Subject: [PATCH 2/3] Add TODO comment --- .../java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt index f1a3958b4e..ec2b91256b 100644 --- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt +++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt @@ -477,6 +477,7 @@ class NewMessageFragment : Fragment() { observeImportAttachments() } else if (attachments.count() > attachmentAdapter.itemCount) { // If we are adding Attachments, directly save the Draft, so the Attachments' upload starts now. + // TODO: Only save Attachments, and not the whole Draft. saveDraft() } From 5be7da0dd9c7c6e60f14748566fdf957f97ef664 Mon Sep 17 00:00:00 2001 From: Kevin Boulongne Date: Wed, 1 May 2024 11:05:10 +0200 Subject: [PATCH 3/3] Clean code --- .../infomaniak/mail/ui/main/folder/ThreadListMultiSelection.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListMultiSelection.kt b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListMultiSelection.kt index 63725a6323..2760e7b3b5 100644 --- a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListMultiSelection.kt +++ b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListMultiSelection.kt @@ -44,7 +44,7 @@ import com.infomaniak.mail.utils.extensions.updateNavigationBarColor class ThreadListMultiSelection { lateinit var mainViewModel: MainViewModel - lateinit var threadListFragment: ThreadListFragment + private lateinit var threadListFragment: ThreadListFragment lateinit var unlockSwipeActionsIfSet: () -> Unit lateinit var localSettings: LocalSettings