Commit 9ea31449 authored Apr 20, 2023 by jackyzy823

Bug 1822731 - Fix NullPointerException when scheme is null in...

Bug 1822731 - Fix NullPointerException when scheme is null in normalizeUriScheme. r=geckoview-reviewers,m_kato

Differential Revision: https://phabricator.services.mozilla.com/D175728

parent e14b7486

mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/IntentUtils.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,9 @@ public class IntentUtils {
		*/
		private static Uri normalizeUriScheme(final Uri uri) {
		final String scheme = uri.getScheme();
		if (scheme == null) {
		return uri;
		}
		final String lower = scheme.toLowerCase(Locale.ROOT);
		if (lower.equals(scheme)) {
		return uri;

mobile/android/geckoview/src/test/java/org/mozilla/gecko/util/IntentUtilsTest.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -57,4 +57,10 @@ public class IntentUtilsTest {
		assertFalse(IntentUtils.isUriSafeForScheme("tel:*%2306%23"));
		assertFalse(IntentUtils.isUriSafeForScheme("tel:%2A%2306%23"));
		}

		@Test
		public void intentDataWithoutScheme() {
		final String uri = "intent:non_scheme_intent#Intent;end";
		assertTrue(IntentUtils.isUriSafeForScheme(uri));
		}
		}