From 094c2c34eeece9ba54b6377636f617e0e5ef6104 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 30 Oct 2024 09:50:02 +0100
Subject: [PATCH] Added remark about Outlook OAuth

---
 .../main/java/eu/faircode/email/FragmentQuickSetup.java   | 8 +++++++-
 app/src/main/res/values/strings.xml                       | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java b/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
index ea5638921b..becf367251 100644
--- a/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
@@ -755,7 +755,13 @@ public class FragmentQuickSetup extends FragmentBase {
                 Helper.hideKeyboard(view);
 
                 if (ex instanceof AuthenticationFailedException) {
-                    String message = getString(R.string.title_setup_no_auth_hint);
+                    String message;
+                    if (provider != null && provider.imap != null &&
+                            ("outlook.office365.com".equals(provider.imap.host) ||
+                                    "imap-mail.outlook.com".equals(provider.imap.host)))
+                        message = getString(R.string.title_setup_no_auth_outlook);
+                    else
+                        message = getString(R.string.title_setup_no_auth_hint);
                     if (provider != null && provider.appPassword)
                         message += "\n\n" + getString(R.string.title_setup_app_password_hint);
                     tvErrorHint.setText(message);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e38384b80a..1f1401aa58 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -266,6 +266,7 @@
     <string name="title_setup_no_settings">No settings found for domain \'%1$s\'</string>
     <string name="title_setup_no_settings_hint">Try to set up an account manually using the settings provided by your email provider</string>
     <string name="title_setup_no_auth_hint">Please double check your email address and password and make sure external access (IMAP/SMTP) is enabled for your account</string>
+    <string name="title_setup_no_auth_outlook">You must use the Outlook / Office 365 quick setup wizard for this account (required by Microsoft)</string>
     <string name="title_setup_app_password_hint">This provider requires an app password instead of the account password, please check the instructions of your provider</string>
     <string name="title_setup_no_inbox">Inbox not found</string>
     <string name="title_setup_advanced_protection">When enrolled in the advanced protection program it is not possible to use a third party email app. This is a restriction imposed by Google.</string>