Reduced logging

pull/204/head
M66B 3 years ago
parent f4105b7167
commit cba0c3c246

@ -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);
}
try {
URL url = new URL("https://autoconfig.thunderbird.net/v1.1/" + domain);
return getISPDB(context, domain, url);
} catch (Throwable ex) {
Log.i(ex);
} }
URL url = new URL("https://autoconfig.thunderbird.net/v1.1/" + domain); throw failure;
return getISPDB(context, domain, url);
} }
@NonNull @NonNull

Loading…
Cancel
Save