From 5234246e63443a7d9f0b0fd21bfa10db2ae28a55 Mon Sep 17 00:00:00 2001
From: Jules Rosser <jules@expensify.com>
Date: Tue, 26 Oct 2021 16:52:12 +0100
Subject: [PATCH 1/6] remove duplicate URL deep link handler

---
 android/app/src/main/AndroidManifest.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index caf00f5fede3..1c69d243234c 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -63,12 +63,6 @@
             <category android:name="android.intent.category.BROWSABLE"/>
             <data android:scheme="https" android:host="staging.new.expensify.com" />
         </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:scheme="https" android:host="staging.new.expensify.com" />
-        </intent-filter>
       </activity>
       <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
 

From f255f89f2a213321a0e74ec5f537bc34a2b4cea6 Mon Sep 17 00:00:00 2001
From: Jules Rosser <jules@expensify.com>
Date: Tue, 26 Oct 2021 16:54:08 +0100
Subject: [PATCH 2/6] simplify Android intent filter deep link handlers

---
 android/app/src/main/AndroidManifest.xml | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 1c69d243234c..53987e053fb8 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -23,6 +23,7 @@
       android:roundIcon="@mipmap/ic_launcher_round"
       android:allowBackup="false"
       android:theme="@style/AppTheme">
+
       <activity
         android:name=".MainActivity"
         android:label="@string/app_name"
@@ -31,6 +32,7 @@
         android:exported="true"
         android:windowSoftInputMode="adjustResize">
       </activity>
+
       <activity
         android:name="com.zoontek.rnbootsplash.RNBootSplashActivity"
         android:theme="@style/BootTheme"
@@ -44,26 +46,12 @@
             <category android:name="android.intent.category.DEFAULT"/>
             <category android:name="android.intent.category.BROWSABLE"/>
             <data android:scheme="expensify-cash"/>
-        </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:scheme="new-expensify"/>
-        </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:scheme="https" android:host="new.expensify.com" />
-        </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:scheme="https" android:host="staging.new.expensify.com" />
         </intent-filter>
       </activity>
+
       <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
 
       <meta-data android:name="com.urbanairship.reactnative.AIRSHIP_EXTENDER"

From 293c40e680e1ca138e8ac2e44c907df828b6a977 Mon Sep 17 00:00:00 2001
From: Jules Rosser <jules@expensify.com>
Date: Tue, 26 Oct 2021 17:29:35 +0100
Subject: [PATCH 3/6] improve deep link documentation

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

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 53987e053fb8..3d8811d04f7b 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -45,8 +45,12 @@
             <action android:name="android.intent.action.VIEW"/>
             <category android:name="android.intent.category.DEFAULT"/>
             <category android:name="android.intent.category.BROWSABLE"/>
+
+            <!-- Custom URI handlers. Used to intercept Urban Airship deep links. -->
             <data android:scheme="expensify-cash"/>
             <data android:scheme="new-expensify"/>
+
+            <!-- Web URL handlers. Used to intercept web links. -->
             <data android:scheme="https" android:host="new.expensify.com" />
             <data android:scheme="https" android:host="staging.new.expensify.com" />
         </intent-filter>

From 82fd33564195734b27b7f12a7150aa0f848effb3 Mon Sep 17 00:00:00 2001
From: Jules Rosser <jules@expensify.com>
Date: Tue, 26 Oct 2021 17:42:35 +0100
Subject: [PATCH 4/6] restrict universal handling to specific paths

---
 android/app/src/main/AndroidManifest.xml | 32 ++++++++++++++++++++----
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 3d8811d04f7b..56be5f9aef6f 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -37,22 +37,44 @@
         android:name="com.zoontek.rnbootsplash.RNBootSplashActivity"
         android:theme="@style/BootTheme"
         android:launchMode="singleTask">
+
         <intent-filter>
             <action android:name="android.intent.action.MAIN" />
             <category android:name="android.intent.category.LAUNCHER" />
         </intent-filter>
+
+        <!-- Custom URI handlers. Used to intercept Urban Airship deep links. -->
         <intent-filter>
             <action android:name="android.intent.action.VIEW"/>
             <category android:name="android.intent.category.DEFAULT"/>
             <category android:name="android.intent.category.BROWSABLE"/>
-
-            <!-- Custom URI handlers. Used to intercept Urban Airship deep links. -->
             <data android:scheme="expensify-cash"/>
             <data android:scheme="new-expensify"/>
+        </intent-filter>
+
+        <!-- Web URL handlers. Used to intercept web links. -->
+        <intent-filter>
+            <action android:name="android.intent.action.VIEW"/>
+            <category android:name="android.intent.category.DEFAULT"/>
+            <category android:name="android.intent.category.BROWSABLE"/>
+
+            <!-- Production URLs -->
+            <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/settings"/>
+            <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/r"/>
+            <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/details"/>
+            <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/v"/>
+            <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/bank-account"/>
+            <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/iou"/>
+            <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/enable-payments"/>
 
-            <!-- Web URL handlers. Used to intercept web links. -->
-            <data android:scheme="https" android:host="new.expensify.com" />
-            <data android:scheme="https" android:host="staging.new.expensify.com" />
+            <!-- Staging URLs -->
+            <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/settings"/>
+            <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/r"/>
+            <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/details"/>
+            <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/v"/>
+            <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/bank-account"/>
+            <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/iou"/>
+            <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/enable-payments"/>
         </intent-filter>
       </activity>
 

From 6adaff360f91f05f1623fd08c6e17fcc280cce89 Mon Sep 17 00:00:00 2001
From: Jules Rosser <jules@expensify.com>
Date: Thu, 28 Oct 2021 11:15:27 +0100
Subject: [PATCH 5/6] add missing 'setpassword' path, reorder to match iOS

---
 android/app/src/main/AndroidManifest.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 56be5f9aef6f..1fdad1973e7f 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -59,8 +59,9 @@
             <category android:name="android.intent.category.BROWSABLE"/>
 
             <!-- Production URLs -->
-            <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/settings"/>
             <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/r"/>
+            <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/settings"/>
+            <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/setpassword"/>
             <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/details"/>
             <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/v"/>
             <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/bank-account"/>
@@ -68,9 +69,9 @@
             <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/enable-payments"/>
 
             <!-- Staging URLs -->
-            <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/settings"/>
             <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/r"/>
-            <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/details"/>
+            <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/settings"/>
+            <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/setpassword"/>
             <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/v"/>
             <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/bank-account"/>
             <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/iou"/>

From c54d7140a477a632dac0627edef70d2f6b38fae5 Mon Sep 17 00:00:00 2001
From: Jules Rosser <jules@expensify.com>
Date: Thu, 28 Oct 2021 11:22:27 +0100
Subject: [PATCH 6/6] re-add removed path

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

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 1fdad1973e7f..ed644b54ef9d 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -72,6 +72,7 @@
             <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/r"/>
             <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/settings"/>
             <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/setpassword"/>
+            <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/details"/>
             <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/v"/>
             <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/bank-account"/>
             <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/iou"/>