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 2021-08-24 09:40:24 +02:00
parent f4105b7167
commit cba0c3c246
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/java/eu/faircode/email/EmailProvider.java
View File

@ -427,24 +427,33 @@ public class EmailProvider implements Parcelable {
} }
@NonNull @NonNull
private static EmailProvider fromISPDB(Context context, String domain, String email) throws IOException, XmlPullParserException { private static EmailProvider fromISPDB(Context context, String domain, String email) throws Throwable {
// https://wiki.mozilla.org/Thunderbird:Autoconfiguration // https://wiki.mozilla.org/Thunderbird:Autoconfiguration
Throwable failure;
try { try {
URL url = new URL("https://autoconfig." + domain + "/mail/config-v1.1.xml?emailaddress=" + email); URL url = new URL("https://autoconfig." + domain + "/mail/config-v1.1.xml?emailaddress=" + email);
return getISPDB(context, domain, url); return getISPDB(context, domain, url);
} catch (Throwable ex) { } catch (Throwable ex) {
Log.w(ex); Log.i(ex);
failure = ex;
} }
try { try {
URL url = new URL("https://" + domain + "/.well-known/autoconfig/mail/config-v1.1.xml?emailaddress=" + email); URL url = new URL("https://" + domain + "/.well-known/autoconfig/mail/config-v1.1.xml?emailaddress=" + email);
return getISPDB(context, domain, url); return getISPDB(context, domain, url);
} catch (Throwable ex) { } catch (Throwable ex) {
Log.w(ex); Log.i(ex);
} }
URL url = new URL("https://autoconfig.thunderbird.net/v1.1/" + domain); try {
return getISPDB(context, domain, url); URL url = new URL("https://autoconfig.thunderbird.net/v1.1/" + domain);
return getISPDB(context, domain, url);
} catch (Throwable ex) {
Log.i(ex);
}
throw failure;
} }
@NonNull @NonNull