From f013811a89ae014b4816de8668237a99e43e2527 Mon Sep 17 00:00:00 2001 From: M66B Date: Sat, 31 Dec 2022 08:08:56 +0100 Subject: [PATCH] Use Thunderbird auto configuration only for Play store version --- .../java/eu/faircode/email/EmailProvider.java | 37 ++++++++----------- 1 file changed, 15 insertions(+), 22 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/EmailProvider.java b/app/src/main/java/eu/faircode/email/EmailProvider.java index 708526c0b7..a02fc02c8f 100644 --- a/app/src/main/java/eu/faircode/email/EmailProvider.java +++ b/app/src/main/java/eu/faircode/email/EmailProvider.java @@ -598,31 +598,24 @@ public class EmailProvider implements Parcelable { @NonNull private static EmailProvider fromISPDB(Context context, String domain, String email) throws Throwable { // https://wiki.mozilla.org/Thunderbird:Autoconfiguration - Throwable failure; - - try { - URL url = new URL("https://autoconfig." + domain + "/mail/config-v1.1.xml?emailaddress=" + email); - return getISPDB(context, domain, url); - } catch (Throwable ex) { - Log.i(ex); - failure = ex; - } - - try { - URL url = new URL("https://" + domain + "/.well-known/autoconfig/mail/config-v1.1.xml?emailaddress=" + email); - return getISPDB(context, domain, url); - } catch (Throwable ex) { - Log.i(ex); - } + if (!BuildConfig.PLAY_STORE_RELEASE) { + try { + URL url = new URL("https://autoconfig." + domain + "/mail/config-v1.1.xml?emailaddress=" + email); + return getISPDB(context, domain, url); + } catch (Throwable 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); + try { + URL url = new URL("https://" + domain + "/.well-known/autoconfig/mail/config-v1.1.xml?emailaddress=" + email); + return getISPDB(context, domain, url); + } catch (Throwable ex) { + Log.i(ex); + } } - throw failure; + URL url = new URL("https://autoconfig.thunderbird.net/v1.1/" + domain); + return getISPDB(context, domain, url); } @NonNull