msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Added quick sync options

Browse Source
pull/202/head
M66B 4 years ago
parent 6457c76bcf
commit 32be7ba708
5 changed files with 444 additions and 336 deletions
Show Stats Download Patch File Download Diff File

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

@ -2276,13 +2276,14 @@ class Core {
POP3Folder ifolder, POP3Store istore, State state) throws MessagingException, IOException { POP3Folder ifolder, POP3Store istore, State state) throws MessagingException, IOException {
DB db = DB.getInstance(context); DB db = DB.getInstance(context);
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean sync_quick_pop = prefs.getBoolean("sync_quick_pop", true);
boolean notify_known = prefs.getBoolean("notify_known", false); boolean notify_known = prefs.getBoolean("notify_known", false);
boolean pro = ActivityBilling.isPro(context); boolean pro = ActivityBilling.isPro(context);
boolean force = jargs.optBoolean(5, false); boolean force = jargs.optBoolean(5, false);
EntityLog.log(context, account.name + " POP sync type=" + folder.type + EntityLog.log(context, account.name + " POP sync type=" + folder.type +
" force=" + force + " quick=" + sync_quick_pop + " force=" + force +
" connected=" + (ifolder != null)); " connected=" + (ifolder != null));
if (!EntityFolder.INBOX.equals(folder.type)) { if (!EntityFolder.INBOX.equals(folder.type)) {
@ -2308,7 +2309,7 @@ class Core {
: Math.min(imessages.length, account.max_messages)); : Math.min(imessages.length, account.max_messages));
boolean sync = true; boolean sync = true;
if (!force && if (sync_quick_pop && !force &&
imessages.length > 0 && folder.last_sync_count != null && imessages.length > 0 && folder.last_sync_count != null &&
imessages.length == folder.last_sync_count) { imessages.length == folder.last_sync_count) {
// Check if last message known as new messages indicator // Check if last message known as new messages indicator
@ -2613,6 +2614,7 @@ class Core {
keep_days++; keep_days++;
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean sync_quick_imap = prefs.getBoolean("sync_quick_imap", false);
boolean sync_nodate = prefs.getBoolean("sync_nodate", false); boolean sync_nodate = prefs.getBoolean("sync_nodate", false);
boolean sync_unseen = prefs.getBoolean("sync_unseen", false); boolean sync_unseen = prefs.getBoolean("sync_unseen", false);
boolean sync_flagged = prefs.getBoolean("sync_flagged", false); boolean sync_flagged = prefs.getBoolean("sync_flagged", false);
@ -2622,7 +2624,7 @@ class Core {
boolean perform_expunge = prefs.getBoolean("perform_expunge", true); boolean perform_expunge = prefs.getBoolean("perform_expunge", true);
Log.i(folder.name + " start sync after=" + sync_days + "/" + keep_days + Log.i(folder.name + " start sync after=" + sync_days + "/" + keep_days +
" force=" + force + " quick=" + sync_quick_imap + " force=" + force +
" sync unseen=" + sync_unseen + " flagged=" + sync_flagged + " sync unseen=" + sync_unseen + " flagged=" + sync_flagged +
" delete unseen=" + delete_unseen + " kept=" + sync_kept); " delete unseen=" + delete_unseen + " kept=" + sync_kept);
@ -2700,377 +2702,402 @@ class Core {
Log.i(folder.name + " local old=" + old); Log.i(folder.name + " local old=" + old);
} }
// Get list of local uids
final List<Long> uids = db.message().getUids(folder.id, sync_kept || force ? null : sync_time);
Log.i(folder.name + " local count=" + uids.size());
// Reduce list of local uids
SearchTerm dateTerm = account.use_date
? new SentDateTerm(ComparisonTerm.GE, new Date(sync_time))
: new ReceivedDateTerm(ComparisonTerm.GE, new Date(sync_time));
SearchTerm searchTerm = dateTerm;
Flags flags = ifolder.getPermanentFlags();
if (sync_nodate)
searchTerm = new OrTerm(searchTerm, new ReceivedDateTerm(ComparisonTerm.LT, new Date(365 * 24 * 3600 * 1000L)));
if (sync_unseen && flags.contains(Flags.Flag.SEEN))
searchTerm = new OrTerm(searchTerm, new FlagTerm(new Flags(Flags.Flag.SEEN), false));
if (sync_flagged && flags.contains(Flags.Flag.FLAGGED))
searchTerm = new OrTerm(searchTerm, new FlagTerm(new Flags(Flags.Flag.FLAGGED), true));
long search = SystemClock.elapsedRealtime();
Message[] imessages; Message[] imessages;
if (sync_time == 0) long search;
imessages = ifolder.getMessages(); Long[] ids;
else if (modified || !sync_quick_imap || force) {
try { // Get list of local uids
imessages = ifolder.search(searchTerm); final List<Long> uids = db.message().getUids(folder.id, sync_kept || force ? null : sync_time);
} catch (MessagingException ex) { Log.i(folder.name + " local count=" + uids.size());
Log.w(ex);
// Fallback to date only search // Reduce list of local uids
// BAD Could not parse command SearchTerm dateTerm = account.use_date
imessages = ifolder.search(dateTerm); ? new SentDateTerm(ComparisonTerm.GE, new Date(sync_time))
} : new ReceivedDateTerm(ComparisonTerm.GE, new Date(sync_time));
if (imessages == null)
imessages = new Message[0]; SearchTerm searchTerm = dateTerm;
Flags flags = ifolder.getPermanentFlags();
if (sync_nodate)
searchTerm = new OrTerm(searchTerm, new ReceivedDateTerm(ComparisonTerm.LT, new Date(365 * 24 * 3600 * 1000L)));
if (sync_unseen && flags.contains(Flags.Flag.SEEN))
searchTerm = new OrTerm(searchTerm, new FlagTerm(new Flags(Flags.Flag.SEEN), false));
if (sync_flagged && flags.contains(Flags.Flag.FLAGGED))
searchTerm = new OrTerm(searchTerm, new FlagTerm(new Flags(Flags.Flag.FLAGGED), true));
search = SystemClock.elapsedRealtime();
if (sync_time == 0)
imessages = ifolder.getMessages();
else
try {
imessages = ifolder.search(searchTerm);
} catch (MessagingException ex) {
Log.w(ex);
// Fallback to date only search
// BAD Could not parse command
imessages = ifolder.search(dateTerm);
}
if (imessages == null)
imessages = new Message[0];
stats.search_ms = (SystemClock.elapsedRealtime() - search); stats.search_ms = (SystemClock.elapsedRealtime() - search);
Log.i(folder.name + " remote count=" + imessages.length + " search=" + stats.search_ms + " ms"); Log.i(folder.name + " remote count=" + imessages.length + " search=" + stats.search_ms + " ms");
Long[] ids = new Long[imessages.length]; ids = new Long[imessages.length];
if (!modified) { if (!modified && !(sync_quick_imap && !force)) {
Log.i(folder.name + " quick check"); Log.i(folder.name + " quick check count=" + imessages.length);
long fetch = SystemClock.elapsedRealtime(); long fetch = SystemClock.elapsedRealtime();
FetchProfile fp = new FetchProfile(); FetchProfile fp = new FetchProfile();
fp.add(UIDFolder.FetchProfileItem.UID); fp.add(UIDFolder.FetchProfileItem.UID);
ifolder.fetch(imessages, fp); ifolder.fetch(imessages, fp);
stats.flags = imessages.length; stats.flags = imessages.length;
stats.flags_ms = (SystemClock.elapsedRealtime() - fetch); stats.flags_ms = (SystemClock.elapsedRealtime() - fetch);
Log.i(folder.name + " remote fetched=" + stats.flags_ms + " ms"); Log.i(folder.name + " remote fetched=" + stats.flags_ms + " ms");
try { try {
for (int i = 0; i < imessages.length; i++) { for (int i = 0; i < imessages.length; i++) {
state.ensureRunning("Sync/IMAP/check"); state.ensureRunning("Sync/IMAP/check");
long uid = ifolder.getUID(imessages[i]); long uid = ifolder.getUID(imessages[i]);
EntityMessage message = db.message().getMessageByUid(folder.id, uid); EntityMessage message = db.message().getMessageByUid(folder.id, uid);
ids[i] = (message == null ? null : message.id); ids[i] = (message == null ? null : message.id);
if (message == null || message.ui_hide) { if (message == null || message.ui_hide) {
Log.i(folder.name + " missing uid=" + uid); Log.i(folder.name + " missing uid=" + uid);
modified = true; modified = true;
break; break;
} else } else
uids.remove(uid); uids.remove(uid);
}
} catch (Throwable ex) {
if (ex instanceof OperationCanceledException)
Log.i(ex);
else
Log.w(ex);
modified = true;
db.folder().setFolderModSeq(folder.id, null);
}
if (uids.size() > 0) {
Log.i(folder.name + " remaining=" + uids.size());
modified = true;
} }
} catch (Throwable ex) {
if (ex instanceof OperationCanceledException)
Log.i(ex);
else
Log.w(ex);
modified = true;
db.folder().setFolderModSeq(folder.id, null);
}
if (uids.size() > 0) { EntityLog.log(context, folder.name + " modified=" + modified);
Log.i(folder.name + " remaining=" + uids.size());
modified = true;
} }
EntityLog.log(context, folder.name + " modified=" + modified); if (modified) {
} long fetch = SystemClock.elapsedRealtime();
if (modified) { FetchProfile fp = new FetchProfile();
long fetch = SystemClock.elapsedRealtime(); fp.add(UIDFolder.FetchProfileItem.UID); // To check if message exists
fp.add(FetchProfile.Item.FLAGS); // To update existing messages
FetchProfile fp = new FetchProfile(); if (account.isGmail())
fp.add(UIDFolder.FetchProfileItem.UID); // To check if message exists fp.add(GmailFolder.FetchProfileItem.LABELS);
fp.add(FetchProfile.Item.FLAGS); // To update existing messages ifolder.fetch(imessages, fp);
if (account.isGmail())
fp.add(GmailFolder.FetchProfileItem.LABELS); stats.flags = imessages.length;
ifolder.fetch(imessages, fp); stats.flags_ms = (SystemClock.elapsedRealtime() - fetch);
Log.i(folder.name + " remote fetched=" + stats.flags_ms + " ms");
stats.flags = imessages.length;
stats.flags_ms = (SystemClock.elapsedRealtime() - fetch); // Sort for finding referenced/replied-to messages
Log.i(folder.name + " remote fetched=" + stats.flags_ms + " ms"); // Sorting on date/time would be better, but requires fetching the headers
Arrays.sort(imessages, new Comparator<Message>() {
// Sort for finding referenced/replied-to messages @Override
// Sorting on date/time would be better, but requires fetching the headers public int compare(Message m1, Message m2) {
Arrays.sort(imessages, new Comparator<Message>() { try {
@Override return Long.compare(ifolder.getUID(m1), ifolder.getUID(m2));
public int compare(Message m1, Message m2) { } catch (MessagingException ex) {
try { return 0;
return Long.compare(ifolder.getUID(m1), ifolder.getUID(m2)); }
} catch (MessagingException ex) {
return 0;
} }
} });
});
int expunge = 0; int expunge = 0;
for (int i = 0; i < imessages.length; i++) { for (int i = 0; i < imessages.length; i++) {
state.ensureRunning("Sync/IMAP/delete"); state.ensureRunning("Sync/IMAP/delete");
try { try {
if (perform_expunge && imessages[i].isSet(Flags.Flag.DELETED)) if (perform_expunge && imessages[i].isSet(Flags.Flag.DELETED))
expunge++; expunge++;
else else
uids.remove(ifolder.getUID(imessages[i])); uids.remove(ifolder.getUID(imessages[i]));
} catch (MessageRemovedException ex) { } catch (MessageRemovedException ex) {
Log.w(folder.name, ex); Log.w(folder.name, ex);
} catch (FolderClosedException ex) { } catch (FolderClosedException ex) {
throw ex; throw ex;
} catch (Throwable ex) { } catch (Throwable ex) {
Log.e(folder.name, ex); Log.e(folder.name, ex);
EntityLog.log(context, folder.name + " expunge " + Log.formatThrowable(ex, false)); EntityLog.log(context, folder.name + " expunge " + Log.formatThrowable(ex, false));
db.folder().setFolderError(folder.id, Log.formatThrowable(ex)); db.folder().setFolderError(folder.id, Log.formatThrowable(ex));
}
} }
}
if (expunge > 0) if (expunge > 0)
try { try {
Log.i(folder.name + " expunging=" + expunge); Log.i(folder.name + " expunging=" + expunge);
ifolder.expunge(); ifolder.expunge();
} catch (Throwable ex) { } catch (Throwable ex) {
Log.w(ex); Log.w(ex);
} }
if (uids.size() > 0) { if (uids.size() > 0) {
// This is done outside of JavaMail to prevent changed notifications // This is done outside of JavaMail to prevent changed notifications
if (!ifolder.isOpen()) if (!ifolder.isOpen())
throw new FolderClosedException(ifolder, "UID FETCH"); throw new FolderClosedException(ifolder, "UID FETCH");
long getuid = SystemClock.elapsedRealtime(); long getuid = SystemClock.elapsedRealtime();
MessagingException ex = (MessagingException) ifolder.doCommand(new IMAPFolder.ProtocolCommand() { MessagingException ex = (MessagingException) ifolder.doCommand(new IMAPFolder.ProtocolCommand() {
@Override @Override
public Object doCommand(IMAPProtocol protocol) { public Object doCommand(IMAPProtocol protocol) {
try { try {
protocol.select(folder.name); protocol.select(folder.name);
} catch (ProtocolException ex) { } catch (ProtocolException ex) {
return new MessagingException("UID FETCH", ex); return new MessagingException("UID FETCH", ex);
} }
// Build ranges // Build ranges
List<Pair<Long, Long>> ranges = new ArrayList<>(); List<Pair<Long, Long>> ranges = new ArrayList<>();
long first = -1; long first = -1;
long last = -1; long last = -1;
for (long uid : uids) for (long uid : uids)
if (first < 0) if (first < 0)
first = uid; first = uid;
else if ((last < 0 ? first : last) + 1 == uid) else if ((last < 0 ? first : last) + 1 == uid)
last = uid; last = uid;
else { else {
ranges.add(new Pair<>(first, last < 0 ? first : last));
first = uid;
last = -1;
}
if (first > 0)
ranges.add(new Pair<>(first, last < 0 ? first : last)); ranges.add(new Pair<>(first, last < 0 ? first : last));
first = uid;
last = -1;
}
if (first > 0)
ranges.add(new Pair<>(first, last < 0 ? first : last));
List<List<Pair<Long, Long>>> chunks = Helper.chunkList(ranges, SYNC_CHUNCK_SIZE);
Log.i(folder.name + " executing uid fetch count=" + uids.size() +
" ranges=" + ranges.size() + " chunks=" + chunks.size());
for (int c = 0; c < chunks.size(); c++) {
List<Pair<Long, Long>> chunk = chunks.get(c);
Log.i(folder.name + " chunk #" + c + " size=" + chunk.size());
StringBuilder sb = new StringBuilder();
for (Pair<Long, Long> range : chunk) {
if (sb.length() > 0)
sb.append(',');
if (range.first.equals(range.second))
sb.append(range.first);
else
sb.append(range.first).append(':').append(range.second);
}
String command = "UID FETCH " + sb + " (UID FLAGS)";
Response[] responses = protocol.command(command, null);
if (responses.length > 0 && responses[responses.length - 1].isOK()) {
for (Response response : responses)
if (response instanceof FetchResponse) {
FetchResponse fr = (FetchResponse) response;
UID uid = fr.getItem(UID.class);
FLAGS flags = fr.getItem(FLAGS.class);
if (uid == null || flags == null)
continue;
if (perform_expunge && flags.contains(Flags.Flag.DELETED))
continue;
uids.remove(uid.uid);
if (force) {
EntityMessage message = db.message().getMessageByUid(folder.id, uid.uid);
if (message != null) {
boolean update = false;
boolean seen = flags.contains(Flags.Flag.SEEN);
boolean answered = flags.contains(Flags.Flag.ANSWERED);
boolean flagged = flags.contains(Flags.Flag.FLAGGED);
boolean deleted = flags.contains(Flags.Flag.DELETED);
if (message.seen != seen) {
update = true;
message.seen = seen;
message.ui_seen = seen;
Log.i("UID fetch seen=" + seen);
}
if (message.answered != answered) {
update = true;
message.answered = answered;
message.ui_answered = answered;
Log.i("UID fetch answered=" + answered);
}
if (message.flagged != flagged) {
update = true;
message.flagged = flagged;
message.ui_flagged = flagged;
Log.i("UID fetch flagged=" + flagged);
}
if (message.deleted != deleted) {
update = true;
message.deleted = deleted;
message.ui_deleted = deleted;
Log.i("UID fetch deleted=" + deleted);
}
if (update) List<List<Pair<Long, Long>>> chunks = Helper.chunkList(ranges, SYNC_CHUNCK_SIZE);
db.message().updateMessage(message);
Log.i(folder.name + " executing uid fetch count=" + uids.size() +
" ranges=" + ranges.size() + " chunks=" + chunks.size());
for (int c = 0; c < chunks.size(); c++) {
List<Pair<Long, Long>> chunk = chunks.get(c);
Log.i(folder.name + " chunk #" + c + " size=" + chunk.size());
StringBuilder sb = new StringBuilder();
for (Pair<Long, Long> range : chunk) {
if (sb.length() > 0)
sb.append(',');
if (range.first.equals(range.second))
sb.append(range.first);
else
sb.append(range.first).append(':').append(range.second);
}
String command = "UID FETCH " + sb + " (UID FLAGS)";
Response[] responses = protocol.command(command, null);
if (responses.length > 0 && responses[responses.length - 1].isOK()) {
for (Response response : responses)
if (response instanceof FetchResponse) {
FetchResponse fr = (FetchResponse) response;
UID uid = fr.getItem(UID.class);
FLAGS flags = fr.getItem(FLAGS.class);
if (uid == null || flags == null)
continue;
if (perform_expunge && flags.contains(Flags.Flag.DELETED))
continue;
uids.remove(uid.uid);
if (force) {
EntityMessage message = db.message().getMessageByUid(folder.id, uid.uid);
if (message != null) {
boolean update = false;
boolean seen = flags.contains(Flags.Flag.SEEN);
boolean answered = flags.contains(Flags.Flag.ANSWERED);
boolean flagged = flags.contains(Flags.Flag.FLAGGED);
boolean deleted = flags.contains(Flags.Flag.DELETED);
if (message.seen != seen) {
update = true;
message.seen = seen;
message.ui_seen = seen;
Log.i("UID fetch seen=" + seen);
}
if (message.answered != answered) {
update = true;
message.answered = answered;
message.ui_answered = answered;
Log.i("UID fetch answered=" + answered);
}
if (message.flagged != flagged) {
update = true;
message.flagged = flagged;
message.ui_flagged = flagged;
Log.i("UID fetch flagged=" + flagged);
}
if (message.deleted != deleted) {
update = true;
message.deleted = deleted;
message.ui_deleted = deleted;
Log.i("UID fetch deleted=" + deleted);
}
if (update)
db.message().updateMessage(message);
}
} }
} }
} } else {
} else { for (Response response : responses)
for (Response response : responses) if (response.isBYE())
if (response.isBYE()) return new MessagingException("UID FETCH", new IOException(response.toString()));
return new MessagingException("UID FETCH", new IOException(response.toString())); else if (response.isNO() || response.isBAD())
else if (response.isNO() || response.isBAD()) return new MessagingException(response.toString());
return new MessagingException(response.toString()); return new MessagingException("UID FETCH failed");
return new MessagingException("UID FETCH failed"); }
} }
}
return null;
}
});
if (ex != null)
throw ex;
stats.uids = uids.size();
stats.uids_ms = (SystemClock.elapsedRealtime() - getuid);
Log.i(folder.name + " remote uids=" + stats.uids_ms + " ms");
}
// Delete local messages not at remote
Log.i(folder.name + " delete=" + uids.size());
for (Long uid : uids) {
int count = db.message().deleteMessage(folder.id, uid);
Log.i(folder.name + " delete local uid=" + uid + " count=" + count);
}
List<EntityRule> rules = db.rule().getEnabledRules(folder.id); return null;
}
fp.add(FetchProfile.Item.ENVELOPE); });
//fp.add(FetchProfile.Item.FLAGS); if (ex != null)
fp.add(FetchProfile.Item.CONTENT_INFO); // body structure throw ex;
//fp.add(UIDFolder.FetchProfileItem.UID);
fp.add(IMAPFolder.FetchProfileItem.HEADERS);
//fp.add(IMAPFolder.FetchProfileItem.MESSAGE);
fp.add(FetchProfile.Item.SIZE);
fp.add(IMAPFolder.FetchProfileItem.INTERNALDATE);
if (account.isGmail())
fp.add(GmailFolder.FetchProfileItem.THRID);
// Add/update local messages
int synced = 0;
Log.i(folder.name + " add=" + imessages.length);
for (int i = imessages.length - 1; i >= 0; i -= SYNC_BATCH_SIZE) {
state.ensureRunning("Sync/IMAP/sync/fetch");
int from = Math.max(0, i - SYNC_BATCH_SIZE + 1);
Message[] isub = Arrays.copyOfRange(imessages, from, i + 1);
// Full fetch new/changed messages only stats.uids = uids.size();
List<Message> full = new ArrayList<>(); stats.uids_ms = (SystemClock.elapsedRealtime() - getuid);
for (Message imessage : isub) { Log.i(folder.name + " remote uids=" + stats.uids_ms + " ms");
long uid = ifolder.getUID(imessage); // already fetched
EntityMessage message = db.message().getMessageByUid(folder.id, uid);
if (message == null)
full.add(imessage);
}
if (full.size() > 0) {
long headers = SystemClock.elapsedRealtime();
ifolder.fetch(full.toArray(new Message[0]), fp);
stats.headers += full.size();
stats.headers_ms += (SystemClock.elapsedRealtime() - headers);
Log.i(folder.name + " fetched headers=" + full.size() + " " + stats.headers_ms + " ms");
} }
int free = Log.getFreeMemMb(); // Delete local messages not at remote
Map<String, String> crumb = new HashMap<>(); Log.i(folder.name + " delete=" + uids.size());
crumb.put("account", account.id + ":" + account.protocol); for (Long uid : uids) {
crumb.put("folder", folder.id + ":" + folder.type); int count = db.message().deleteMessage(folder.id, uid);
crumb.put("start", Integer.toString(from)); Log.i(folder.name + " delete local uid=" + uid + " count=" + count);
crumb.put("end", Integer.toString(i)); }
crumb.put("free", Integer.toString(free));
crumb.put("partial", Boolean.toString(account.partial_fetch));
Log.breadcrumb("sync", crumb);
Log.i("Sync " + from + ".." + i + " free=" + free);
for (int j = isub.length - 1; j >= 0; j--) {
state.ensureRunning("Sync/IMAP/sync");
try { List<EntityRule> rules = db.rule().getEnabledRules(folder.id);
// Some providers erroneously return old messages
if (full.contains(isub[j])) fp.add(FetchProfile.Item.ENVELOPE);
try { //fp.add(FetchProfile.Item.FLAGS);
Date received = isub[j].getReceivedDate(); fp.add(FetchProfile.Item.CONTENT_INFO); // body structure
boolean unseen = (sync_unseen && !isub[j].isSet(Flags.Flag.SEEN)); //fp.add(UIDFolder.FetchProfileItem.UID);
boolean flagged = (sync_flagged && isub[j].isSet(Flags.Flag.FLAGGED)); fp.add(IMAPFolder.FetchProfileItem.HEADERS);
if (received != null && received.getTime() < keep_time && !unseen && !flagged) { //fp.add(IMAPFolder.FetchProfileItem.MESSAGE);
long uid = ifolder.getUID(isub[j]); fp.add(FetchProfile.Item.SIZE);
Log.i(folder.name + " Skipping old uid=" + uid + " date=" + received); fp.add(IMAPFolder.FetchProfileItem.INTERNALDATE);
ids[from + j] = null; if (account.isGmail())
continue; fp.add(GmailFolder.FetchProfileItem.THRID);
}
} catch (Throwable ex) { // Add/update local messages
Log.w(ex); int synced = 0;
} Log.i(folder.name + " add=" + imessages.length);
for (int i = imessages.length - 1; i >= 0; i -= SYNC_BATCH_SIZE) {
state.ensureRunning("Sync/IMAP/sync/fetch");
int from = Math.max(0, i - SYNC_BATCH_SIZE + 1);
Message[] isub = Arrays.copyOfRange(imessages, from, i + 1);
// Full fetch new/changed messages only
List<Message> full = new ArrayList<>();
for (Message imessage : isub) {
long uid = ifolder.getUID(imessage); // already fetched
EntityMessage message = db.message().getMessageByUid(folder.id, uid);
if (message == null)
full.add(imessage);
}
if (full.size() > 0) {
long headers = SystemClock.elapsedRealtime();
ifolder.fetch(full.toArray(new Message[0]), fp);
stats.headers += full.size();
stats.headers_ms += (SystemClock.elapsedRealtime() - headers);
Log.i(folder.name + " fetched headers=" + full.size() + " " + stats.headers_ms + " ms");
}
EntityMessage message = synchronizeMessage( int free = Log.getFreeMemMb();
context, Map<String, String> crumb = new HashMap<>();
account, folder, crumb.put("account", account.id + ":" + account.protocol);
istore, ifolder, (MimeMessage) isub[j], crumb.put("folder", folder.id + ":" + folder.type);
false, download && initialize == 0, crumb.put("start", Integer.toString(from));
rules, state, stats); crumb.put("end", Integer.toString(i));
ids[from + j] = (message == null || message.ui_hide ? null : message.id); crumb.put("free", Integer.toString(free));
crumb.put("partial", Boolean.toString(account.partial_fetch));
Log.breadcrumb("sync", crumb);
Log.i("Sync " + from + ".." + i + " free=" + free);
for (int j = isub.length - 1; j >= 0; j--) {
state.ensureRunning("Sync/IMAP/sync");
if (message != null && full.contains(isub[j])) try {
if ((++synced % SYNC_YIELD_COUNT) == 0) // Some providers erroneously return old messages
if (full.contains(isub[j]))
try { try {
Log.i(folder.name + " yield synced=" + synced); Date received = isub[j].getReceivedDate();
Thread.sleep(SYNC_YIELD_DURATION); boolean unseen = (sync_unseen && !isub[j].isSet(Flags.Flag.SEEN));
} catch (InterruptedException ex) { boolean flagged = (sync_flagged && isub[j].isSet(Flags.Flag.FLAGGED));
if (received != null && received.getTime() < keep_time && !unseen && !flagged) {
long uid = ifolder.getUID(isub[j]);
Log.i(folder.name + " Skipping old uid=" + uid + " date=" + received);
ids[from + j] = null;
continue;
}
} catch (Throwable ex) {
Log.w(ex); Log.w(ex);
} }
} catch (MessageRemovedException ex) {
Log.w(folder.name, ex); EntityMessage message = synchronizeMessage(
} catch (FolderClosedException ex) { context,
throw ex; account, folder,
} catch (IOException ex) { istore, ifolder, (MimeMessage) isub[j],
if (ex.getCause() instanceof MessagingException) { false, download && initialize == 0,
rules, state, stats);
ids[from + j] = (message == null || message.ui_hide ? null : message.id);
if (message != null && full.contains(isub[j]))
if ((++synced % SYNC_YIELD_COUNT) == 0)
try {
Log.i(folder.name + " yield synced=" + synced);
Thread.sleep(SYNC_YIELD_DURATION);
} catch (InterruptedException ex) {
Log.w(ex);
}
} catch (MessageRemovedException ex) {
Log.w(folder.name, ex); Log.w(folder.name, ex);
db.folder().setFolderError(folder.id, Log.formatThrowable(ex)); } catch (FolderClosedException ex) {
} else
throw ex; throw ex;
} catch (Throwable ex) { } catch (IOException ex) {
Log.e(folder.name, ex); if (ex.getCause() instanceof MessagingException) {
db.folder().setFolderError(folder.id, Log.formatThrowable(ex)); Log.w(folder.name, ex);
} finally { db.folder().setFolderError(folder.id, Log.formatThrowable(ex));
// Free memory } else
isub[j] = null; throw ex;
} catch (Throwable ex) {
Log.e(folder.name, ex);
db.folder().setFolderError(folder.id, Log.formatThrowable(ex));
} finally {
// Free memory
isub[j] = null;
}
} }
} }
} }
} else {
List<Message> _imessages = new ArrayList<>();
List<Long> _ids = new ArrayList<>();
List<EntityMessage> messages = db.message().getMessagesWithoutContent(
folder.id, sync_kept || force ? null : sync_time);
if (messages != null) {
Log.i(folder.name + " needs content=" + messages.size());
for (EntityMessage message : messages) {
Message imessage = ifolder.getMessageByUID(message.uid);
if (imessage != null) {
_imessages.add(imessage);
_ids.add(message.id);
}
}
}
search = SystemClock.elapsedRealtime();
imessages = _imessages.toArray(new Message[0]);
ids = _ids.toArray(new Long[0]);
} }
// Delete not synchronized messages without uid // Delete not synchronized messages without uid

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

@ -566,6 +566,13 @@ public interface DaoMessage {
" AND NOT uid IS NULL") " AND NOT uid IS NULL")
List<Long> getUids(long folder, Long received); List<Long> getUids(long folder, Long received);
@Query("SELECT * FROM message" +
" WHERE folder = :folder" +
" AND (:received IS NULL OR received >= :received)" +
" AND NOT uid IS NULL" +
" AND NOT content")
List<EntityMessage> getMessagesWithoutContent(long folder, Long received);
@Query("SELECT uid FROM message" + @Query("SELECT uid FROM message" +
" WHERE folder = :folder" + " WHERE folder = :folder" +
" AND NOT ui_busy IS NULL" + " AND NOT ui_busy IS NULL" +

21
app/src/main/java/eu/faircode/email/FragmentOptionsSynchronize.java
Unescape View File

@ -72,6 +72,8 @@ public class FragmentOptionsSynchronize extends FragmentBase implements SharedPr
private CheckBox[] cbDay; private CheckBox[] cbDay;
private ImageButton ibSchedules; private ImageButton ibSchedules;
private SwitchCompat swQuickSyncImap;
private SwitchCompat swQuickSyncPop;
private SwitchCompat swNodate; private SwitchCompat swNodate;
private SwitchCompat swUnseen; private SwitchCompat swUnseen;
private SwitchCompat swFlagged; private SwitchCompat swFlagged;
@ -96,6 +98,7 @@ public class FragmentOptionsSynchronize extends FragmentBase implements SharedPr
private final static String[] RESET_OPTIONS = new String[]{ private final static String[] RESET_OPTIONS = new String[]{
"enabled", "poll_interval", "auto_optimize", "schedule", "schedule_start", "schedule_end", "enabled", "poll_interval", "auto_optimize", "schedule", "schedule_start", "schedule_end",
"sync_quick_imap", "sync_quick_pop",
"sync_nodate", "sync_unseen", "sync_flagged", "delete_unseen", "sync_kept", "gmail_thread_id", "sync_nodate", "sync_unseen", "sync_flagged", "delete_unseen", "sync_kept", "gmail_thread_id",
"sync_folders", "sync_shared_folders", "subscriptions", "sync_folders", "sync_shared_folders", "subscriptions",
"check_authentication", "check_reply_domain", "check_mx", "check_blocklist", "use_blocklist", "check_authentication", "check_reply_domain", "check_mx", "check_blocklist", "use_blocklist",
@ -133,6 +136,8 @@ public class FragmentOptionsSynchronize extends FragmentBase implements SharedPr
}; };
ibSchedules = view.findViewById(R.id.ibSchedules); ibSchedules = view.findViewById(R.id.ibSchedules);
swQuickSyncImap = view.findViewById(R.id.swQuickSyncImap);
swQuickSyncPop = view.findViewById(R.id.swQuickSyncPop);
swNodate = view.findViewById(R.id.swNodate); swNodate = view.findViewById(R.id.swNodate);
swUnseen = view.findViewById(R.id.swUnseen); swUnseen = view.findViewById(R.id.swUnseen);
swFlagged = view.findViewById(R.id.swFlagged); swFlagged = view.findViewById(R.id.swFlagged);
@ -260,6 +265,20 @@ public class FragmentOptionsSynchronize extends FragmentBase implements SharedPr
} }
}); });
swQuickSyncImap.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
prefs.edit().putBoolean("sync_quick_imap", checked).apply();
}
});
swQuickSyncPop.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
prefs.edit().putBoolean("sync_quick_pop", checked).apply();
}
});
swNodate.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { swNodate.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override @Override
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) { public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
@ -448,6 +467,8 @@ public class FragmentOptionsSynchronize extends FragmentBase implements SharedPr
for (int i = 0; i < 7; i++) for (int i = 0; i < 7; i++)
cbDay[i].setChecked(prefs.getBoolean("schedule_day" + i, true)); cbDay[i].setChecked(prefs.getBoolean("schedule_day" + i, true));
swQuickSyncImap.setChecked(prefs.getBoolean("sync_quick_imap", false));
swQuickSyncPop.setChecked(prefs.getBoolean("sync_quick_pop", true));
swNodate.setChecked(prefs.getBoolean("sync_nodate", false)); swNodate.setChecked(prefs.getBoolean("sync_nodate", false));
swUnseen.setChecked(prefs.getBoolean("sync_unseen", false)); swUnseen.setChecked(prefs.getBoolean("sync_unseen", false));
swFlagged.setChecked(prefs.getBoolean("sync_flagged", false)); swFlagged.setChecked(prefs.getBoolean("sync_flagged", false));

53
app/src/main/res/layout/fragment_options_synchronize.xml
Unescape View File

@ -372,6 +372,57 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvQuickSync"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:layout_marginEnd="48dp"
android:text="@string/title_advanced_quick_sync"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="?android:attr/textColorPrimary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvAdvanced" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvQuickSyncHint"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:layout_marginEnd="48dp"
android:text="@string/title_advanced_quick_sync_hint"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textStyle="italic"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvQuickSync" />
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/swQuickSyncImap"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginTop="12dp"
android:text="@string/title_imap"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvQuickSyncHint"
app:switchPadding="12dp" />
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/swQuickSyncPop"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginTop="12dp"
android:checked="true"
android:text="@string/title_pop3"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/swQuickSyncImap"
app:switchPadding="12dp" />
<androidx.appcompat.widget.SwitchCompat <androidx.appcompat.widget.SwitchCompat
android:id="@+id/swNodate" android:id="@+id/swNodate"
android:layout_width="0dp" android:layout_width="0dp"
@ -380,7 +431,7 @@
android:text="@string/title_advanced_no_date" android:text="@string/title_advanced_no_date"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvAdvanced" app:layout_constraintTop_toBottomOf="@id/swQuickSyncPop"
app:switchPadding="12dp" /> app:switchPadding="12dp" />
<eu.faircode.email.FixedTextView <eu.faircode.email.FixedTextView

2
app/src/main/res/values/strings.xml
Unescape View File

@ -320,6 +320,7 @@
<string name="title_advanced_always">Always receive messages for these accounts</string> <string name="title_advanced_always">Always receive messages for these accounts</string>
<string name="title_advanced_schedule">Schedule</string> <string name="title_advanced_schedule">Schedule</string>
<string name="title_advanced_advanced">Advanced</string> <string name="title_advanced_advanced">Advanced</string>
<string name="title_advanced_quick_sync">Quick sync</string>
<string name="title_advanced_no_date">Messages without date</string> <string name="title_advanced_no_date">Messages without date</string>
<string name="title_advanced_unseen">All unread messages</string> <string name="title_advanced_unseen">All unread messages</string>
<string name="title_advanced_flagged">All starred messages</string> <string name="title_advanced_flagged">All starred messages</string>
@ -628,6 +629,7 @@
<string name="title_advanced_poll_hint">Periodically checking for new messages will compare local and remote messages every time, which is an expensive operation that may result in extra battery usage, especially if there are a lot of messages. Always receive will prevent this by continuously following changes.</string> <string name="title_advanced_poll_hint">Periodically checking for new messages will compare local and remote messages every time, which is an expensive operation that may result in extra battery usage, especially if there are a lot of messages. Always receive will prevent this by continuously following changes.</string>
<string name="title_advanced_optimize_hint">This might change the sync frequency to save battery usage depending on the capabilities and behavior of the email servers</string> <string name="title_advanced_optimize_hint">This might change the sync frequency to save battery usage depending on the capabilities and behavior of the email servers</string>
<string name="title_advanced_schedule_hint">Tap on a time to set a time</string> <string name="title_advanced_schedule_hint">Tap on a time to set a time</string>
<string name="title_advanced_quick_sync_hint">This reduces data usage, but new messages might be missed if the email server doesn\'t follow the standards</string>
<string name="title_advanced_no_date_hint">Some providers store messages with an unknown, invalid or future date as messages without date</string> <string name="title_advanced_no_date_hint">Some providers store messages with an unknown, invalid or future date as messages without date</string>
<string name="title_advanced_unseen_hint">Some providers don\'t support this properly, which may cause synchronizing none or all messages</string> <string name="title_advanced_unseen_hint">Some providers don\'t support this properly, which may cause synchronizing none or all messages</string>
<string name="title_advanced_deleted_unseen">When disabled, unread messages are kept on the device forever</string> <string name="title_advanced_deleted_unseen">When disabled, unread messages are kept on the device forever</string>

Write Preview
Loading…
Cancel
Save