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

Reduced logging

This commit is contained in:
M66B 2020-07-18 11:45:36 +02:00
parent 91cd5fa20c
commit b996d1313b
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -902,7 +902,6 @@ public class IMAPStore extends Store
} }
} catch (ProtocolException ex) { } catch (ProtocolException ex) {
if (m.equals("PLAIN") || m.equals("LOGIN")) { if (m.equals("PLAIN") || m.equals("LOGIN")) {
eu.faircode.email.Log.w(ex);
eu.faircode.email.Log.i("Falling back to classic LOGIN"); eu.faircode.email.Log.i("Falling back to classic LOGIN");
p.authclassic(user, password); p.authclassic(user, password);
} else } else

17
patches/Scarlet.patch
View File

@ -1,8 +1,8 @@
diff --git a/app/src/main/java/com/sun/mail/imap/IMAPStore.java b/app/src/main/java/com/sun/mail/imap/IMAPStore.java diff --git b/app/src/main/java/com/sun/mail/imap/IMAPStore.java a/app/src/main/java/com/sun/mail/imap/IMAPStore.java
index 929e82d33..cc9b7cca9 100644 index 929e82d33..93aa05e5f 100644
--- a/app/src/main/java/com/sun/mail/imap/IMAPStore.java --- b/app/src/main/java/com/sun/mail/imap/IMAPStore.java
+++ b/app/src/main/java/com/sun/mail/imap/IMAPStore.java +++ a/app/src/main/java/com/sun/mail/imap/IMAPStore.java
@@ -887,18 +887,27 @@ public class IMAPStore extends Store @@ -887,18 +887,26 @@ public class IMAPStore extends Store
continue; continue;
} }
@ -33,7 +33,6 @@ index 929e82d33..cc9b7cca9 100644
+ } + }
+ } catch (ProtocolException ex) { + } catch (ProtocolException ex) {
+ if (m.equals("PLAIN") || m.equals("LOGIN")) { + if (m.equals("PLAIN") || m.equals("LOGIN")) {
+ eu.faircode.email.Log.w(ex);
+ eu.faircode.email.Log.i("Falling back to classic LOGIN"); + eu.faircode.email.Log.i("Falling back to classic LOGIN");
+ p.authclassic(user, password); + p.authclassic(user, password);
+ } else + } else
@ -42,10 +41,10 @@ index 929e82d33..cc9b7cca9 100644
return; return;
} }
diff --git a/app/src/main/java/com/sun/mail/imap/protocol/IMAPProtocol.java b/app/src/main/java/com/sun/mail/imap/protocol/IMAPProtocol.java diff --git b/app/src/main/java/com/sun/mail/imap/protocol/IMAPProtocol.java a/app/src/main/java/com/sun/mail/imap/protocol/IMAPProtocol.java
index a8a88b6c0..ff300bbfd 100644 index a8a88b6c0..ff300bbfd 100644
--- a/app/src/main/java/com/sun/mail/imap/protocol/IMAPProtocol.java --- b/app/src/main/java/com/sun/mail/imap/protocol/IMAPProtocol.java
+++ b/app/src/main/java/com/sun/mail/imap/protocol/IMAPProtocol.java +++ a/app/src/main/java/com/sun/mail/imap/protocol/IMAPProtocol.java
@@ -627,6 +627,59 @@ public class IMAPProtocol extends Protocol { @@ -627,6 +627,59 @@ public class IMAPProtocol extends Protocol {
authenticated = true; authenticated = true;
} }