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

Check delete flag on sync

Browse Source
pull/162/head
M66B 5 years ago
parent a4e8f8fb3c
commit 0ff2c5a45d
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File

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

@ -44,6 +44,7 @@ import com.sun.mail.iap.Response;
import com.sun.mail.imap.IMAPFolder; import com.sun.mail.imap.IMAPFolder;
import com.sun.mail.imap.IMAPMessage; import com.sun.mail.imap.IMAPMessage;
import com.sun.mail.imap.IMAPStore; import com.sun.mail.imap.IMAPStore;
import com.sun.mail.imap.protocol.FLAGS;
import com.sun.mail.imap.protocol.FetchResponse; import com.sun.mail.imap.protocol.FetchResponse;
import com.sun.mail.imap.protocol.IMAPProtocol; import com.sun.mail.imap.protocol.IMAPProtocol;
import com.sun.mail.imap.protocol.UID; import com.sun.mail.imap.protocol.UID;
@ -1115,7 +1116,8 @@ class Core {
for (int i = 0; i < imessages.length && state.isRunning() && state.isRecoverable(); i++) for (int i = 0; i < imessages.length && state.isRunning() && state.isRecoverable(); i++)
try { try {
uids.remove(ifolder.getUID(imessages[i])); if (!imessages[i].isSet(Flags.Flag.DELETED))
uids.remove(ifolder.getUID(imessages[i]));
} catch (MessageRemovedException ex) { } catch (MessageRemovedException ex) {
Log.w(folder.name, ex); Log.w(folder.name, ex);
} catch (Throwable ex) { } catch (Throwable ex) {
@ -1165,14 +1167,15 @@ class Core {
else else
sb.append(range.first).append(':').append(range.second); sb.append(range.first).append(':').append(range.second);
} }
Response[] responses = protocol.command("UID FETCH " + sb + " (UID)", null); Response[] responses = protocol.command("UID FETCH " + sb + " (UID FLAGS)", null);
if (responses.length > 0 && responses[responses.length - 1].isOK()) { if (responses.length > 0 && responses[responses.length - 1].isOK()) {
for (Response response : responses) for (Response response : responses)
if (response instanceof FetchResponse) { if (response instanceof FetchResponse) {
FetchResponse fr = (FetchResponse) response; FetchResponse fr = (FetchResponse) response;
UID uid = fr.getItem(UID.class); UID uid = fr.getItem(UID.class);
if (uid != null) FLAGS flags = fr.getItem(FLAGS.class);
if (uid != null && (flags == null || !flags.contains(Flags.Flag.DELETED)))
uids.remove(uid.uid); uids.remove(uid.uid);
} }
} else { } else {

Write Preview
Loading…
Cancel
Save