mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-03-11 06:33:29 +00:00
Code Issues Releases Wiki Activity

Added remark about Outlook OAuth

Browse source
This commit is contained in:
M66B 2024-10-30 09:50:02 +01:00
parent e0f87975fc
commit 094c2c34ee
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
View file

@ -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);

1
app/src/main/res/values/strings.xml
View file

@ -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>