mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Prevent trashing conversation when trashing draft

This commit is contained in:
M66B 2023-03-05 08:49:58 +01:00
parent bf10ec1fc6
commit 21ad47d30c
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/eu/faircode/email/FragmentMessages.java
View File

@ -3310,6 +3310,9 @@ public class FragmentMessages extends FragmentBase
EntityAccount sourceAccount = db.account().getAccount(message.account);
if (sourceAccount == null)
return result;
EntityFolder baseFolder = db.folder().getFolder(message.folder);
if (baseFolder == null)
return result;
EntityFolder targetFolder = db.folder().getFolder(tid);
if (targetFolder == null)
@ -3322,7 +3325,8 @@ public class FragmentMessages extends FragmentBase
List<EntityMessage> messages = db.message().getMessagesByThread(
message.account, message.thread,
threading && thread ? null : id,
EntityFolder.TRASH.equals(targetFolder.type) ? null : message.folder);
!EntityFolder.DRAFTS.equals(baseFolder.type) &&
EntityFolder.TRASH.equals(targetFolder.type) ? null : message.folder);
for (EntityMessage threaded : messages) {
EntityFolder sourceFolder = db.folder().getFolder(threaded.folder);
if (sourceFolder == null ||