From a1dd3ba1b5a1f90ae52ce0ddaeac55650e06b545 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Mart=C3=ADn?= <jorgem@element.io>
Date: Tue, 25 Jun 2024 11:48:16 +0200
Subject: [PATCH 1/2] Replace `*.element.io` deep link with actual hosts

This is done to avoid incorrectly intercepting links in other apps, as Element X Android.
---
 vector/src/main/AndroidManifest.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index c5d7af2408..1b9bfaf802 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -184,7 +184,13 @@
                 <category android:name="android.intent.category.BROWSABLE" />
 
                 <data android:scheme="https" />
-                <data android:host="*.element.io" />
+                <!-- Note: we can't use "*.element.io" here because it'll intercept the "mas.element.io" domain too. -->
+                <!-- Matching asset file: https://app.element.io/.well-known/assetlinks.json -->
+                <data android:host="app.element.io" />
+                <!-- Matching asset file: https://develop.element.io/.well-known/assetlinks.json -->
+                <data android:host="develop.element.io" />
+                <!-- Matching asset file: https://staging.element.io/.well-known/assetlinks.json -->
+                <data android:host="staging.element.io" />
             </intent-filter>
         </activity>
 

From 0292749cc0eee5c54b845483221d9a0b739610c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Mart=C3=ADn?= <jorgem@element.io>
Date: Tue, 25 Jun 2024 11:56:15 +0200
Subject: [PATCH 2/2] Add changelog

---
 changelog.d/8894.bugfix | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/8894.bugfix

diff --git a/changelog.d/8894.bugfix b/changelog.d/8894.bugfix
new file mode 100644
index 0000000000..064ebfc507
--- /dev/null
+++ b/changelog.d/8894.bugfix
@@ -0,0 +1 @@
+Intercept only links from `element.io` well known hosts. The previous behaviour broke OIDC login in Element X.