From 27b6e56008f5491e0479a1f652fb564cec433bcd Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 15 Nov 2024 08:39:50 +0100
Subject: [PATCH] User is authenticated but not connected

---
 .../java/eu/faircode/email/FragmentOAuth.java    | 16 ++++++++++++++++
 app/src/main/res/layout/fragment_oauth.xml       |  1 +
 app/src/main/res/values/strings.xml              |  5 +++++
 3 files changed, 22 insertions(+)

diff --git a/app/src/main/java/eu/faircode/email/FragmentOAuth.java b/app/src/main/java/eu/faircode/email/FragmentOAuth.java
index 30b15e0561..17888a34e2 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOAuth.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOAuth.java
@@ -95,6 +95,7 @@ import java.util.Map;
 import java.util.Set;
 
 import javax.mail.AuthenticationFailedException;
+import javax.mail.MessagingException;
 import javax.net.ssl.HttpsURLConnection;
 
 public class FragmentOAuth extends FragmentBase {
@@ -1134,6 +1135,21 @@ public class FragmentOAuth extends FragmentBase {
                 else
                     tvOfficeAuthHint.setText(R.string.title_setup_office_auth);
                 tvOfficeAuthHint.setVisibility(View.VISIBLE);
+            } else if (ex instanceof MessagingException) {
+                boolean notconnected = false;
+                Throwable e = ex;
+                while (e != null) {
+                    String msg = e.getMessage();
+                    if (msg != null && msg.contains("User is authenticated but not connected")) {
+                        notconnected = true;
+                        break;
+                    }
+                    e = e.getCause();
+                }
+                if (notconnected) {
+                    tvOfficeAuthHint.setText(R.string.title_setup_office_not_connected);
+                    tvOfficeAuthHint.setVisibility(View.VISIBLE);
+                }
             }
         }
 
diff --git a/app/src/main/res/layout/fragment_oauth.xml b/app/src/main/res/layout/fragment_oauth.xml
index 39ab3e6faa..fe38e99173 100644
--- a/app/src/main/res/layout/fragment_oauth.xml
+++ b/app/src/main/res/layout/fragment_oauth.xml
@@ -288,6 +288,7 @@
             android:text="@string/title_setup_office_auth"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             android:textColor="?android:attr/textColorPrimary"
+            android:textStyle="bold|italic"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvError" />
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 85b65e1a9c..722cae5ce8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -254,6 +254,11 @@
     <string name="title_setup_office_auth">The error \'AUTHENTICATE failed\' can be caused by IMAP/SMTP being disabled by the system administrator</string>
     <string name="title_setup_office_auth_5_7_3">Please try the \'Other provider\' quick setup wizard.</string>
     <string name="title_setup_office_auth_5_7_139">Please try the \'Outlook/Hotmail/Live\' quick setup wizard.</string>
+    <string name="title_setup_office_not_connected">
+        The error \'User is authenticated but not connected\' mostly means that IMAP is disabled.
+        In the case of a consumer Outlook account, please go to the Outlook website, tap on the settings wheel at the top right, select \'Mail\', select \'Forwarding and IMAP\', and in the section \'POP and IMAP\' enable \'Let devices and apps use IMAP\'.
+        In the case of a corporate, education, etc. account, please contact the system administrator of the e-mail server.
+    </string>
     <string name="title_setup_oauth_rationale">Authorize access to your %1$s account</string>
     <string name="title_setup_oauth_update">Authorize an existing account again (otherwise create a new account)</string>
     <string name="title_setup_oauth_updated">Account authorization was updated</string>