From dd26997b6bdfc43e91c72bf36d6f43aed5f04685 Mon Sep 17 00:00:00 2001 From: M66B Date: Sun, 30 Dec 2018 13:54:49 +0000 Subject: [PATCH] Added text --- app/src/main/java/eu/faircode/email/Provider.java | 13 ++++++++----- app/src/main/res/values/strings.xml | 1 + 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/Provider.java b/app/src/main/java/eu/faircode/email/Provider.java index 86f353627a..a0ff1b915a 100644 --- a/app/src/main/java/eu/faircode/email/Provider.java +++ b/app/src/main/java/eu/faircode/email/Provider.java @@ -129,11 +129,11 @@ public class Provider { static Provider fromDomain(Context context, String domain) throws IOException { try { - return Provider.fromISPDB(domain); + return Provider.fromISPDB(context, domain); } catch (Throwable ex) { Log.w(ex); try { - return Provider.fromDNS(domain); + return Provider.fromDNS(context, domain); } catch (UnknownHostException ex1) { Log.w(ex1); throw new UnknownHostException(context.getString(R.string.title_setup_no_settings, domain)); @@ -141,11 +141,14 @@ public class Provider { } } - private static Provider fromISPDB(String domain) throws IOException, XmlPullParserException { + private static Provider fromISPDB(Context context, String domain) throws IOException, XmlPullParserException { Provider provider = new Provider(domain); if ("gmail.com".equals(domain)) { provider.documentation = new StringBuilder(); - provider.documentation.append("Enable access for \"less secure\" apps"); + provider.documentation + .append("") + .append(context.getString(R.string.title_setup_setting_gmail)) + .append(""); } // https://wiki.mozilla.org/Thunderbird:Autoconfiguration:ConfigFileFormat @@ -320,7 +323,7 @@ public class Provider { return provider; } - private static Provider fromDNS(String domain) throws TextParseException, UnknownHostException { + private static Provider fromDNS(Context context, String domain) throws TextParseException, UnknownHostException { // https://tools.ietf.org/html/rfc6186 SRVRecord imap = lookup("_imaps._tcp." + domain); SRVRecord smtp = lookup("_submission._tcp." + domain); diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 96d43f8666..abba5c155d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -87,6 +87,7 @@ Settings imported Quick config Quick config can be used for most major providers + Enable access for "less secure" apps No settings found for \'%1$s\' An account and an identity have been added. You can review the details below using the \'manage\' buttons. You can try to configure an account and an identity below too