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

Prevent moving out of draft

This commit is contained in:
M66B 2018-12-11 08:39:16 +01:00
parent e2a419a36d
commit fb397b3e82
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -449,6 +449,7 @@ public class FragmentMessages extends FragmentEx {
TupleMessageEx message = ((AdapterMessage) rvMessage.getAdapter()).getCurrentList().get(pos); TupleMessageEx message = ((AdapterMessage) rvMessage.getAdapter()).getCurrentList().get(pos);
if (message == null || if (message == null ||
expanded.contains(message.id) || expanded.contains(message.id) ||
EntityFolder.DRAFTS.equals(message.folderType) ||
EntityFolder.OUTBOX.equals(message.folderType)) EntityFolder.OUTBOX.equals(message.folderType))
return 0; return 0;
@ -724,7 +725,7 @@ public class FragmentMessages extends FragmentEx {
long fid = args.getLong("folder"); long fid = args.getLong("folder");
long[] ids = args.getLongArray("ids"); long[] ids = args.getLongArray("ids");
Boolean[] result = new Boolean[9]; Boolean[] result = new Boolean[10];
for (int i = 0; i < result.length; i++) for (int i = 0; i < result.length; i++)
result[i] = false; result[i] = false;
@ -748,6 +749,7 @@ public class FragmentMessages extends FragmentEx {
result[6] = EntityFolder.ARCHIVE.equals(folder.type); result[6] = EntityFolder.ARCHIVE.equals(folder.type);
result[7] = EntityFolder.TRASH.equals(folder.type); result[7] = EntityFolder.TRASH.equals(folder.type);
result[8] = EntityFolder.JUNK.equals(folder.type); result[8] = EntityFolder.JUNK.equals(folder.type);
result[9] = EntityFolder.DRAFTS.equals(folder.type);
} }
return result; return result;
@ -757,9 +759,9 @@ public class FragmentMessages extends FragmentEx {
protected void onLoaded(Bundle args, final Boolean[] result) { protected void onLoaded(Bundle args, final Boolean[] result) {
PopupMenu popupMenu = new PopupMenu(getContext(), fabMore); PopupMenu popupMenu = new PopupMenu(getContext(), fabMore);
if (result[0]) if (result[0] && !result[9])
popupMenu.getMenu().add(Menu.NONE, action_seen, 1, R.string.title_seen); popupMenu.getMenu().add(Menu.NONE, action_seen, 1, R.string.title_seen);
if (result[1]) if (result[1] && !result[9])
popupMenu.getMenu().add(Menu.NONE, action_unseen, 2, R.string.title_unseen); popupMenu.getMenu().add(Menu.NONE, action_unseen, 2, R.string.title_unseen);
if (result[2]) if (result[2])
@ -767,19 +769,20 @@ public class FragmentMessages extends FragmentEx {
if (result[3]) if (result[3])
popupMenu.getMenu().add(Menu.NONE, action_unflag, 4, R.string.title_unflag); popupMenu.getMenu().add(Menu.NONE, action_unflag, 4, R.string.title_unflag);
if (result[4] && !result[6]) // 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[5]) // has trash if (result[5]) // has trash
if (result[7]) // is trash if (result[7] || result[9]) // is trash or drafts
popupMenu.getMenu().add(Menu.NONE, action_delete, 6, R.string.title_trash); popupMenu.getMenu().add(Menu.NONE, action_delete, 6, R.string.title_trash);
else else
popupMenu.getMenu().add(Menu.NONE, action_trash, 6, R.string.title_trash); popupMenu.getMenu().add(Menu.NONE, action_trash, 6, R.string.title_trash);
if (!result[8]) if (!result[8] && !result[9])
popupMenu.getMenu().add(Menu.NONE, action_junk, 6, R.string.title_spam); popupMenu.getMenu().add(Menu.NONE, action_junk, 6, R.string.title_spam);
popupMenu.getMenu().add(Menu.NONE, action_move, 7, R.string.title_move); if (!result[9])
popupMenu.getMenu().add(Menu.NONE, action_move, 7, R.string.title_move);
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() { popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@Override @Override