CB-14061: (android) comply with RFC 3986 for custom URL scheme handling

timbru31 · timbru31 · commit f57ede9be2a8 · 2018-05-02T20:18:34.000+02:00
diff --git a/src/android/InAppBrowser.java b/src/android/InAppBrowser.java
@@ -1112,7 +1112,7 @@ else if (url.startsWith("sms:")) {
                 }
             }
             // Test for whitelisted custom scheme names like mycoolapp:// or twitteroauthresponse:// (Twitter Oauth Response)
-            else if (!url.startsWith("http:") && !url.startsWith("https:") && url.matches("^[a-z]*://.*?$")) {
+            else if (!url.startsWith("http:") && !url.startsWith("https:") && url.matches("^[A-Za-z0-9+.-]*://.*?$")) {
                 if (allowedSchemes == null) {
                     String allowed = preferences.getString("AllowedSchemes", "");
                     allowedSchemes = allowed.split(",");

Original file line number	Diff line number	Diff line change
`@@ -1112,7 +1112,7 @@ else if (url.startsWith("sms:")) {`
`1112`	`1112`	`}`
`1113`	`1113`	`}`
`1114`	`1114`	`// Test for whitelisted custom scheme names like mycoolapp:// or twitteroauthresponse:// (Twitter Oauth Response)`
`1115`		`- else if (!url.startsWith("http:") && !url.startsWith("https:") && url.matches("^[a-z]://.?$")) {`
	`1115`	`+ else if (!url.startsWith("http:") && !url.startsWith("https:") && url.matches("^[A-Za-z0-9+.-]://.?$")) {`
`1116`	`1116`	`if (allowedSchemes == null) {`
`1117`	`1117`	`String allowed = preferences.getString("AllowedSchemes", "");`
`1118`	`1118`	`allowedSchemes = allowed.split(",");`