Make deep link path arguments to not include slash

osipxd · osipxd · commit f16861bc1f6b · 2021-04-03T12:44:36.000+03:00
Slash is used for URI path splitting. Arguments should not include more than one path section.

Test: ./gradlew test connectedCheck
Fixes: b/184072811
diff --git a/navigation/navigation-common/src/androidTest/java/androidx/navigation/NavDestinationAndroidTest.kt b/navigation/navigation-common/src/androidTest/java/androidx/navigation/NavDestinationAndroidTest.kt
@@ -111,6 +111,26 @@ class NavDestinationAndroidTest {
             .isEqualTo(99)
     }
 
+    @Test
+    fun matchDeepLinkBestMatchPathTail() {
+        val destination = NoOpNavigator().createDestination()
+
+        destination.addArgument("id", stringArgument())
+        destination.addDeepLink("www.example.com/users/{id}")
+        destination.addDeepLink("www.example.com/users/{id}/posts")
+
+        val match = destination.matchDeepLink(
+            Uri.parse("https://www.example.com/users/u43/posts")
+        )
+
+        assertWithMessage("Deep link should match")
+            .that(match)
+            .isNotNull()
+        assertWithMessage("Deep link should extract id argument correctly")
+            .that(match?.matchingArgs?.getString("id"))
+            .isEqualTo("u43")
+    }
+
     @Test
     fun matchDeepLinkBestMimeType() {
         val destination = NoOpNavigator().createDestination()
@@ -178,6 +198,18 @@ class NavDestinationAndroidTest {
             .that(destination.hasDeepLink(deepLink)).isFalse()
     }
 
+    @Test
+    fun testIsValidDeepLinkInvalidLinkPathTail() {
+        val destination = NoOpNavigator().createDestination()
+        destination.addArgument("testString", stringArgument())
+        destination.addDeepLink("android-app://androidx.navigation.test/{testString}")
+
+        val deepLink = Uri.parse("android-app://androidx.navigation.test/test/extra")
+
+        assertWithMessage("Deep link should not match")
+            .that(destination.hasDeepLink(deepLink)).isFalse()
+    }
+
     @Test
     fun addInDefaultArgs() {
         val destination = NoOpNavigator().createDestination()
diff --git a/navigation/navigation-common/src/main/java/androidx/navigation/NavDeepLink.kt b/navigation/navigation-common/src/main/java/androidx/navigation/NavDeepLink.kt
@@ -79,7 +79,7 @@ public class NavDeepLink internal constructor(
             arguments.add(argName)
             // Use Pattern.quote() to treat the input string as a literal
             uriRegex.append(Pattern.quote(uri.substring(appendPos, matcher.start())))
-            uriRegex.append("(.+?)")
+            uriRegex.append("([^/]+?)")
             appendPos = matcher.end()
             exactDeepLink = false
         }

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ public class NavDeepLink internal constructor(`
`79`	`79`	`arguments.add(argName)`
`80`	`80`	`// Use Pattern.quote() to treat the input string as a literal`
`81`	`81`	`uriRegex.append(Pattern.quote(uri.substring(appendPos, matcher.start())))`
`82`		`- uriRegex.append("(.+?)")`
	`82`	`+ uriRegex.append("([^/]+?)")`
`83`	`83`	`appendPos = matcher.end()`
`84`	`84`	`exactDeepLink = false`
`85`	`85`	`}`