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

Allow trashing drafts

This commit is contained in:
M66B 2019-01-14 07:33:09 +00:00
parent 0c4f442be0
commit 07194a970d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -806,7 +806,7 @@ public class FragmentMessages extends FragmentEx {
if (result[4] && !result[6] && !result[9]) // has archive and not is archive
popupMenu.getMenu().add(Menu.NONE, action_archive, 5, R.string.title_archive);
if (result[7] || result[9]) // is trash/drafts
if (result[7]) // is trash
popupMenu.getMenu().add(Menu.NONE, action_delete, 6, R.string.title_delete);
else if (result[5]) // has trash
popupMenu.getMenu().add(Menu.NONE, action_trash, 6, R.string.title_trash);

2
app/src/main/java/eu/faircode/email/ServiceSynchronize.java
View File

@ -1704,7 +1704,7 @@ public class ServiceSynchronize extends LifecycleService {
if (prefs.getBoolean("autoread", false) && !imessage.isSet(Flags.Flag.SEEN))
imessage.setFlag(Flags.Flag.SEEN, true);
if (istore.hasCapability("MOVE")) {
if (istore.hasCapability("MOVE") && !EntityFolder.DRAFTS.equals(folder.type)) {
Folder itarget = istore.getFolder(target.name);
ifolder.moveMessages(new Message[]{imessage}, itarget);
} else {