Merge branch 'unplug-whitelist'

This commit is contained in:
Ian Clelland
2015-02-18 09:37:00 -05:00
11 changed files with 300 additions and 187 deletions
@@ -63,8 +63,7 @@ public class CordovaWebViewTestActivity extends Activity {
AndroidWebView webView = (AndroidWebView) findViewById(R.id.cordovaWebView);
cordovaWebView = webView;
cordovaWebView.init(cordovaInterface, Config.getPluginEntries(), Config.getWhitelist(),
Config.getExternalWhitelist(), Config.getPreferences());
cordovaWebView.init(cordovaInterface, Config.getPluginEntries(), Config.getPreferences());
cordovaWebView.loadUrl(START_URL);
}