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

Added POP3 multiple select

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/eu/faircode/email/DaoMessage.java
View File

@ -241,13 +241,14 @@ public interface DaoMessage {
" ORDER BY message.received DESC") " ORDER BY message.received DESC")
List<Long> getMessageWithContent(); List<Long> getMessageWithContent();
@Query("SELECT *" + @Query("SELECT message.*" +
" FROM message" + " FROM message" +
" JOIN account ON account.id = message.account" +
" WHERE account = :account" + " WHERE account = :account" +
" AND thread = :thread" + " AND thread = :thread" +
" AND (:id IS NULL OR message.id = :id)" + " AND (:id IS NULL OR message.id = :id)" +
" AND (:folder IS NULL OR message.folder = :folder)" + " AND (:folder IS NULL OR message.folder = :folder)" +
" AND NOT uid IS NULL" + " AND (NOT uid IS NULL OR account.pop)" +
" AND NOT ui_hide") " AND NOT ui_hide")
List<EntityMessage> getMessagesByThread(long account, String thread, Long id, Long folder); List<EntityMessage> getMessagesByThread(long account, String thread, Long id, Long folder);

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

6
app/src/main/java/eu/faircode/email/SelectionPredicateMessage.java
View File

@ -46,6 +46,9 @@ public class SelectionPredicateMessage extends SelectionTracker.SelectionPredica
if (message == null) // happens when restoring state if (message == null) // happens when restoring state
return true; return true;
if (message.accountPop)
return true;
if (message.uid != null && !message.folderReadOnly) if (message.uid != null && !message.folderReadOnly)
return true; return true;
@ -62,6 +65,9 @@ public class SelectionPredicateMessage extends SelectionTracker.SelectionPredica
if (message == null) // happens when restoring state if (message == null) // happens when restoring state
return true; return true;
if (message.accountPop)
return true;
if (message.uid != null && !message.folderReadOnly) if (message.uid != null && !message.folderReadOnly)
return true; return true;

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

@ -277,7 +277,7 @@ public class ViewModelMessages extends ViewModel {
int count = ds.countItems(); int count = ds.countItems();
for (int i = 0; i < count; i += 100) for (int i = 0; i < count; i += 100)
for (TupleMessageEx message : ds.loadRange(i, Math.min(100, count - i))) for (TupleMessageEx message : ds.loadRange(i, Math.min(100, count - i)))
if (message.uid != null && !message.folderReadOnly) if ((message.uid != null && !message.folderReadOnly) || message.accountPop)
ids.add(message.id); ids.add(message.id);
Log.i("Loaded messages #" + ids.size()); Log.i("Loaded messages #" + ids.size());