resolving query params in deep links into the app since it's not supported as a path in the manifest declaration

Author: mzorz

Simplenote/src/main/AndroidManifest.xml

@@ -86,7 +86,7 @@
 
                 <data
                     android:host="app.simplenote.com"
-                    android:pathPattern="/account/.*/reset?redirect=simplenote://launch"
+                    android:pathPattern="/account/.*/reset"
                     android:scheme="https">
                 </data>
 
@@ -122,7 +122,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <data
                     android:host="app.simplenote.com"
-                    android:pathPattern="/account/.*/reset?redirect=simplenote://launch"
+                    android:pathPattern="/account/.*/reset"
                     android:scheme="https">
                 </data>
             </intent-filter>

Simplenote/src/main/java/com/automattic/simplenote/DeepLinkActivity.kt

@@ -27,8 +27,13 @@ class DeepLinkActivity : AppCompatActivity() {
                 startActivity(intent)
             }
             VERIFIED_WEB_SCHEME -> {
-                // New MagicLink
-                startMagicLinkConfirmation(uri)
+                // Check if this is a password reset URL
+                if (uri.path?.contains("/account/") == true && uri.path?.contains("/reset") == true) {
+                    handlePasswordReset(uri)
+                } else {
+                    // New MagicLink
+                    startMagicLinkConfirmation(uri)
+                }
             }
             LOGIN_SCHEME -> {
                 if (queryParamContainsData(uri.query, USERNAME_KEY_QUERY) && queryParamContainsData(uri.query, AUTH_CODE_QUERY)) {
@@ -88,6 +93,21 @@ class DeepLinkActivity : AppCompatActivity() {
         }
     }
 
+    private fun handlePasswordReset(uri: Uri) {
+        val redirectParam = uri.getQueryParameter("redirect")
+        if (redirectParam == "simplenote://launch") {
+            // Handle the redirect to launch the app
+            val intent = IntentUtils.maybeAliasedIntent(applicationContext)
+            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK)
+            startActivity(intent)
+        } else {
+            // Default behavior for reset URLs without redirect
+            val intent = IntentUtils.maybeAliasedIntent(applicationContext)
+            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK)
+            startActivity(intent)
+        }
+    }
+
     private fun queryParamContainsData(path: String?, otherString: String) : Boolean = path?.contains(otherString, true) == true