1.2002 release

CHANGELOG.md

@@ -4,6 +4,11 @@
 
 ### [Ninjatitan](https://en.wikipedia.org/wiki/Ninjatitan)
 
+### 1.2002 - 2022-11-10
+
+* Fixed Outlook / Office 365 authentication
+* Updated translations
+
 ### 1.2001 - 2022-11-10
 
 * Fixed Outlook / Office 365 OAuth in some cases

app/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'com.bugsnag.android.gradle'
 apply plugin: 'kotlin-android'
 apply plugin: 'de.undercouch.download'
 
-def getVersionCode = { -> return 2001 }
+def getVersionCode = { -> return 2002 }
 def getRevision = { -> return "a" }
 def getReleaseName = { -> return "Ninjatitan" }
 // https://en.wikipedia.org/wiki/List_of_dinosaur_genera

app/src/main/assets/CHANGELOG.md

@@ -4,6 +4,11 @@
 
 ### [Ninjatitan](https://en.wikipedia.org/wiki/Ninjatitan)
 
+### 1.2002 - 2022-11-10
+
+* Fixed Outlook / Office 365 authentication
+* Updated translations
+
 ### 1.2001 - 2022-11-10
 
 * Fixed Outlook / Office 365 OAuth in some cases

app/src/main/java/eu/faircode/email/EntityAccount.java

@@ -178,7 +178,7 @@ public class EntityAccount extends EntityOrder implements Serializable {
     }
 
     static boolean isOutlook(String id) {
-        return ("office365".equals(id) || "outlook".equals(id));
+        return ("office365".equals(id) || "office365pcke".equals(id) || "outlook".equals(id));
     }
 
     boolean isYahooJp() {

app/src/main/res/values-iw-rIL/strings.xml

@@ -1721,6 +1721,8 @@
     <string name="title_select_block">בחירת מקטע</string>
     <string name="title_insert_brackets">תיחום בסוגריים</string>
     <string name="title_insert_quotes">ציטוט</string>
+    <string name="title_lt_add">הוספת מילה</string>
+    <string name="title_lt_delete">הסרת מילה</string>
     <string name="title_add">הוספה</string>
     <string name="title_browse">פתיחה באמצעות</string>
     <string name="title_info">פרטים</string>

app/src/main/res/xml/providers.xml

@@ -107,6 +107,7 @@
     <provider
         name="Outlook"
         description="Outlook/Office 365"
+        enabled="false"
         id="office365"
         link="https://github.com/M66B/FairEmail/blob/master/FAQ.md#user-content-faq14"
         noop="true"
@@ -134,6 +135,43 @@
             enabled="true"
             privacy="https://privacy.microsoft.com/privacystatement"
             prompt="login"
+            redirectUri="https://oauth.faircode.eu/"
+            scopes="profile,openid,email,offline_access,https://outlook.office.com/IMAP.AccessAsUser.All,https://outlook.office.com/SMTP.Send"
+            tokenEndpoint="https://login.microsoftonline.com/{tenant}/oauth2/v2.0/token"
+            tokenScopes="true" />
+        <!-- https://docs.microsoft.com/en-us/azure/active-directory/develop/v2-oauth2-auth-code-flow -->
+        <!-- https://docs.microsoft.com/en-us/exchange/client-developer/legacy-protocols/how-to-authenticate-an-imap-pop-smtp-application-by-using-oauth -->
+        <!-- https://learn.microsoft.com/en-us/azure/active-directory/develop/redirect-uris-ios -->
+    </provider>
+    <provider
+        name="Outlook"
+        description="Outlook/Office 365"
+        id="office365pcke"
+        link="https://github.com/M66B/FairEmail/blob/master/FAQ.md#user-content-faq14"
+        noop="true"
+        order="5"
+        partial="false"
+        useip="false">
+        <imap
+            host="outlook.office365.com"
+            port="993"
+            starttls="false" />
+        <smtp
+            host="smtp.office365.com"
+            port="587"
+            starttls="true" />
+        <!--pop
+            host="outlook.office365.com"
+            port="995"
+            starttls="false" /-->
+        <!-- https://outlook.office.com/POP.AccessAsUser.All -->
+        <oauth
+            askAccount="true"
+            authorizationEndpoint="https://login.microsoftonline.com/{tenant}/oauth2/v2.0/authorize"
+            clientId="3514cf2c-e7a3-45a2-80d4-6a3c3498eca0"
+            enabled="true"
+            privacy="https://privacy.microsoft.com/privacystatement"
+            prompt="login"
             redirectUri="msauth.eu.faircode.email://auth"
             scopes="profile,openid,email,offline_access,https://outlook.office.com/IMAP.AccessAsUser.All,https://outlook.office.com/SMTP.Send"
             tokenEndpoint="https://login.microsoftonline.com/{tenant}/oauth2/v2.0/token"