mirror of https://github.com/M66B/FairEmail.git
Allow trashing drafts
This commit is contained in:
parent
0c4f442be0
commit
07194a970d
|
@ -806,7 +806,7 @@ public class FragmentMessages extends FragmentEx {
|
||||||
if (result[4] && !result[6] && !result[9]) // has archive and not is archive
|
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);
|
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);
|
popupMenu.getMenu().add(Menu.NONE, action_delete, 6, R.string.title_delete);
|
||||||
else if (result[5]) // has trash
|
else if (result[5]) // has trash
|
||||||
popupMenu.getMenu().add(Menu.NONE, action_trash, 6, R.string.title_trash);
|
popupMenu.getMenu().add(Menu.NONE, action_trash, 6, R.string.title_trash);
|
||||||
|
|
|
@ -1704,7 +1704,7 @@ public class ServiceSynchronize extends LifecycleService {
|
||||||
if (prefs.getBoolean("autoread", false) && !imessage.isSet(Flags.Flag.SEEN))
|
if (prefs.getBoolean("autoread", false) && !imessage.isSet(Flags.Flag.SEEN))
|
||||||
imessage.setFlag(Flags.Flag.SEEN, true);
|
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);
|
Folder itarget = istore.getFolder(target.name);
|
||||||
ifolder.moveMessages(new Message[]{imessage}, itarget);
|
ifolder.moveMessages(new Message[]{imessage}, itarget);
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in New Issue