Merge pull request #7954 from ashcoding/TIMOB-23186

[TIMOB-23186] Android: Webview has blacklistedURLs property implemented
tidev · Apr 21, 2016 · f57dcc2 · f57dcc2
2 parents ca31cf1 + 5d2af60
commit f57dcc2
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 0 deletions.
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/WebViewProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/WebViewProxy.java
@@ -29,6 +29,7 @@
 import android.webkit.WebView;
 
 @Kroll.proxy(creatableInModule=UIModule.class, propertyAccessors = {
+	TiC.PROPERTY_BLACKLISTED_URLS,
 	TiC.PROPERTY_DATA,
 	TiC.PROPERTY_ON_CREATE_WINDOW,
 	TiC.PROPERTY_SCALES_PAGE_TO_FIT,

diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/webview/TiWebViewClient.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/webview/TiWebViewClient.java
@@ -101,6 +101,15 @@ public boolean shouldOverrideUrlLoading(final WebView view, String url)
 	{
 		Log.d(TAG, "url=" + url, Log.DEBUG_MODE);
 
+		if (webView.getProxy().hasProperty(TiC.PROPERTY_BLACKLISTED_URLS)) {
+		    String [] blacklistedSites = TiConvert.toStringArray((Object[])webView.getProxy().getProperty(TiC.PROPERTY_BLACKLISTED_URLS));
+		    for(String site : blacklistedSites) {
+		        if (url.equalsIgnoreCase(site) || (url.indexOf(site) > -1)) {
+		            return true;
+		        }
+		    }
+		}
+
 		if (URLUtil.isAssetUrl(url) || URLUtil.isContentUrl(url) || URLUtil.isFileUrl(url)) {
 			// go through the proxy to ensure we're on the UI thread
 			webView.getProxy().setPropertyAndFire(TiC.PROPERTY_URL, url);

diff --git a/android/titanium/src/java/org/appcelerator/titanium/TiC.java b/android/titanium/src/java/org/appcelerator/titanium/TiC.java
@@ -901,6 +901,11 @@ public class TiC
 	 */
 	public static final String PROPERTY_BIRTHDAY = "birthday";
 
+	/**
+	 * @module.api
+	 */
+	public static final String PROPERTY_BLACKLISTED_URLS = "blacklistedURLs";
+
 	/**
 	 * @module.api
 	 */

diff --git a/apidoc/Titanium/UI/WebView.yml b/apidoc/Titanium/UI/WebView.yml
@@ -290,6 +290,17 @@ methods:
         summary: Forces the web view to destroy the iFrame (Mobile Web only).
         type: Boolean
 
+- name: blacklistedURLs
+    summary: |
+        An array of url strings to blacklist.
+    description: |
+        An array of url strings to blacklist. This will stop the webview from going to urls listed in
+        the blacklist.
+    type: Array<String>
+    since: "5.4.0"
+    platforms: [android]
+    availability: creation
+
 
 events: