mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Simplification

This commit is contained in:
M66B 2020-07-05 17:24:56 +02:00
parent dbc9a14415
commit c7f1ba9665
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/sun/mail/imap/IMAPStore.java
View File

@ -1014,9 +1014,8 @@ public class IMAPStore extends Store
p.disconnect();
} catch (Exception ex2) { }
p = null;
MessagingException failure = new MessagingException("connection failure", ex1);
eu.faircode.email.Log.w(failure);
throw failure;
eu.faircode.email.Log.e(new MessagingException("IMAP connection failure", ex1));
throw new MessagingException("connection failure", ex1);
}
if (p == null)

11
patches/JavaMail.patch
View File

@ -1,18 +1,17 @@
diff --git a/app/src/main/java/com/sun/mail/imap/IMAPStore.java b/app/src/main/java/com/sun/mail/imap/IMAPStore.java
index 866f17737..febd8b5d6 100644
index 866f17737..929e82d33 100644
--- a/app/src/main/java/com/sun/mail/imap/IMAPStore.java
+++ b/app/src/main/java/com/sun/mail/imap/IMAPStore.java
@@ -1014,6 +1014,9 @@ public class IMAPStore extends Store
@@ -1014,6 +1014,8 @@ public class IMAPStore extends Store
p.disconnect();
} catch (Exception ex2) { }
p = null;
+ MessagingException failure = new MessagingException("connection failure", ex1);
+ eu.faircode.email.Log.w(failure);
+ throw failure;
+ eu.faircode.email.Log.e(new MessagingException("IMAP connection failure", ex1));
+ throw new MessagingException("connection failure", ex1);
}
if (p == null)
@@ -1529,6 +1532,30 @@ public class IMAPStore extends Store
@@ -1529,6 +1531,30 @@ public class IMAPStore extends Store
}
}