mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-02-22 22:21:18 +00:00
Code Issues Releases Wiki Activity

Added import error handling

Browse source
This commit is contained in:
M66B 2024-02-15 17:21:36 +01:00
parent d67d53a1d9
commit e88bca336c
1 changed files with 161 additions and 149 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/java/eu/faircode/email/FragmentFolders.java
View file

@ -1517,6 +1517,7 @@ public class FragmentFolders extends FragmentBase {
while ((line.value = br.readLine()) != null) {
line.value += "\n";
try {
MimeMessage imessage = new MimeMessage(isession, new InputStream() {
private int i = 0;
@ -1547,8 +1548,10 @@ public class FragmentFolders extends FragmentBase {
String msgid = helper.getPOP3MessageID();
int count = db.message().countMessageByMsgId(folder.id, msgid, true);
if (count == 1)
if (count == 1) {
EntityLog.log(context, "Import: message exists msgid=" + msgid);
continue;
}
Long sent = helper.getSent();
long received = helper.getPOP3Received();
@ -1681,6 +1684,15 @@ public class FragmentFolders extends FragmentBase {
} catch (Throwable ex) {
Log.w(ex);
}
} catch (Throwable ex) {
Log.e(ex);
EntityLog.log(context, "Import error=" + Log.formatThrowable(ex, false));
// Resync
while (line.value != null && !line.value.startsWith("From "))
line.value = br.readLine();
}
if (line.value == null)
break;