mirror of https://github.com/M66B/FairEmail.git
Refactoring
This commit is contained in:
parent
f8a9f3326d
commit
bfd72ef25e
|
@ -59,12 +59,8 @@ public class EmailProvider {
|
||||||
public int order;
|
public int order;
|
||||||
public String type;
|
public String type;
|
||||||
public int keepalive;
|
public int keepalive;
|
||||||
public String imap_host;
|
public Server imap = new Server();
|
||||||
public boolean imap_starttls;
|
public Server smtp = new Server();
|
||||||
public int imap_port;
|
|
||||||
public String smtp_host;
|
|
||||||
public int smtp_port;
|
|
||||||
public boolean smtp_starttls;
|
|
||||||
public UserType user = UserType.EMAIL;
|
public UserType user = UserType.EMAIL;
|
||||||
public StringBuilder documentation; // html
|
public StringBuilder documentation; // html
|
||||||
|
|
||||||
|
@ -75,6 +71,9 @@ public class EmailProvider {
|
||||||
private static final int DNS_TIMEOUT = 5 * 1000; // milliseconds
|
private static final int DNS_TIMEOUT = 5 * 1000; // milliseconds
|
||||||
private static final int ISPDB_TIMEOUT = 20 * 1000; // milliseconds
|
private static final int ISPDB_TIMEOUT = 20 * 1000; // milliseconds
|
||||||
|
|
||||||
|
private static final ExecutorService executor =
|
||||||
|
Executors.newCachedThreadPool(Helper.backgroundThreadFactory);
|
||||||
|
|
||||||
private EmailProvider() {
|
private EmailProvider() {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -83,8 +82,8 @@ public class EmailProvider {
|
||||||
}
|
}
|
||||||
|
|
||||||
private void checkValid() throws UnknownHostException {
|
private void checkValid() throws UnknownHostException {
|
||||||
if (this.imap_host == null || this.imap_port == 0 ||
|
if (this.imap.host == null || this.imap.port == 0 ||
|
||||||
this.smtp_host == null || this.smtp_port == 0)
|
this.smtp.host == null || this.smtp.port == 0)
|
||||||
throw new UnknownHostException(this.name + " invalid");
|
throw new UnknownHostException(this.name + " invalid");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -107,13 +106,13 @@ public class EmailProvider {
|
||||||
provider.link = xml.getAttributeValue(null, "link");
|
provider.link = xml.getAttributeValue(null, "link");
|
||||||
provider.type = xml.getAttributeValue(null, "type");
|
provider.type = xml.getAttributeValue(null, "type");
|
||||||
} else if ("imap".equals(name)) {
|
} else if ("imap".equals(name)) {
|
||||||
provider.imap_host = xml.getAttributeValue(null, "host");
|
provider.imap.host = xml.getAttributeValue(null, "host");
|
||||||
provider.imap_port = xml.getAttributeIntValue(null, "port", 0);
|
provider.imap.port = xml.getAttributeIntValue(null, "port", 0);
|
||||||
provider.imap_starttls = xml.getAttributeBooleanValue(null, "starttls", false);
|
provider.imap.starttls = xml.getAttributeBooleanValue(null, "starttls", false);
|
||||||
} else if ("smtp".equals(name)) {
|
} else if ("smtp".equals(name)) {
|
||||||
provider.smtp_host = xml.getAttributeValue(null, "host");
|
provider.smtp.host = xml.getAttributeValue(null, "host");
|
||||||
provider.smtp_port = xml.getAttributeIntValue(null, "port", 0);
|
provider.smtp.port = xml.getAttributeIntValue(null, "port", 0);
|
||||||
provider.smtp_starttls = xml.getAttributeBooleanValue(null, "starttls", false);
|
provider.smtp.starttls = xml.getAttributeBooleanValue(null, "starttls", false);
|
||||||
} else
|
} else
|
||||||
throw new IllegalAccessException(name);
|
throw new IllegalAccessException(name);
|
||||||
} else if (eventType == XmlPullParser.END_TAG) {
|
} else if (eventType == XmlPullParser.END_TAG) {
|
||||||
|
@ -153,8 +152,8 @@ public class EmailProvider {
|
||||||
// - documentation links
|
// - documentation links
|
||||||
List<EmailProvider> providers = loadProfiles(context);
|
List<EmailProvider> providers = loadProfiles(context);
|
||||||
for (EmailProvider provider : providers)
|
for (EmailProvider provider : providers)
|
||||||
if (provider.imap_host.equals(autoconfig.imap_host) ||
|
if (provider.imap.host.equals(autoconfig.imap.host) ||
|
||||||
provider.smtp_host.equals(autoconfig.smtp_host)) {
|
provider.smtp.host.equals(autoconfig.smtp.host)) {
|
||||||
Log.i("Replacing autoconfig by profile " + provider.name);
|
Log.i("Replacing autoconfig by profile " + provider.name);
|
||||||
return provider;
|
return provider;
|
||||||
}
|
}
|
||||||
|
@ -252,9 +251,9 @@ public class EmailProvider {
|
||||||
String host = xml.getText();
|
String host = xml.getText();
|
||||||
Log.i("Host=" + host);
|
Log.i("Host=" + host);
|
||||||
if (imap)
|
if (imap)
|
||||||
provider.imap_host = host;
|
provider.imap.host = host;
|
||||||
else if (smtp)
|
else if (smtp)
|
||||||
provider.smtp_host = host;
|
provider.smtp.host = host;
|
||||||
}
|
}
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
@ -264,11 +263,11 @@ public class EmailProvider {
|
||||||
String port = xml.getText();
|
String port = xml.getText();
|
||||||
Log.i("Port=" + port);
|
Log.i("Port=" + port);
|
||||||
if (imap) {
|
if (imap) {
|
||||||
provider.imap_port = Integer.parseInt(port);
|
provider.imap.port = Integer.parseInt(port);
|
||||||
provider.imap_starttls = (provider.imap_port == 143);
|
provider.imap.starttls = (provider.imap.port == 143);
|
||||||
} else if (smtp) {
|
} else if (smtp) {
|
||||||
provider.smtp_port = Integer.parseInt(port);
|
provider.smtp.port = Integer.parseInt(port);
|
||||||
provider.smtp_starttls = (provider.smtp_port == 587);
|
provider.smtp.starttls = (provider.smtp.port == 587);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
continue;
|
continue;
|
||||||
|
@ -280,14 +279,14 @@ public class EmailProvider {
|
||||||
Log.i("Socket=" + socket);
|
Log.i("Socket=" + socket);
|
||||||
if ("SSL".equals(socket)) {
|
if ("SSL".equals(socket)) {
|
||||||
if (imap)
|
if (imap)
|
||||||
provider.imap_starttls = false;
|
provider.imap.starttls = false;
|
||||||
else if (smtp)
|
else if (smtp)
|
||||||
provider.smtp_starttls = false;
|
provider.smtp.starttls = false;
|
||||||
} else if ("STARTTLS".equals(socket)) {
|
} else if ("STARTTLS".equals(socket)) {
|
||||||
if (imap)
|
if (imap)
|
||||||
provider.imap_starttls = true;
|
provider.imap.starttls = true;
|
||||||
else if (smtp)
|
else if (smtp)
|
||||||
provider.smtp_starttls = true;
|
provider.smtp.starttls = true;
|
||||||
} else
|
} else
|
||||||
Log.w("Unknown socket type=" + socket);
|
Log.w("Unknown socket type=" + socket);
|
||||||
}
|
}
|
||||||
|
@ -359,8 +358,8 @@ public class EmailProvider {
|
||||||
|
|
||||||
request.disconnect();
|
request.disconnect();
|
||||||
|
|
||||||
Log.i("imap=" + provider.imap_host + ":" + provider.imap_port + ":" + provider.imap_starttls);
|
Log.i("imap=" + provider.imap.host + ":" + provider.imap.port + ":" + provider.imap.starttls);
|
||||||
Log.i("smtp=" + provider.smtp_host + ":" + provider.smtp_port + ":" + provider.smtp_starttls);
|
Log.i("smtp=" + provider.smtp.host + ":" + provider.smtp.port + ":" + provider.smtp.starttls);
|
||||||
|
|
||||||
provider.checkValid();
|
provider.checkValid();
|
||||||
|
|
||||||
|
@ -389,9 +388,9 @@ public class EmailProvider {
|
||||||
starttls = (imap.getPort() == 143);
|
starttls = (imap.getPort() == 143);
|
||||||
}
|
}
|
||||||
|
|
||||||
provider.imap_host = imap.getTarget().toString(true);
|
provider.imap.host = imap.getTarget().toString(true);
|
||||||
provider.imap_port = imap.getPort();
|
provider.imap.port = imap.getPort();
|
||||||
provider.imap_starttls = starttls;
|
provider.imap.starttls = starttls;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (discover == Discover.ALL || discover == Discover.SMTP) {
|
if (discover == Discover.ALL || discover == Discover.SMTP) {
|
||||||
|
@ -400,57 +399,14 @@ public class EmailProvider {
|
||||||
if (TextUtils.isEmpty(smtp.getTarget().toString(true)))
|
if (TextUtils.isEmpty(smtp.getTarget().toString(true)))
|
||||||
throw new UnknownHostException(smtp.toString());
|
throw new UnknownHostException(smtp.toString());
|
||||||
|
|
||||||
provider.smtp_host = smtp.getTarget().toString(true);
|
provider.smtp.host = smtp.getTarget().toString(true);
|
||||||
provider.smtp_port = smtp.getPort();
|
provider.smtp.port = smtp.getPort();
|
||||||
provider.smtp_starttls = (provider.smtp_port == 587);
|
provider.smtp.starttls = (provider.smtp.port == 587);
|
||||||
}
|
}
|
||||||
|
|
||||||
return provider;
|
return provider;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final ExecutorService executor =
|
|
||||||
Executors.newCachedThreadPool(Helper.backgroundThreadFactory);
|
|
||||||
|
|
||||||
private static class Server {
|
|
||||||
String host;
|
|
||||||
int port;
|
|
||||||
Future<Boolean> reachable;
|
|
||||||
|
|
||||||
Server(String domain, String prefix, int port) {
|
|
||||||
this.host = (prefix == null ? "" : prefix + ".") + domain;
|
|
||||||
this.port = port;
|
|
||||||
|
|
||||||
Log.i("Scanning " + host + ":" + port);
|
|
||||||
this.reachable = executor.submit(new Callable<Boolean>() {
|
|
||||||
@Override
|
|
||||||
public Boolean call() {
|
|
||||||
try (Socket socket = new Socket()) {
|
|
||||||
InetAddress[] iaddr = InetAddress.getAllByName(host);
|
|
||||||
for (int i = 0; i < iaddr.length; i++)
|
|
||||||
try {
|
|
||||||
Log.i("Connecting to " + iaddr[i]);
|
|
||||||
InetSocketAddress inetSocketAddress = new InetSocketAddress(iaddr[i], Server.this.port);
|
|
||||||
socket.connect(inetSocketAddress, DNS_TIMEOUT);
|
|
||||||
} catch (Throwable ex) {
|
|
||||||
if (i + 1 == iaddr.length)
|
|
||||||
throw ex;
|
|
||||||
}
|
|
||||||
Log.i("Reachable " + Server.this);
|
|
||||||
return true;
|
|
||||||
} catch (IOException ex) {
|
|
||||||
Log.i("Unreachable " + Server.this + ": " + Helper.formatThrowable(ex));
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String toString() {
|
|
||||||
return host + ":" + port;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static EmailProvider fromTemplate(Context context, String domain, Discover discover)
|
private static EmailProvider fromTemplate(Context context, String domain, Discover discover)
|
||||||
throws ExecutionException, InterruptedException, UnknownHostException {
|
throws ExecutionException, InterruptedException, UnknownHostException {
|
||||||
Server imap = null;
|
Server imap = null;
|
||||||
|
@ -507,15 +463,15 @@ public class EmailProvider {
|
||||||
provider.name = domain;
|
provider.name = domain;
|
||||||
|
|
||||||
if (imap != null) {
|
if (imap != null) {
|
||||||
provider.imap_host = imap.host;
|
provider.imap.host = imap.host;
|
||||||
provider.imap_port = imap.port;
|
provider.imap.port = imap.port;
|
||||||
provider.imap_starttls = (imap.port == 143);
|
provider.imap.starttls = (imap.port == 143);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (smtp != null) {
|
if (smtp != null) {
|
||||||
provider.smtp_host = smtp.host;
|
provider.smtp.host = smtp.host;
|
||||||
provider.smtp_port = smtp.port;
|
provider.smtp.port = smtp.port;
|
||||||
provider.smtp_starttls = (smtp.port == 587);
|
provider.smtp.starttls = (smtp.port == 587);
|
||||||
}
|
}
|
||||||
|
|
||||||
return provider;
|
return provider;
|
||||||
|
@ -555,4 +511,49 @@ public class EmailProvider {
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return name;
|
return name;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static class Server {
|
||||||
|
public String host;
|
||||||
|
public int port;
|
||||||
|
public boolean starttls;
|
||||||
|
|
||||||
|
private Future<Boolean> reachable;
|
||||||
|
|
||||||
|
private Server() {
|
||||||
|
}
|
||||||
|
|
||||||
|
private Server(String domain, String prefix, int port) {
|
||||||
|
this.host = (prefix == null ? "" : prefix + ".") + domain;
|
||||||
|
this.port = port;
|
||||||
|
|
||||||
|
Log.i("Scanning " + host + ":" + port);
|
||||||
|
this.reachable = executor.submit(new Callable<Boolean>() {
|
||||||
|
@Override
|
||||||
|
public Boolean call() {
|
||||||
|
try (Socket socket = new Socket()) {
|
||||||
|
InetAddress[] iaddr = InetAddress.getAllByName(host);
|
||||||
|
for (int i = 0; i < iaddr.length; i++)
|
||||||
|
try {
|
||||||
|
Log.i("Connecting to " + iaddr[i]);
|
||||||
|
InetSocketAddress inetSocketAddress = new InetSocketAddress(iaddr[i], Server.this.port);
|
||||||
|
socket.connect(inetSocketAddress, DNS_TIMEOUT);
|
||||||
|
} catch (Throwable ex) {
|
||||||
|
if (i + 1 == iaddr.length)
|
||||||
|
throw ex;
|
||||||
|
}
|
||||||
|
Log.i("Reachable " + Server.this);
|
||||||
|
return true;
|
||||||
|
} catch (IOException ex) {
|
||||||
|
Log.i("Unreachable " + Server.this + ": " + Helper.formatThrowable(ex));
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String toString() {
|
||||||
|
return host + ":" + port;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -246,9 +246,9 @@ public class FragmentAccount extends FragmentBase {
|
||||||
return;
|
return;
|
||||||
adapterView.setTag(position);
|
adapterView.setTag(position);
|
||||||
|
|
||||||
etHost.setText(provider.imap_host);
|
etHost.setText(provider.imap.host);
|
||||||
etPort.setText(provider.imap_host == null ? null : Integer.toString(provider.imap_port));
|
etPort.setText(provider.imap.host == null ? null : Integer.toString(provider.imap.port));
|
||||||
rgEncryption.check(provider.imap_starttls ? R.id.radio_starttls : R.id.radio_ssl);
|
rgEncryption.check(provider.imap.starttls ? R.id.radio_starttls : R.id.radio_ssl);
|
||||||
|
|
||||||
etUser.setTag(null);
|
etUser.setTag(null);
|
||||||
etUser.setText(null);
|
etUser.setText(null);
|
||||||
|
@ -448,9 +448,9 @@ public class FragmentAccount extends FragmentBase {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onExecuted(Bundle args, EmailProvider provider) {
|
protected void onExecuted(Bundle args, EmailProvider provider) {
|
||||||
etHost.setText(provider.imap_host);
|
etHost.setText(provider.imap.host);
|
||||||
etPort.setText(Integer.toString(provider.imap_port));
|
etPort.setText(Integer.toString(provider.imap.port));
|
||||||
rgEncryption.check(provider.imap_starttls ? R.id.radio_starttls : R.id.radio_ssl);
|
rgEncryption.check(provider.imap.starttls ? R.id.radio_starttls : R.id.radio_ssl);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -1144,9 +1144,9 @@ public class FragmentAccount extends FragmentBase {
|
||||||
boolean found = false;
|
boolean found = false;
|
||||||
for (int pos = 2; pos < providers.size(); pos++) {
|
for (int pos = 2; pos < providers.size(); pos++) {
|
||||||
EmailProvider provider = providers.get(pos);
|
EmailProvider provider = providers.get(pos);
|
||||||
if (provider.imap_host.equals(account.host) &&
|
if (provider.imap.host.equals(account.host) &&
|
||||||
provider.imap_port == account.port &&
|
provider.imap.port == account.port &&
|
||||||
provider.imap_starttls == account.starttls) {
|
provider.imap.starttls == account.starttls) {
|
||||||
found = true;
|
found = true;
|
||||||
spProvider.setTag(pos);
|
spProvider.setTag(pos);
|
||||||
spProvider.setSelection(pos);
|
spProvider.setSelection(pos);
|
||||||
|
|
|
@ -232,17 +232,17 @@ public class FragmentIdentity extends FragmentBase {
|
||||||
boolean found = false;
|
boolean found = false;
|
||||||
for (int pos = 1; pos < spProvider.getAdapter().getCount(); pos++) {
|
for (int pos = 1; pos < spProvider.getAdapter().getCount(); pos++) {
|
||||||
EmailProvider provider = (EmailProvider) spProvider.getItemAtPosition(pos);
|
EmailProvider provider = (EmailProvider) spProvider.getItemAtPosition(pos);
|
||||||
if (provider.imap_host.equals(account.host) &&
|
if (provider.imap.host.equals(account.host) &&
|
||||||
provider.imap_port == account.port &&
|
provider.imap.port == account.port &&
|
||||||
provider.imap_starttls == account.starttls) {
|
provider.imap.starttls == account.starttls) {
|
||||||
found = true;
|
found = true;
|
||||||
|
|
||||||
spProvider.setSelection(pos);
|
spProvider.setSelection(pos);
|
||||||
|
|
||||||
// This is needed because the spinner might be invisible
|
// This is needed because the spinner might be invisible
|
||||||
etHost.setText(provider.smtp_host);
|
etHost.setText(provider.smtp.host);
|
||||||
etPort.setText(Integer.toString(provider.smtp_port));
|
etPort.setText(Integer.toString(provider.smtp.port));
|
||||||
rgEncryption.check(provider.smtp_starttls ? R.id.radio_starttls : R.id.radio_ssl);
|
rgEncryption.check(provider.smtp.starttls ? R.id.radio_starttls : R.id.radio_ssl);
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -358,9 +358,9 @@ public class FragmentIdentity extends FragmentBase {
|
||||||
EmailProvider provider = (EmailProvider) adapterView.getSelectedItem();
|
EmailProvider provider = (EmailProvider) adapterView.getSelectedItem();
|
||||||
|
|
||||||
// Set associated host/port/starttls
|
// Set associated host/port/starttls
|
||||||
etHost.setText(provider.smtp_host);
|
etHost.setText(provider.smtp.host);
|
||||||
etPort.setText(position == 0 ? null : Integer.toString(provider.smtp_port));
|
etPort.setText(position == 0 ? null : Integer.toString(provider.smtp.port));
|
||||||
rgEncryption.check(provider.smtp_starttls ? R.id.radio_starttls : R.id.radio_ssl);
|
rgEncryption.check(provider.smtp.starttls ? R.id.radio_starttls : R.id.radio_ssl);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -477,9 +477,9 @@ public class FragmentIdentity extends FragmentBase {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onExecuted(Bundle args, EmailProvider provider) {
|
protected void onExecuted(Bundle args, EmailProvider provider) {
|
||||||
etHost.setText(provider.smtp_host);
|
etHost.setText(provider.smtp.host);
|
||||||
etPort.setText(Integer.toString(provider.smtp_port));
|
etPort.setText(Integer.toString(provider.smtp.port));
|
||||||
rgEncryption.check(provider.smtp_starttls ? R.id.radio_starttls : R.id.radio_ssl);
|
rgEncryption.check(provider.smtp.starttls ? R.id.radio_starttls : R.id.radio_ssl);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -938,9 +938,9 @@ public class FragmentIdentity extends FragmentBase {
|
||||||
if (identity != null)
|
if (identity != null)
|
||||||
for (int pos = 1; pos < providers.size(); pos++) {
|
for (int pos = 1; pos < providers.size(); pos++) {
|
||||||
EmailProvider provider = providers.get(pos);
|
EmailProvider provider = providers.get(pos);
|
||||||
if (provider.smtp_host.equals(identity.host) &&
|
if (provider.smtp.host.equals(identity.host) &&
|
||||||
provider.smtp_port == identity.port &&
|
provider.smtp.port == identity.port &&
|
||||||
provider.smtp_starttls == identity.starttls) {
|
provider.smtp.starttls == identity.starttls) {
|
||||||
spProvider.setTag(pos);
|
spProvider.setTag(pos);
|
||||||
spProvider.setSelection(pos);
|
spProvider.setSelection(pos);
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -248,9 +248,9 @@ public class FragmentQuickSetup extends FragmentBase {
|
||||||
long now = new Date().getTime();
|
long now = new Date().getTime();
|
||||||
|
|
||||||
{
|
{
|
||||||
String protocol = provider.imap_starttls ? "imap" : "imaps";
|
String protocol = provider.imap.starttls ? "imap" : "imaps";
|
||||||
try (MailService iservice = new MailService(context, protocol, null, false, true)) {
|
try (MailService iservice = new MailService(context, protocol, null, false, true)) {
|
||||||
iservice.connect(provider.imap_host, provider.imap_port, user, password);
|
iservice.connect(provider.imap.host, provider.imap.port, user, password);
|
||||||
|
|
||||||
boolean inbox = false;
|
boolean inbox = false;
|
||||||
boolean drafts = false;
|
boolean drafts = false;
|
||||||
|
@ -310,9 +310,9 @@ public class FragmentQuickSetup extends FragmentBase {
|
||||||
}
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
String protocol = provider.smtp_starttls ? "smtp" : "smtps";
|
String protocol = provider.smtp.starttls ? "smtp" : "smtps";
|
||||||
try (MailService iservice = new MailService(context, protocol, null, false, true)) {
|
try (MailService iservice = new MailService(context, protocol, null, false, true)) {
|
||||||
iservice.connect(provider.smtp_host, provider.smtp_port, user, password);
|
iservice.connect(provider.smtp.host, provider.smtp.port, user, password);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -328,10 +328,10 @@ public class FragmentQuickSetup extends FragmentBase {
|
||||||
EntityAccount account = new EntityAccount();
|
EntityAccount account = new EntityAccount();
|
||||||
|
|
||||||
account.auth_type = ConnectionHelper.AUTH_TYPE_PASSWORD;
|
account.auth_type = ConnectionHelper.AUTH_TYPE_PASSWORD;
|
||||||
account.host = provider.imap_host;
|
account.host = provider.imap.host;
|
||||||
account.starttls = provider.imap_starttls;
|
account.starttls = provider.imap.starttls;
|
||||||
account.insecure = false;
|
account.insecure = false;
|
||||||
account.port = provider.imap_port;
|
account.port = provider.imap.port;
|
||||||
account.user = user;
|
account.user = user;
|
||||||
account.password = password;
|
account.password = password;
|
||||||
|
|
||||||
|
@ -382,10 +382,10 @@ public class FragmentQuickSetup extends FragmentBase {
|
||||||
identity.signature = null;
|
identity.signature = null;
|
||||||
|
|
||||||
identity.auth_type = ConnectionHelper.AUTH_TYPE_PASSWORD;
|
identity.auth_type = ConnectionHelper.AUTH_TYPE_PASSWORD;
|
||||||
identity.host = provider.smtp_host;
|
identity.host = provider.smtp.host;
|
||||||
identity.starttls = provider.smtp_starttls;
|
identity.starttls = provider.smtp.starttls;
|
||||||
identity.insecure = false;
|
identity.insecure = false;
|
||||||
identity.port = provider.smtp_port;
|
identity.port = provider.smtp.port;
|
||||||
identity.user = user;
|
identity.user = user;
|
||||||
identity.password = password;
|
identity.password = password;
|
||||||
identity.synchronize = true;
|
identity.synchronize = true;
|
||||||
|
@ -415,9 +415,9 @@ public class FragmentQuickSetup extends FragmentBase {
|
||||||
boolean check = args.getBoolean("check");
|
boolean check = args.getBoolean("check");
|
||||||
if (check) {
|
if (check) {
|
||||||
tvImap.setText(result == null ? null
|
tvImap.setText(result == null ? null
|
||||||
: result.imap_host + ":" + result.imap_port + (result.imap_starttls ? " starttls" : " ssl"));
|
: result.imap.host + ":" + result.imap.port + (result.imap.starttls ? " starttls" : " ssl"));
|
||||||
tvSmtp.setText(result == null ? null
|
tvSmtp.setText(result == null ? null
|
||||||
: result.smtp_host + ":" + result.smtp_port + (result.smtp_starttls ? " starttls" : " ssl"));
|
: result.smtp.host + ":" + result.smtp.port + (result.smtp.starttls ? " starttls" : " ssl"));
|
||||||
grpSetup.setVisibility(result == null ? View.GONE : View.VISIBLE);
|
grpSetup.setVisibility(result == null ? View.GONE : View.VISIBLE);
|
||||||
} else {
|
} else {
|
||||||
FragmentDialogDone fragment = new FragmentDialogDone();
|
FragmentDialogDone fragment = new FragmentDialogDone();
|
||||||
|
|
Loading…
Reference in New Issue