From 6e7bbd6972de63976bc6113c4c4497824a474257 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 6 May 2024 11:12:09 +0200
Subject: [PATCH 1/4] Explicitly set domain for external link handling. And
 revert change: let ElementCallActivity handle again `call.element.io` links.

---
 app/src/main/AndroidManifest.xml              |  4 ++-
 .../io/element/android/x/MainActivity.kt      | 14 -----------
 features/call/src/main/AndroidManifest.xml    | 11 +++++---
 .../features/call/ui/ElementCallActivity.kt   | 25 -------------------
 4 files changed, 11 insertions(+), 43 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1089d631d9..eca2ffe957 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -84,7 +84,9 @@
                 <category android:name="android.intent.category.BROWSABLE" />
 
                 <data android:scheme="https" />
-                <data android:host="*.element.io" />
+                <data android:host="app.element.io" />
+                <data android:host="develop.element.io" />
+                <data android:host="staging.element.io" />
             </intent-filter>
             <!--
               matrix.to links
diff --git a/app/src/main/kotlin/io/element/android/x/MainActivity.kt b/app/src/main/kotlin/io/element/android/x/MainActivity.kt
index 962e2ab087..c11e63a164 100644
--- a/app/src/main/kotlin/io/element/android/x/MainActivity.kt
+++ b/app/src/main/kotlin/io/element/android/x/MainActivity.kt
@@ -39,7 +39,6 @@ import io.element.android.compound.theme.ElementTheme
 import io.element.android.compound.theme.Theme
 import io.element.android.compound.theme.isDark
 import io.element.android.compound.theme.mapToTheme
-import io.element.android.features.call.ui.ElementCallActivity
 import io.element.android.features.lockscreen.api.handleSecureFlag
 import io.element.android.features.lockscreen.api.isLocked
 import io.element.android.libraries.architecture.bindings
@@ -59,13 +58,6 @@ class MainActivity : NodeActivity() {
         Timber.tag(loggerTag.value).w("onCreate, with savedInstanceState: ${savedInstanceState != null}")
         installSplashScreen()
         super.onCreate(savedInstanceState)
-        if (ElementCallActivity.maybeStart(this, intent)) {
-            Timber.tag(loggerTag.value).w("Starting Element Call Activity")
-            if (savedInstanceState == null) {
-                finish()
-                return
-            }
-        }
         appBindings = bindings()
         appBindings.lockScreenService().handleSecureFlag(this)
         enableEdgeToEdge()
@@ -149,12 +141,6 @@ class MainActivity : NodeActivity() {
     override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
         Timber.tag(loggerTag.value).w("onNewIntent")
-
-        if (ElementCallActivity.maybeStart(this, intent)) {
-            Timber.tag(loggerTag.value).w("Starting Element Call Activity")
-            return
-        }
-
         // If the mainNode is not init yet, keep the intent for later.
         // It can happen when the activity is killed by the system. The methods are called in this order :
         // onCreate(savedInstanceState=true) -> onNewIntent -> onResume -> onMainNodeInit
diff --git a/features/call/src/main/AndroidManifest.xml b/features/call/src/main/AndroidManifest.xml
index 5d83a42b59..c7db9cc38f 100644
--- a/features/call/src/main/AndroidManifest.xml
+++ b/features/call/src/main/AndroidManifest.xml
@@ -34,10 +34,15 @@
             android:configChanges="screenSize|screenLayout|orientation|keyboardHidden|keyboard|navigation|uiMode"
             android:launchMode="singleTask">
 
-            <!--
-             Note: intent-filter for https://call.element.io link is now managed by the MainActivity.
-            -->
+            <intent-filter android:autoVerify="true">
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
 
+                <data android:scheme="https" />
+
+                <data android:host="call.element.io" />
+            </intent-filter>
             <!-- Custom scheme to handle urls from other domains in the format: element://call?url=https%3A%2F%2Felement.io -->
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
diff --git a/features/call/src/main/kotlin/io/element/android/features/call/ui/ElementCallActivity.kt b/features/call/src/main/kotlin/io/element/android/features/call/ui/ElementCallActivity.kt
index 1c9ece7fb9..8eea4c814f 100644
--- a/features/call/src/main/kotlin/io/element/android/features/call/ui/ElementCallActivity.kt
+++ b/features/call/src/main/kotlin/io/element/android/features/call/ui/ElementCallActivity.kt
@@ -17,7 +17,6 @@
 package io.element.android.features.call.ui
 
 import android.Manifest
-import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
@@ -36,7 +35,6 @@ import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.core.app.ActivityOptionsCompat
 import androidx.core.content.IntentCompat
 import com.bumble.appyx.core.integrationpoint.NodeComponentActivity
 import io.element.android.compound.theme.ElementTheme
@@ -49,7 +47,6 @@ import io.element.android.features.call.di.CallBindings
 import io.element.android.features.call.utils.CallIntentDataParser
 import io.element.android.features.preferences.api.store.AppPreferencesStore
 import io.element.android.libraries.architecture.bindings
-import io.element.android.libraries.core.bool.orFalse
 import javax.inject.Inject
 
 class ElementCallActivity : NodeComponentActivity(), CallScreenNavigator {
@@ -66,28 +63,6 @@ class ElementCallActivity : NodeComponentActivity(), CallScreenNavigator {
             }
             context.startActivity(intent)
         }
-
-        /**
-         * Starts the [ElementCallActivity] if the intent contains a valid URL,
-         * and returns true if it's the case.
-         */
-        fun maybeStart(
-            activity: Activity,
-            intent: Intent?,
-        ): Boolean {
-            return intent?.data
-                ?.takeIf { uri -> uri.scheme == "https" && uri.host == "call.element.io" }
-                ?.let { uri ->
-                    val callIntent = Intent(activity, ElementCallActivity::class.java).apply {
-                        data = uri
-                    }
-                    // Disable animation since MainActivity has already been animated.
-                    val options = ActivityOptionsCompat.makeCustomAnimation(activity, 0, 0)
-                    activity.startActivity(callIntent, options.toBundle())
-                    true
-                }
-                .orFalse()
-        }
     }
 
     @Inject lateinit var callIntentDataParser: CallIntentDataParser

From ebfb41f6017b1b433960f0e0700ca469c6efee51 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 6 May 2024 11:14:24 +0200
Subject: [PATCH 2/4] Format file (no other change)

---
 features/call/src/main/AndroidManifest.xml | 24 +++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/features/call/src/main/AndroidManifest.xml b/features/call/src/main/AndroidManifest.xml
index c7db9cc38f..c16ab3aa19 100644
--- a/features/call/src/main/AndroidManifest.xml
+++ b/features/call/src/main/AndroidManifest.xml
@@ -16,8 +16,12 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <uses-feature android:name="android.hardware.camera" android:required="false" />
-    <uses-feature android:name="android.hardware.microphone" android:required="false" />
+    <uses-feature
+        android:name="android.hardware.camera"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.microphone"
+        android:required="false" />
 
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.CAMERA" />
@@ -28,14 +32,15 @@
     <application>
         <activity
             android:name=".ui.ElementCallActivity"
-            android:label="@string/element_call"
-            android:exported="true"
-            android:taskAffinity="io.element.android.features.call"
             android:configChanges="screenSize|screenLayout|orientation|keyboardHidden|keyboard|navigation|uiMode"
-            android:launchMode="singleTask">
+            android:exported="true"
+            android:label="@string/element_call"
+            android:launchMode="singleTask"
+            android:taskAffinity="io.element.android.features.call">
 
             <intent-filter android:autoVerify="true">
                 <action android:name="android.intent.action.VIEW" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
@@ -46,6 +51,7 @@
             <!-- Custom scheme to handle urls from other domains in the format: element://call?url=https%3A%2F%2Felement.io -->
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
@@ -55,6 +61,7 @@
             <!-- Custom scheme to handle urls from other domains in the format: io.element.call:/?url=https%3A%2F%2Felement.io -->
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
@@ -62,7 +69,10 @@
             </intent-filter>
 
         </activity>
-        <service android:name=".CallForegroundService" android:enabled="true" android:foregroundServiceType="mediaPlayback" />
+        <service
+            android:name=".CallForegroundService"
+            android:enabled="true"
+            android:foregroundServiceType="mediaPlayback" />
     </application>
 
 </manifest>

From 227611cfbadd4399fe75c4c2b7631dbf9755c1dd Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 6 May 2024 11:34:23 +0200
Subject: [PATCH 3/4] Add links to the matching assetlinks.json files.

---
 app/src/main/AndroidManifest.xml           | 3 +++
 features/call/src/main/AndroidManifest.xml | 1 +
 2 files changed, 4 insertions(+)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index eca2ffe957..b42b2c72bc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -84,8 +84,11 @@
                 <category android:name="android.intent.category.BROWSABLE" />
 
                 <data android:scheme="https" />
+                <!-- 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>
             <!--
diff --git a/features/call/src/main/AndroidManifest.xml b/features/call/src/main/AndroidManifest.xml
index c16ab3aa19..532d5bc40c 100644
--- a/features/call/src/main/AndroidManifest.xml
+++ b/features/call/src/main/AndroidManifest.xml
@@ -46,6 +46,7 @@
 
                 <data android:scheme="https" />
 
+                <!-- Matching asset file: https://call.element.io/.well-known/assetlinks.json -->
                 <data android:host="call.element.io" />
             </intent-filter>
             <!-- Custom scheme to handle urls from other domains in the format: element://call?url=https%3A%2F%2Felement.io -->

From 19a97c62a89bdc6d3549dcad11c8295f2c2e6a7d Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 6 May 2024 11:40:16 +0200
Subject: [PATCH 4/4] Add warning about *.element.io

---
 app/src/main/AndroidManifest.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b42b2c72bc..807e48b555 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -84,6 +84,7 @@
                 <category android:name="android.intent.category.BROWSABLE" />
 
                 <data android:scheme="https" />
+                <!-- 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 -->