From c640571c4c7eab5a40b8f8235f11cc7cbf032fea Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 6 Sep 2021 07:56:57 +0200 Subject: [PATCH] Improved logging --- app/src/main/java/eu/faircode/email/Core.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java index 9de2b48ac0..cc50fff067 100644 --- a/app/src/main/java/eu/faircode/email/Core.java +++ b/app/src/main/java/eu/faircode/email/Core.java @@ -780,11 +780,13 @@ class Core { } private static Message findMessage(Context context, EntityFolder folder, EntityMessage message, POP3Store istore, POP3Folder ifolder) throws MessagingException, IOException { - Message[] imessages = ifolder.getMessages(); - Log.i(folder.name + " POP messages=" + imessages.length); - Map caps = istore.capabilities(); boolean hasUidl = caps.containsKey("UIDL"); + + Message[] imessages = ifolder.getMessages(); + Log.i(folder.name + " POP searching for=" + message.uidl + "/" + message.msgid + + " messages=" + imessages.length + " uidl=" + hasUidl); + if (hasUidl) { FetchProfile ifetch = new FetchProfile(); ifetch.add(UIDFolder.FetchProfileItem.UID); @@ -797,13 +799,14 @@ class Core { String uidl = (hasUidl ? ifolder.getUID(imessage) : null); String msgid = helper.getMessageID(); - Log.i(folder.name + " POP searching=" + message.uidl + "/" + message.msgid + - " iterate=" + uidl + "/" + msgid); if ((uidl != null && uidl.equals(message.uidl)) || - (msgid != null && msgid.equals(message.msgid))) + (msgid != null && msgid.equals(message.msgid))) { + Log.i(folder.name + " POP found=" + uidl + "/" + msgid); return imessage; + } } + Log.i(folder.name + " POP not found=" + message.uidl + "/" + message.msgid); return null; } @@ -2692,6 +2695,8 @@ class Core { if (download_eml) try { + Log.i(account.name + " POP raw " + msgid + "/" + uidl); + File raw = message.getRawFile(context); try (OutputStream os = new BufferedOutputStream(new FileOutputStream(raw))) { imessage.writeTo(os);