mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2024-12-22 15:55:57 +00:00
Code Issues Releases Wiki Activity

Check for message removed exception

Browse source
This commit is contained in:
M66B 2018-08-02 16:24:23 +00:00
parent a4dccc09d0
commit e68142de47
1 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/src/main/java/eu/faircode/email/ServiceSynchronize.java
View file

@ -419,11 +419,14 @@ public class ServiceSynchronize extends LifecycleService {
public void messagesRemoved(MessageCountEvent e) { public void messagesRemoved(MessageCountEvent e) {
try { try {
Log.i(Helper.TAG, folder.name + " messages removed"); Log.i(Helper.TAG, folder.name + " messages removed");
for (Message imessage : e.getMessages()) { for (Message imessage : e.getMessages())
try {
long uid = ffolder.getUID(imessage); long uid = ffolder.getUID(imessage);
DB db = DB.getInstance(ServiceSynchronize.this); DB db = DB.getInstance(ServiceSynchronize.this);
db.message().deleteMessage(folder.id, uid); db.message().deleteMessage(folder.id, uid);
Log.i(Helper.TAG, "Deleted uid=" + uid); Log.i(Helper.TAG, "Deleted uid=" + uid);
} catch (MessageRemovedException ex) {
Log.w(Helper.TAG, folder.name + " " + ex + "\n" + Log.getStackTraceString(ex));
} }
} catch (Throwable ex) { } catch (Throwable ex) {
Log.e(Helper.TAG, folder.name + " " + ex + "\n" + Log.getStackTraceString(ex)); Log.e(Helper.TAG, folder.name + " " + ex + "\n" + Log.getStackTraceString(ex));
@ -804,10 +807,12 @@ public class ServiceSynchronize extends LifecycleService {
List<Message> added = new ArrayList<>(); List<Message> added = new ArrayList<>();
for (Message imessage : imessages) for (Message imessage : imessages)
if (!imessage.isExpunged() && !imessage.isSet(Flags.Flag.DELETED)) { try {
long uid = ifolder.getUID(imessage); long uid = ifolder.getUID(imessage);
if (!uids.remove(uid)) if (!uids.remove(uid))
added.add(imessage); added.add(imessage);
} catch (MessageRemovedException ex) {
Log.w(Helper.TAG, folder.name + " " + ex + "\n" + Log.getStackTraceString(ex));
} }
// Delete local messages not at remote // Delete local messages not at remote
@ -845,13 +850,6 @@ public class ServiceSynchronize extends LifecycleService {
fp.add(IMAPFolder.FetchProfileItem.FLAGS); fp.add(IMAPFolder.FetchProfileItem.FLAGS);
ifolder.fetch(new Message[]{imessage}, fp); ifolder.fetch(new Message[]{imessage}, fp);
boolean expunged = imessage.isExpunged();
boolean deleted = (!expunged && imessage.isSet(Flags.Flag.DELETED));
if (expunged || deleted) {
Log.i(Helper.TAG, "Message gone expunged=" + expunged + " deleted=" + deleted);
return;
}
long uid = ifolder.getUID(imessage); long uid = ifolder.getUID(imessage);
Log.i(Helper.TAG, folder.name + " sync uid=" + uid); Log.i(Helper.TAG, folder.name + " sync uid=" + uid);