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

Improved logging

Browse Source
pull/147/head
M66B 7 years ago
parent 1435671aa0
commit 898c30f4bf
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File

15
app/src/main/java/eu/faircode/email/ServiceSynchronize.java
Unescape View File

@ -2347,7 +2347,7 @@ public class ServiceSynchronize extends LifecycleService {
if (message == null) { if (message == null) {
// Will fetch headers within database transaction // Will fetch headers within database transaction
String msgid = helper.getMessageID(); String msgid = helper.getMessageID();
Log.i("Searching for " + msgid); Log.i(folder.name + " searching for " + msgid);
for (EntityMessage dup : db.message().getMessageByMsgId(folder.account, msgid)) { for (EntityMessage dup : db.message().getMessageByMsgId(folder.account, msgid)) {
EntityFolder dfolder = db.folder().getFolder(dup.folder); EntityFolder dfolder = db.folder().getFolder(dup.folder);
Log.i(folder.name + " found as id=" + dup.id + "/" + dup.uid + Log.i(folder.name + " found as id=" + dup.id + "/" + dup.uid +
@ -2362,20 +2362,23 @@ public class ServiceSynchronize extends LifecycleService {
" msgid=" + msgid + " thread=" + thread); " msgid=" + msgid + " thread=" + thread);
dup.folder = folder.id; // outbox to sent dup.folder = folder.id; // outbox to sent
if (dup.uid == null) if (dup.uid == null) {
Log.i(folder.name + " set uid=" + uid);
dup.uid = uid; dup.uid = uid;
else if (dup.uid != uid) { } else if (dup.uid != uid) {
if (EntityFolder.DRAFTS.equals(folder.type)) { if (EntityFolder.DRAFTS.equals(folder.type)) {
Log.i("Deleting previous uid=" + dup.uid); Log.i(folder.name + " deleting previous uid=" + dup.uid);
Message iprev = ifolder.getMessageByUID(dup.uid); Message iprev = ifolder.getMessageByUID(dup.uid);
if (iprev == null) if (iprev == null)
Log.w("Previous not found uid=" + dup.uid); Log.w(folder.name + " previous not found uid=" + dup.uid);
else { else {
iprev.setFlag(Flags.Flag.DELETED, true); iprev.setFlag(Flags.Flag.DELETED, true);
ifolder.expunge(); ifolder.expunge();
} }
Log.i(folder.name + " set uid=" + uid);
} else // Draft in Gmail archive } else // Draft in Gmail archive
Log.e("Changed uid=" + dup.uid + "/" + uid); Log.e(folder.name + " changed uid=" + dup.uid + "/" + uid);
dup.uid = uid; dup.uid = uid;
} }

Write Preview
Loading…
Cancel
Save