Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-02 07:06:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use service authenticator

Browse Source
This commit is contained in:
M66B
2020-10-25 22:20:48 +01:00
parent b5443dd4f9
commit 480eaa18f6
14 changed files with 314 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
View File

@@ -54,6 +54,8 @@ import java.util.List;
import javax.mail.AuthenticationFailedException;
import static eu.faircode.email.ServiceAuthenticator.AUTH_TYPE_PASSWORD;
public class FragmentQuickSetup extends FragmentBase {
private ViewGroup view;
private ScrollView scroll;
@@ -303,7 +305,7 @@ public class FragmentQuickSetup extends FragmentBase {
try {
iservice.connect(
provider.imap.host, provider.imap.port,
EmailService.AUTH_TYPE_PASSWORD, null,
AUTH_TYPE_PASSWORD, null,
user, password,
null, imap_fingerprint);
} catch (EmailService.UntrustedException ex) {
@@ -311,7 +313,7 @@ public class FragmentQuickSetup extends FragmentBase {
imap_fingerprint = ex.getFingerprint();
iservice.connect(
provider.imap.host, provider.imap.port,
EmailService.AUTH_TYPE_PASSWORD, null,
AUTH_TYPE_PASSWORD, null,
user, password,
null, imap_fingerprint);
} else
@@ -328,7 +330,7 @@ public class FragmentQuickSetup extends FragmentBase {
Log.i("Retry with user=" + user);
iservice.connect(
provider.imap.host, provider.imap.port,
EmailService.AUTH_TYPE_PASSWORD, null,
AUTH_TYPE_PASSWORD, null,
user, password,
null, null);
} catch (Throwable ex1) {
@@ -353,7 +355,7 @@ public class FragmentQuickSetup extends FragmentBase {
iservice.setUseIp(provider.useip, null);
iservice.connect(
provider.smtp.host, provider.smtp.port,
EmailService.AUTH_TYPE_PASSWORD, null,
AUTH_TYPE_PASSWORD, null,
user, password,
null, smtp_fingerprint);
max_size = iservice.getMaxSize();
@@ -382,7 +384,7 @@ public class FragmentQuickSetup extends FragmentBase {
account.host = provider.imap.host;
account.encryption = aencryption;
account.port = provider.imap.port;
account.auth_type = EmailService.AUTH_TYPE_PASSWORD;
account.auth_type = AUTH_TYPE_PASSWORD;
account.user = user;
account.password = password;
account.fingerprint = imap_fingerprint;
@@ -432,7 +434,7 @@ public class FragmentQuickSetup extends FragmentBase {
identity.host = provider.smtp.host;
identity.encryption = iencryption;
identity.port = provider.smtp.port;
identity.auth_type = EmailService.AUTH_TYPE_PASSWORD;
identity.auth_type = AUTH_TYPE_PASSWORD;
identity.user = user;
identity.password = password;
identity.fingerprint = smtp_fingerprint;