Use {argName} for validating deep link arguments

While in many cases query parameters are in the
form of myarg={myarg}, this should never be a hard
requirement. Instead, only the value within braces
(what is actually used as the argument name) should
be used when validating that all required
arguments are present in the NavDeepLink.

Relnote: "Fixed a regression introduced in
[Navigation `2.4.0-alpha09`](#2.4.0-alpha09) when using
deep links with query parameters where Navigation would
incorrectly validate argument names using the query
parameter name (i.e., the `id` of `?id={userId}`) rather
than using the actual argument names present in the value
(the `userId` in the example above)."
Test: new NavDestinationAndroidTest tests pass
BUG: 200845660

Change-Id: Id2f399a5e19e593f34e02fc811f1cc28ec0689b8

Author: ianhanniballake

navigation/navigation-common/src/androidTest/java/androidx/navigation/NavDestinationAndroidTest.kt

@@ -111,6 +111,44 @@ class NavDestinationAndroidTest {
             .isEqualTo(43)
     }
 
+    @Test
+    fun matchDeepLinkWithQueryParams() {
+        val destination = NoOpNavigator().createDestination()
+        destination.addArgument("id", intArgument())
+        destination.addDeepLink("www.example.com/users?id={id}")
+
+        val match = destination.matchDeepLink(
+            Uri.parse("https://www.example.com/users?id=43")
+        )
+
+        assertWithMessage("Deep link should match")
+            .that(match)
+            .isNotNull()
+
+        assertWithMessage("Deep link should extract id argument correctly")
+            .that(match?.matchingArgs?.getInt("id"))
+            .isEqualTo(43)
+    }
+
+    @Test
+    fun matchDeepLinkWithNonMatchingQueryParams() {
+        val destination = NoOpNavigator().createDestination()
+        destination.addArgument("id", intArgument())
+        destination.addDeepLink("www.example.com/users?userId={id}")
+
+        val match = destination.matchDeepLink(
+            Uri.parse("https://www.example.com/users?userId=43")
+        )
+
+        assertWithMessage("Deep link should match")
+            .that(match)
+            .isNotNull()
+
+        assertWithMessage("Deep link should extract id argument correctly")
+            .that(match?.matchingArgs?.getInt("id"))
+            .isEqualTo(43)
+    }
+
     @Test
     fun matchDeepLinkBestMatchExact() {
         val destination = NoOpNavigator().createDestination()

navigation/navigation-common/src/main/java/androidx/navigation/NavDeepLink.kt

@@ -56,7 +56,7 @@ public class NavDeepLink internal constructor(
 
     /** Arguments present in the deep link, including both path and query arguments. */
     internal val argumentsNames: List<String>
-        get() = arguments + paramArgMap.keys
+        get() = arguments + paramArgMap.values.flatMap { it.arguments }
 
     public var isExactDeepLink: Boolean = false
         /** @suppress */
@@ -234,7 +234,7 @@ public class NavDeepLink internal constructor(
      */
     private class ParamQuery {
         var paramRegex: String? = null
-        private val arguments = mutableListOf<String>()
+        val arguments = mutableListOf<String>()
 
         fun addArgumentName(name: String) {
             arguments.add(name)