From cbc90466ea6899429e677a779258dc6f6244b027 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 18 Feb 2023 10:49:16 +0100
Subject: [PATCH] Switched to signed msauth redirect URI

---
 app/src/amazon/AndroidManifest.xml | 12 ++++++++++++
 app/src/fdroid/AndroidManifest.xml | 12 ++++++++++++
 app/src/github/AndroidManifest.xml | 12 ++++++++++++
 app/src/main/AndroidManifest.xml   | 12 ++++++++++++
 app/src/main/res/xml/providers.xml |  2 +-
 app/src/play/AndroidManifest.xml   | 12 ++++++++++++
 6 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/app/src/amazon/AndroidManifest.xml b/app/src/amazon/AndroidManifest.xml
index 97444b1b83..65c67cda0a 100644
--- a/app/src/amazon/AndroidManifest.xml
+++ b/app/src/amazon/AndroidManifest.xml
@@ -503,6 +503,18 @@
                     android:host="auth"
                     android:scheme="msauth.${namespace}" />
             </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="${namespace}"
+                    android:path="/xSLzBBuLJunOQPB89rtzM54FXx4="
+                    android:scheme="msauth" />
+            </intent-filter>
         </activity>
 
         <activity
diff --git a/app/src/fdroid/AndroidManifest.xml b/app/src/fdroid/AndroidManifest.xml
index 9d84879ef7..cac60b1cc0 100644
--- a/app/src/fdroid/AndroidManifest.xml
+++ b/app/src/fdroid/AndroidManifest.xml
@@ -509,6 +509,18 @@
                     android:host="auth"
                     android:scheme="msauth.${namespace}" />
             </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="${namespace}"
+                    android:path="/xSLzBBuLJunOQPB89rtzM54FXx4="
+                    android:scheme="msauth" />
+            </intent-filter>
         </activity>
 
         <activity
diff --git a/app/src/github/AndroidManifest.xml b/app/src/github/AndroidManifest.xml
index 9ec9670ed6..b1f1dfe921 100644
--- a/app/src/github/AndroidManifest.xml
+++ b/app/src/github/AndroidManifest.xml
@@ -509,6 +509,18 @@
                     android:host="auth"
                     android:scheme="msauth.${namespace}" />
             </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="${namespace}"
+                    android:path="/xSLzBBuLJunOQPB89rtzM54FXx4="
+                    android:scheme="msauth" />
+            </intent-filter>
         </activity>
 
         <activity
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 14f50e99e1..2166ea35fd 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -501,6 +501,18 @@
                     android:host="auth"
                     android:scheme="msauth.${namespace}" />
             </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="${namespace}"
+                    android:path="/xSLzBBuLJunOQPB89rtzM54FXx4="
+                    android:scheme="msauth" />
+            </intent-filter>
         </activity>
 
         <activity
diff --git a/app/src/main/res/xml/providers.xml b/app/src/main/res/xml/providers.xml
index 8f8949ab82..1e64bcb0e5 100644
--- a/app/src/main/res/xml/providers.xml
+++ b/app/src/main/res/xml/providers.xml
@@ -222,7 +222,7 @@
             enabled="true"
             privacy="https://privacy.microsoft.com/privacystatement"
             prompt="login"
-            redirectUri="msauth.eu.faircode.email://auth"
+            redirectUri="msauth://eu.faircode.email/xSLzBBuLJunOQPB89rtzM54FXx4%3D"
             scopes="profile,openid,email,offline_access,https://outlook.office.com/IMAP.AccessAsUser.All,https://outlook.office.com/SMTP.Send,https://outlook.office.com/POP.AccessAsUser.All"
             tokenEndpoint="https://login.microsoftonline.com/{tenant}/oauth2/v2.0/token"
             tokenScopes="true" />
diff --git a/app/src/play/AndroidManifest.xml b/app/src/play/AndroidManifest.xml
index eabce2ad9c..93da420f58 100644
--- a/app/src/play/AndroidManifest.xml
+++ b/app/src/play/AndroidManifest.xml
@@ -503,6 +503,18 @@
                     android:host="auth"
                     android:scheme="msauth.${namespace}" />
             </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="${namespace}"
+                    android:path="/xSLzBBuLJunOQPB89rtzM54FXx4="
+                    android:scheme="msauth" />
+            </intent-filter>
         </activity>
 
         <activity