Skip to content

[Navigation] Fix deeplink domain parsing being case sensitive #144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
bentrengrove wants to merge 5 commits into from
Closed

[Navigation] Fix deeplink domain parsing being case sensitive #144

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
99f1ba8
Add tests for case insensitive
Mar 17, 2021
75f7756
Change regex pattern matching to case insensitive
Mar 17, 2021
40e86c5
Improve tests
Mar 17, 2021
1ff7445
Update test names
Mar 22, 2021
868bcf3
Fix lint errors
Mar 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 68 additions & 0 deletions navigation/navigation-common/src/androidTest/java/androidx/navigation/NavDeepLinkTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1049,4 +1049,72 @@ class NavDeepLinkTest {
.that(matchArgs?.getInt("id"))
.isEqualTo(id)
}

@Test
fun deepLinkCaseInsensitiveDomain() {
Comment thread
bentrengrove marked this conversation as resolved.
Resolved
val deepLinkString = DEEP_LINK_EXACT_HTTP
val deepLink = NavDeepLink(deepLinkString)

val deepLinkUpper = deepLinkString.toUpperCase()
assertThat(deepLink.matches(Uri.parse(deepLinkUpper)))
}

@Test
fun deepLinkCaseInsensitiveDomainRegexMatching() {
Comment thread
bentrengrove marked this conversation as resolved.
Resolved
val deepLinkArgument = "$DEEP_LINK_EXACT_HTTPS/users/{id}/posts"
val deepLink = NavDeepLink(deepLinkArgument)

val id = 2
val matchArgs = deepLink.getMatchingArguments(
Uri.parse("${DEEP_LINK_EXACT_HTTPS.toUpperCase()}/users/${id}/posts"),
mapOf("id" to intArgument())
)
assertWithMessage("Args should not be null")
.that(matchArgs)
.isNotNull()
assertWithMessage("Args should contain the id")
.that(matchArgs?.getInt("id"))
.isEqualTo(id)
}

@Test
fun deepLinkCaseInsensitiveArguments() {
Comment thread
bentrengrove marked this conversation as resolved.
Resolved
val deepLinkArgument = "$DEEP_LINK_EXACT_HTTPS/users/{id}/posts"
val deepLink = NavDeepLink(deepLinkArgument)

val id = 2
val matchArgs = deepLink.getMatchingArguments(
Uri.parse(deepLinkArgument
.replace("{id}", id.toString())
.replace("users", "Users")
),
mapOf("id" to intArgument())
)
assertWithMessage("Args should not be null")
.that(matchArgs)
.isNotNull()
assertWithMessage("Args should contain the id")
.that(matchArgs?.getInt("id"))
.isEqualTo(id)
}

@Test
fun deepLinkCaseSensitiveParams() {
Comment thread
bentrengrove marked this conversation as resolved.
Resolved
val deepLinkString = "$DEEP_LINK_EXACT_HTTP/?myParam={param}"
val deepLink = NavDeepLink(deepLinkString)

val param = 2
val deepLinkUpper = deepLinkString
.replace("myParam", "MyParam")
Comment thread
bentrengrove marked this conversation as resolved.
Resolved
.replace("{param}", param.toString())
val matchArgs = deepLink.getMatchingArguments(Uri.parse(deepLinkUpper),
mapOf("param" to intArgument()))

assertWithMessage("Args should be not be null")
.that(matchArgs)
.isNotNull()
assertWithMessage("Args bundle should be empty")
.that(matchArgs!!.isEmpty)
Comment thread
bentrengrove marked this conversation as resolved.
Resolved
.isTrue()
}
}
2 changes: 1 addition & 1 deletion navigation/navigation-common/src/main/java/androidx/navigation/NavDeepLink.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,7 @@ public class NavDeepLink internal constructor(
// specifically escape any .* instances to ensure
// they are still treated as wildcards in our final regex
val finalRegex = uriRegex.toString().replace(".*", "\\E.*\\Q")
pattern = Pattern.compile(finalRegex)
pattern = Pattern.compile(finalRegex, Pattern.CASE_INSENSITIVE)

@jbw0033 jbw0033 Mar 22, 2021

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ianhanniballake Since this is on the finalRegex, it is making the entire pattern including params case insensitive, but based on the test above, it looks like params still aren't matching, which is what we want. Wanted your thoughts on this method, vs always checking the domain in the lowercase or something similar.

}
if (mimeType != null) {
val mimeTypePattern = Pattern.compile("^[\\s\\S]+/[\\s\\S]+$")
Expand Down