Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-05 08:33:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added POP3 multiple select

Browse Source
This commit is contained in:
M66B
2019-11-11 14:44:55 +01:00
parent 88d2dcaff4
commit 6bb85cc2c2
4 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1761,12 +1761,19 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
DB db = DB.getInstance(context);
boolean pop = false;
result.folders = new ArrayList<>();
for (long id : ids) {
EntityMessage message = db.message().getMessage(id);
if (message == null)
continue;
EntityAccount account = db.account().getAccount(message.account);
if (account == null)
continue;
if (account.pop)
pop = true;
if (!result.folders.contains(message.folder))
result.folders.add(message.folder);
@@ -1792,7 +1799,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
EntityFolder folder = db.folder().getFolder(message.folder);
boolean isArchive = EntityFolder.ARCHIVE.equals(folder.type);
boolean isTrash = EntityFolder.TRASH.equals(folder.type);
boolean isTrash = (EntityFolder.TRASH.equals(folder.type) || account.pop);
boolean isJunk = EntityFolder.JUNK.equals(folder.type);
boolean isDrafts = EntityFolder.DRAFTS.equals(folder.type);
@@ -1820,9 +1827,10 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
if (result.hasJunk == null) result.hasJunk = false;
result.accounts = new ArrayList<>();
for (EntityAccount account : db.account().getSynchronizingAccounts())
if (!account.pop)
result.accounts.add(account);
if (!pop)
for (EntityAccount account : db.account().getSynchronizingAccounts())
if (!account.pop)
result.accounts.add(account);
return result;
}
@@ -2150,10 +2158,14 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
if (message == null)
continue;
EntityAccount account = db.account().getAccount(message.account);
if (account == null)
continue;
List<EntityMessage> messages = db.message().getMessagesByThread(
message.account, message.thread, threading ? null : id, message.folder);
for (EntityMessage threaded : messages)
if (message.uid != null)
if (message.uid != null || account.pop)
ids.add(threaded.id);
}