Skip to content

Commit b5758c5

Browse files
authored
Merge pull request #8850 from element-hq/fix/jme/8894-ea-intercepts-mas-urls
Replace `*.element.io` deep link with actual hosts
2 parents 4d27c84 + 0292749 commit b5758c5

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

changelog.d/8894.bugfix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Intercept only links from `element.io` well known hosts. The previous behaviour broke OIDC login in Element X.

vector/src/main/AndroidManifest.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,13 @@
184184
<category android:name="android.intent.category.BROWSABLE" />
185185

186186
<data android:scheme="https" />
187-
<data android:host="*.element.io" />
187+
<!-- Note: we can't use "*.element.io" here because it'll intercept the "mas.element.io" domain too. -->
188+
<!-- Matching asset file: https://app.element.io/.well-known/assetlinks.json -->
189+
<data android:host="app.element.io" />
190+
<!-- Matching asset file: https://develop.element.io/.well-known/assetlinks.json -->
191+
<data android:host="develop.element.io" />
192+
<!-- Matching asset file: https://staging.element.io/.well-known/assetlinks.json -->
193+
<data android:host="staging.element.io" />
188194
</intent-filter>
189195
</activity>
190196

0 commit comments

Comments
 (0)