From a9a5ca607787948cfa432aec20076f602b64c674 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 30 Jul 2019 18:58:29 +0200
Subject: [PATCH] Match provider by encryption method too

---
 app/src/main/java/eu/faircode/email/FragmentAccount.java  | 3 ++-
 app/src/main/java/eu/faircode/email/FragmentIdentity.java | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java
index fc6035c3a6..177dfcc105 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAccount.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java
@@ -1142,7 +1142,8 @@ public class FragmentAccount extends FragmentBase {
                         for (int pos = 2; pos < providers.size(); pos++) {
                             EmailProvider provider = providers.get(pos);
                             if (provider.imap_host.equals(account.host) &&
-                                    provider.imap_port == account.port) {
+                                    provider.imap_port == account.port &&
+                                    provider.imap_starttls == account.starttls) {
                                 found = true;
                                 spProvider.setTag(pos);
                                 spProvider.setSelection(pos);
diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
index fa2a8eec9d..79a12b87da 100644
--- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java
+++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
@@ -231,7 +231,8 @@ public class FragmentIdentity extends FragmentBase {
                     for (int pos = 1; pos < spProvider.getAdapter().getCount(); pos++) {
                         EmailProvider provider = (EmailProvider) spProvider.getItemAtPosition(pos);
                         if (provider.imap_host.equals(account.host) &&
-                                provider.imap_port == account.port) {
+                                provider.imap_port == account.port &&
+                                provider.imap_starttls == account.starttls) {
                             found = true;
 
                             spProvider.setSelection(pos);
@@ -925,7 +926,8 @@ public class FragmentIdentity extends FragmentBase {
                                 for (int pos = 1; pos < providers.size(); pos++) {
                                     EmailProvider provider = providers.get(pos);
                                     if (provider.smtp_host.equals(identity.host) &&
-                                            provider.smtp_port == identity.port) {
+                                            provider.smtp_port == identity.port &&
+                                            provider.smtp_starttls == identity.starttls) {
                                         spProvider.setTag(pos);
                                         spProvider.setSelection(pos);
                                         break;