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

Added batch move to inbox

This commit is contained in:
M66B 2020-05-22 11:30:47 +02:00
parent eef9d9ab7e
commit 9b21152db5
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2350,11 +2350,13 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
if (!result.folders.contains(message.folder))
result.folders.add(message.folder);
boolean isInbox = EntityFolder.INBOX.equals(folder.type);
boolean isArchive = EntityFolder.ARCHIVE.equals(folder.type);
boolean isTrash = (EntityFolder.TRASH.equals(folder.type) || account.protocol != EntityAccount.TYPE_IMAP);
boolean isJunk = EntityFolder.JUNK.equals(folder.type);
boolean isDrafts = EntityFolder.DRAFTS.equals(folder.type);
result.isInbox = (result.isInbox == null ? isInbox : result.isInbox && isInbox);
result.isArchive = (result.isArchive == null ? isArchive : result.isArchive && isArchive);
result.isTrash = (result.isTrash == null ? isTrash : result.isTrash && isTrash);
result.isJunk = (result.isJunk == null ? isJunk : result.isJunk && isJunk);
@ -2404,6 +2406,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
result.hasJunk = (result.hasJunk == null ? hasJunk : result.hasJunk && hasJunk);
}
if (result.isInbox == null) result.isInbox = false;
if (result.isArchive == null) result.isArchive = false;
if (result.isTrash == null) result.isTrash = false;
if (result.isJunk == null) result.isJunk = false;
@ -2456,6 +2459,9 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
importance.add(Menu.NONE, R.string.title_importance_low, 3, R.string.title_importance_low)
.setEnabled(!EntityMessage.PRIORITIY_LOW.equals(result.importance));
if (!result.isInbox) // not is inbox
popupMenu.getMenu().add(Menu.NONE, R.string.title_folder_inbox, order++, R.string.title_folder_inbox);
if (result.hasArchive && !result.isArchive) // has archive and not is archive
popupMenu.getMenu().add(Menu.NONE, R.string.title_archive, order++, R.string.title_archive);
@ -2516,6 +2522,9 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
case R.string.title_importance_high:
onActionSetImportanceSelection(EntityMessage.PRIORITIY_HIGH);
return true;
case R.string.title_folder_inbox:
onActionMoveSelection(EntityFolder.INBOX);
return true;
case R.string.title_archive:
onActionMoveSelection(EntityFolder.ARCHIVE);
return true;
@ -6627,6 +6636,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
Boolean hasArchive;
Boolean hasTrash;
Boolean hasJunk;
Boolean isInbox;
Boolean isArchive;
Boolean isTrash;
Boolean isJunk;