From 6d5bb7422c726d08a58c862d1e145abed8818c19 Mon Sep 17 00:00:00 2001
From: Narinder Rana <narinder.rana.e@gmail.com>
Date: Tue, 12 Apr 2022 11:31:27 +0530
Subject: [PATCH 1/8] add eeo domain into providers

---
 .../providersxml/src/main/res/xml/providers.xml          | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/app/autodiscovery/providersxml/src/main/res/xml/providers.xml b/app/autodiscovery/providersxml/src/main/res/xml/providers.xml
index c7bee9b751..681ad3ef02 100644
--- a/app/autodiscovery/providersxml/src/main/res/xml/providers.xml
+++ b/app/autodiscovery/providersxml/src/main/res/xml/providers.xml
@@ -723,4 +723,13 @@
         <incoming uri="imap+ssl+://mail.ecloud.global" username="$email" />
         <outgoing uri="smtp+tls+://mail.ecloud.global" username="$email" />
     </provider>
+
+    <!-- eeo -->
+    <provider id="eeo.one" label="eeo" domain="eeo.one">
+        <incoming uri="imap+ssl+://mail.eeo.one" username="$email" />
+        <outgoing uri="smtp+tls+://mail.eeo.one" username="$email" />
+    </provider>
+
+
+
 </providers>
-- 
GitLab


From 7092f03081e910eb2993b351a5117c1d1fb07eca Mon Sep 17 00:00:00 2001
From: Narinder Rana <narinder.rana.e@gmail.com>
Date: Wed, 13 Apr 2022 07:53:50 +0530
Subject: [PATCH 2/8] test auto providers

---
 .../src/main/res/xml/providers.xml            | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/app/autodiscovery/providersxml/src/main/res/xml/providers.xml b/app/autodiscovery/providersxml/src/main/res/xml/providers.xml
index 681ad3ef02..fd737d5f03 100644
--- a/app/autodiscovery/providersxml/src/main/res/xml/providers.xml
+++ b/app/autodiscovery/providersxml/src/main/res/xml/providers.xml
@@ -718,18 +718,24 @@
         <outgoing uri="smtp+tls+://mail.fairnatics.net:25" username="$email" />
     </provider>
 
-    <!-- eFoundation -->
-    <provider id="e.foundation" label="/e/" domain="e.email">
-        <incoming uri="imap+ssl+://mail.ecloud.global" username="$email" />
-        <outgoing uri="smtp+tls+://mail.ecloud.global" username="$email" />
-    </provider>
+<!--    &lt;!&ndash; eFoundation &ndash;&gt;-->
+<!--    <provider id="e.foundation" label="/e/" domain="e.email">-->
+<!--        <incoming uri="imap+ssl+://mail.ecloud.global" username="$email" />-->
+<!--        <outgoing uri="smtp+tls+://mail.ecloud.global" username="$email" />-->
+<!--    </provider>-->
 
     <!-- eeo -->
-    <provider id="eeo.one" label="eeo" domain="eeo.one">
-        <incoming uri="imap+ssl+://mail.eeo.one" username="$email" />
-        <outgoing uri="smtp+tls+://mail.eeo.one" username="$email" />
+<!--    <provider id="eeo.one" label="eeo" domain="eeo.one">-->
+<!--        <incoming uri="imap+ssl+://mail.eeo.one" username="$email" />-->
+<!--        <outgoing uri="smtp+tls+://mail.eeo.one" username="$email" />-->
+<!--    </provider>-->
+
+    <provider id="$domain" label="$domain" domain="$domain">
+        <incoming uri="imap+ssl+://mail.$domain" username="$email" />
+        <outgoing uri="smtp+tls+://mail.$domain" username="$email" />
     </provider>
 
 
 
+
 </providers>
-- 
GitLab


From 8bc8656807719dd79a1aa07b35d4be3812e66e8e Mon Sep 17 00:00:00 2001
From: Narinder Rana <narinder.rana.e@gmail.com>
Date: Wed, 13 Apr 2022 09:12:15 +0530
Subject: [PATCH 3/8] test auto providers

---
 app/autodiscovery/providersxml/src/main/res/xml/providers.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/autodiscovery/providersxml/src/main/res/xml/providers.xml b/app/autodiscovery/providersxml/src/main/res/xml/providers.xml
index fd737d5f03..20a303404e 100644
--- a/app/autodiscovery/providersxml/src/main/res/xml/providers.xml
+++ b/app/autodiscovery/providersxml/src/main/res/xml/providers.xml
@@ -730,7 +730,7 @@
 <!--        <outgoing uri="smtp+tls+://mail.eeo.one" username="$email" />-->
 <!--    </provider>-->
 
-    <provider id="$domain" label="$domain" domain="$domain">
+    <provider id="$id" label="$domain" domain="$domain">
         <incoming uri="imap+ssl+://mail.$domain" username="$email" />
         <outgoing uri="smtp+tls+://mail.$domain" username="$email" />
     </provider>
-- 
GitLab


From c40a26923d35c4350a7c08bd43a9cf6c6e4c4674 Mon Sep 17 00:00:00 2001
From: Narinder Rana <narinder.rana.e@gmail.com>
Date: Wed, 13 Apr 2022 10:19:24 +0530
Subject: [PATCH 4/8] test auto providers /e/

---
 app/autodiscovery/providersxml/src/main/res/xml/providers.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/autodiscovery/providersxml/src/main/res/xml/providers.xml b/app/autodiscovery/providersxml/src/main/res/xml/providers.xml
index 20a303404e..04fbd8b057 100644
--- a/app/autodiscovery/providersxml/src/main/res/xml/providers.xml
+++ b/app/autodiscovery/providersxml/src/main/res/xml/providers.xml
@@ -730,7 +730,7 @@
 <!--        <outgoing uri="smtp+tls+://mail.eeo.one" username="$email" />-->
 <!--    </provider>-->
 
-    <provider id="$id" label="$domain" domain="$domain">
+    <provider id="e.foundation" label="/e/" domain="$domain">
         <incoming uri="imap+ssl+://mail.$domain" username="$email" />
         <outgoing uri="smtp+tls+://mail.$domain" username="$email" />
     </provider>
-- 
GitLab


From 0a3effd42ede99d6799424c2326af9da92a21322 Mon Sep 17 00:00:00 2001
From: Narinder Rana <narinder.rana.e@gmail.com>
Date: Wed, 13 Apr 2022 11:58:59 +0530
Subject: [PATCH 5/8] test auto providers /e/ domain value

---
 .../providersxml/src/main/res/xml/providers.xml              | 5 +----
 .../legacy/src/main/java/com/fsck/k9/activity/MessageList.kt | 3 +++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/autodiscovery/providersxml/src/main/res/xml/providers.xml b/app/autodiscovery/providersxml/src/main/res/xml/providers.xml
index 04fbd8b057..3d2b0b4aa6 100644
--- a/app/autodiscovery/providersxml/src/main/res/xml/providers.xml
+++ b/app/autodiscovery/providersxml/src/main/res/xml/providers.xml
@@ -730,12 +730,9 @@
 <!--        <outgoing uri="smtp+tls+://mail.eeo.one" username="$email" />-->
 <!--    </provider>-->
 
-    <provider id="e.foundation" label="/e/" domain="$domain">
+    <provider id="e.foundation" label="/e/" domain="e.email">
         <incoming uri="imap+ssl+://mail.$domain" username="$email" />
         <outgoing uri="smtp+tls+://mail.$domain" username="$email" />
     </provider>
 
-
-
-
 </providers>
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt b/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt
index ec96a46b60..3311efce4c 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt
@@ -10,6 +10,7 @@ import android.content.res.Configuration
 import android.graphics.Color
 import android.os.Bundle
 import android.os.Parcelable
+import android.util.Log
 import android.util.TypedValue
 import android.view.KeyEvent
 import android.view.Menu
@@ -148,6 +149,8 @@ open class MessageList :
 
         accountManager = AccountManager.get(this)
 
+        Log.e("TAG", "........"+accountManager +"........"+  preferences.accounts)
+
 // TODO remove old accounts automatically
         if (addNewAccountsAutomatically(accounts)) {
             accounts = preferences.accounts
-- 
GitLab


From da6ef6a01b04f4d0a266bae1bc3bb9e2377aaff4 Mon Sep 17 00:00:00 2001
From: Narinder Rana <narinder.rana.e@gmail.com>
Date: Wed, 13 Apr 2022 15:48:05 +0530
Subject: [PATCH 6/8] add providers for eeo.one

---
 .../src/main/res/xml/providers.xml            | 25 ++++++++-----------
 .../java/com/fsck/k9/activity/MessageList.kt  |  2 --
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/app/autodiscovery/providersxml/src/main/res/xml/providers.xml b/app/autodiscovery/providersxml/src/main/res/xml/providers.xml
index 3d2b0b4aa6..026bc311cb 100644
--- a/app/autodiscovery/providersxml/src/main/res/xml/providers.xml
+++ b/app/autodiscovery/providersxml/src/main/res/xml/providers.xml
@@ -718,21 +718,18 @@
         <outgoing uri="smtp+tls+://mail.fairnatics.net:25" username="$email" />
     </provider>
 
-<!--    &lt;!&ndash; eFoundation &ndash;&gt;-->
-<!--    <provider id="e.foundation" label="/e/" domain="e.email">-->
-<!--        <incoming uri="imap+ssl+://mail.ecloud.global" username="$email" />-->
-<!--        <outgoing uri="smtp+tls+://mail.ecloud.global" username="$email" />-->
-<!--    </provider>-->
-
-    <!-- eeo -->
-<!--    <provider id="eeo.one" label="eeo" domain="eeo.one">-->
-<!--        <incoming uri="imap+ssl+://mail.eeo.one" username="$email" />-->
-<!--        <outgoing uri="smtp+tls+://mail.eeo.one" username="$email" />-->
-<!--    </provider>-->
-
+    <!-- eFoundation -->
     <provider id="e.foundation" label="/e/" domain="e.email">
-        <incoming uri="imap+ssl+://mail.$domain" username="$email" />
-        <outgoing uri="smtp+tls+://mail.$domain" username="$email" />
+        <incoming uri="imap+ssl+://mail.ecloud.global" username="$email" />
+        <outgoing uri="smtp+tls+://mail.ecloud.global" username="$email" />
+    </provider>
+
+   <!--  eeo -->
+    <provider id="eeo.one" label="eeo" domain="eeo.one">
+        <incoming uri="imap+ssl+://mail.eeo.one" username="$email" />
+        <outgoing uri="smtp+tls+://mail.eeo.one" username="$email" />
     </provider>
 
+
+
 </providers>
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt b/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt
index 3311efce4c..522485379a 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt
@@ -149,8 +149,6 @@ open class MessageList :
 
         accountManager = AccountManager.get(this)
 
-        Log.e("TAG", "........"+accountManager +"........"+  preferences.accounts)
-
 // TODO remove old accounts automatically
         if (addNewAccountsAutomatically(accounts)) {
             accounts = preferences.accounts
-- 
GitLab


From 3fca7cee52cc19d831c65e27144a53856c7c18fa Mon Sep 17 00:00:00 2001
From: Narinder Rana <narinder.rana.e@gmail.com>
Date: Wed, 13 Apr 2022 15:51:51 +0530
Subject: [PATCH 7/8] refine code

---
 app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt b/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt
index 522485379a..ec96a46b60 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt
@@ -10,7 +10,6 @@ import android.content.res.Configuration
 import android.graphics.Color
 import android.os.Bundle
 import android.os.Parcelable
-import android.util.Log
 import android.util.TypedValue
 import android.view.KeyEvent
 import android.view.Menu
-- 
GitLab


From 9257279ba3f01f27776a21a67736c6581f72a262 Mon Sep 17 00:00:00 2001
From: Narinder Rana <narinder.rana.e@gmail.com>
Date: Wed, 13 Apr 2022 15:53:01 +0530
Subject: [PATCH 8/8] refine code

---
 app/autodiscovery/providersxml/src/main/res/xml/providers.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/autodiscovery/providersxml/src/main/res/xml/providers.xml b/app/autodiscovery/providersxml/src/main/res/xml/providers.xml
index 026bc311cb..be5add1bb8 100644
--- a/app/autodiscovery/providersxml/src/main/res/xml/providers.xml
+++ b/app/autodiscovery/providersxml/src/main/res/xml/providers.xml
@@ -730,6 +730,4 @@
         <outgoing uri="smtp+tls+://mail.eeo.one" username="$email" />
     </provider>
 
-
-
 </providers>
-- 
GitLab