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

Synchronize/keep unseen messages

This commit is contained in:
M66B 2019-05-05 13:11:19 +02:00
parent c6ee303a6c
commit 0fb29cdeaa
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/eu/faircode/email/Core.java
View File

@ -905,7 +905,7 @@ class Core {
// Delete old local messages // Delete old local messages
if (auto_delete && EntityFolder.TRASH.equals(folder.type)) { if (auto_delete && EntityFolder.TRASH.equals(folder.type)) {
List<Long> tbds = db.message().getMessagesBefore(folder.id, keep_time); List<Long> tbds = db.message().getMessagesBefore(folder.id, keep_time, false);
Log.i(folder.name + " local tbd=" + tbds.size()); Log.i(folder.name + " local tbd=" + tbds.size());
for (Long tbd : tbds) { for (Long tbd : tbds) {
EntityMessage message = db.message().getMessage(tbd); EntityMessage message = db.message().getMessage(tbd);
@ -913,7 +913,7 @@ class Core {
EntityOperation.queue(context, db, message, EntityOperation.DELETE); EntityOperation.queue(context, db, message, EntityOperation.DELETE);
} }
} else { } else {
int old = db.message().deleteMessagesBefore(folder.id, keep_time); int old = db.message().deleteMessagesBefore(folder.id, keep_time, false);
Log.i(folder.name + " local old=" + old); Log.i(folder.name + " local old=" + old);
} }
@ -923,6 +923,7 @@ class Core {
// Reduce list of local uids // Reduce list of local uids
SearchTerm searchTerm = new ReceivedDateTerm(ComparisonTerm.GE, new Date(sync_time)); SearchTerm searchTerm = new ReceivedDateTerm(ComparisonTerm.GE, new Date(sync_time));
searchTerm = new OrTerm(searchTerm, new FlagTerm(new Flags(Flags.Flag.SEEN), false));
if (ifolder.getPermanentFlags().contains(Flags.Flag.FLAGGED)) if (ifolder.getPermanentFlags().contains(Flags.Flag.FLAGGED))
searchTerm = new OrTerm(searchTerm, new FlagTerm(new Flags(Flags.Flag.FLAGGED), true)); searchTerm = new OrTerm(searchTerm, new FlagTerm(new Flags(Flags.Flag.FLAGGED), true));
@ -931,11 +932,9 @@ class Core {
try { try {
imessages = ifolder.search(searchTerm); imessages = ifolder.search(searchTerm);
} catch (MessagingException ex) { } catch (MessagingException ex) {
if (ifolder.getPermanentFlags().contains(Flags.Flag.FLAGGED)) { Log.w(ex.getMessage());
Log.w(ex.getMessage()); // Fallback to date only search
imessages = ifolder.search(new ReceivedDateTerm(ComparisonTerm.GE, new Date(sync_time))); imessages = ifolder.search(new ReceivedDateTerm(ComparisonTerm.GE, new Date(sync_time)));
} else
throw ex;
} }
Log.i(folder.name + " remote count=" + imessages.length + Log.i(folder.name + " remote count=" + imessages.length +
" search=" + (SystemClock.elapsedRealtime() - search) + " ms"); " search=" + (SystemClock.elapsedRealtime() - search) + " ms");

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

@ -425,13 +425,15 @@ public interface DaoMessage {
" WHERE folder = :folder" + " WHERE folder = :folder" +
" AND received < :received" + " AND received < :received" +
" AND NOT uid IS NULL" + " AND NOT uid IS NULL" +
" AND (ui_seen OR :unseen)" +
" AND NOT ui_flagged") " AND NOT ui_flagged")
List<Long> getMessagesBefore(long folder, long received); List<Long> getMessagesBefore(long folder, long received, boolean unseen);
@Query("DELETE FROM message" + @Query("DELETE FROM message" +
" WHERE folder = :folder" + " WHERE folder = :folder" +
" AND received < :received" + " AND received < :received" +
" AND NOT uid IS NULL" + " AND NOT uid IS NULL" +
" AND (ui_seen OR :unseen)" +
" AND NOT ui_flagged") " AND NOT ui_flagged")
int deleteMessagesBefore(long folder, long received); int deleteMessagesBefore(long folder, long received, boolean unseen);
} }

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

@ -80,7 +80,7 @@ public class WorkerCleanup extends Worker {
if (keep_time < 0) if (keep_time < 0)
keep_time = 0; keep_time = 0;
int messages = db.message().deleteMessagesBefore(folder.id, keep_time); int messages = db.message().deleteMessagesBefore(folder.id, keep_time, false);
if (messages > 0) if (messages > 0)
Log.i("Cleanup folder=" + folder.account + "/" + folder.name + Log.i("Cleanup folder=" + folder.account + "/" + folder.name +
" before=" + new Date(keep_time) + " deleted=" + messages); " before=" + new Date(keep_time) + " deleted=" + messages);