From 8d423166605587181255a2fd4e8962ca8f064c74 Mon Sep 17 00:00:00 2001 From: M66B Date: Wed, 30 Sep 2020 08:41:46 +0200 Subject: [PATCH] Added Outlook OAuth warning --- app/src/main/java/eu/faircode/email/FragmentOAuth.java | 7 +++++++ app/src/main/res/values/strings.xml | 1 + 2 files changed, 8 insertions(+) diff --git a/app/src/main/java/eu/faircode/email/FragmentOAuth.java b/app/src/main/java/eu/faircode/email/FragmentOAuth.java index f991a8e13a..c2860f13f3 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOAuth.java +++ b/app/src/main/java/eu/faircode/email/FragmentOAuth.java @@ -224,6 +224,13 @@ public class FragmentOAuth extends FragmentBase { throw new IllegalArgumentException(getString(R.string.title_no_email)); if (!Helper.EMAIL_ADDRESS.matcher(email).matches()) throw new IllegalArgumentException(getString(R.string.title_email_invalid, email)); + + String e = email.toLowerCase(); + if (e.contains("@outlook") || + e.contains("@live") || + e.contains("@hotmail") || + e.contains("@msn")) + throw new IllegalArgumentException(getString(R.string.title_setup_office_remark)); } etName.setEnabled(false); diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8c3b0db03d..4c4440e1dd 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -177,6 +177,7 @@ Please grant permissions to select an account and read your name Google will ask for permissions to read, compose, send and permanently delete all your email. FairEmail will never delete your messages without your explicit consent. If the drafts folder is not accessible by IMAP, this can be fixed in the Gmail label settings + Microsoft does not provide this type of authorization for Outlook, Live, Hotmail, etc accounts The error \'AUTHENTICATE failed\' can be caused by IMAP/SMTP being disabled by the system administrator Authorize access to your %1$s account Authorize