Misc ISPDB URLs

pull/210/head
M66B 2 years ago
parent 95edf57666
commit 5c63edc69c

@ -0,0 +1,29 @@
package eu.faircode.email;
/*
This file is part of FairEmail.
FairEmail is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
FairEmail is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with FairEmail. If not, see <http://www.gnu.org/licenses/>.
Copyright 2018-2022 by Marcel Bokhorst (M66B)
*/
import java.util.ArrayList;
import java.util.List;
public class Misc {
public static List<String> getISPDBUrls(String domain, String email) {
return new ArrayList<>();
}
}

@ -0,0 +1,33 @@
package eu.faircode.email;
/*
This file is part of FairEmail.
FairEmail is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
FairEmail is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with FairEmail. If not, see <http://www.gnu.org/licenses/>.
Copyright 2018-2022 by Marcel Bokhorst (M66B)
*/
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
public class Misc {
public static List<String> getISPDBUrls(String domain, String email) {
return Collections.unmodifiableList(Arrays.asList(
"https://autoconfig." + domain + "/mail/config-v1.1.xml?emailaddress=" + email,
"https://" + domain + "/.well-known/autoconfig/mail/config-v1.1.xml?emailaddress=" + email
));
}
}

@ -598,22 +598,14 @@ public class EmailProvider implements Parcelable {
@NonNull
private static EmailProvider fromISPDB(Context context, String domain, String email) throws Throwable {
// https://wiki.mozilla.org/Thunderbird:Autoconfiguration
if (!BuildConfig.PLAY_STORE_RELEASE) {
for (String link : Misc.getISPDBUrls(domain, email))
try {
URL url = new URL("https://autoconfig." + domain + "/mail/config-v1.1.xml?emailaddress=" + email);
URL url = new URL(link);
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);
}
}
URL url = new URL("https://autoconfig.thunderbird.net/v1.1/" + domain);
return getISPDB(context, domain, url);
}

Loading…
Cancel
Save