cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From i..@apache.org
Subject android commit: Update native tests
Date Thu, 30 Oct 2014 19:08:52 GMT
Repository: cordova-android
Updated Branches:
  refs/heads/unplug-whitelist ed78b557c -> 198364afb


Update native tests


Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/198364af
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/198364af
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/198364af

Branch: refs/heads/unplug-whitelist
Commit: 198364afb9ca25b1fac9545dcf515dca76c65e28
Parents: ed78b55
Author: Ian Clelland <iclelland@chromium.org>
Authored: Thu Oct 30 15:08:26 2014 -0400
Committer: Ian Clelland <iclelland@chromium.org>
Committed: Thu Oct 30 15:08:26 2014 -0400

----------------------------------------------------------------------
 test/src/org/apache/cordova/test/CordovaWebViewTestActivity.java | 3 +--
 test/src/org/apache/cordova/test/menus.java                      | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/198364af/test/src/org/apache/cordova/test/CordovaWebViewTestActivity.java
----------------------------------------------------------------------
diff --git a/test/src/org/apache/cordova/test/CordovaWebViewTestActivity.java b/test/src/org/apache/cordova/test/CordovaWebViewTestActivity.java
index 43e0b2b..1978cfc 100644
--- a/test/src/org/apache/cordova/test/CordovaWebViewTestActivity.java
+++ b/test/src/org/apache/cordova/test/CordovaWebViewTestActivity.java
@@ -51,8 +51,7 @@ public class CordovaWebViewTestActivity extends Activity implements CordovaInter
         Config.init(this);
         
         cordovaWebView = (CordovaWebView) findViewById(R.id.cordovaWebView);
-        cordovaWebView.init(this, Config.getPluginEntries(), Config.getWhitelist(),
-            Config.getExternalWhitelist(), Config.getPreferences());
+        cordovaWebView.init(this, Config.getPluginEntries(), Config.getPreferences());
 
         cordovaWebView.loadUrl("file:///android_asset/www/index.html");
 

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/198364af/test/src/org/apache/cordova/test/menus.java
----------------------------------------------------------------------
diff --git a/test/src/org/apache/cordova/test/menus.java b/test/src/org/apache/cordova/test/menus.java
index 9bde03e..4c65ed5 100755
--- a/test/src/org/apache/cordova/test/menus.java
+++ b/test/src/org/apache/cordova/test/menus.java
@@ -34,7 +34,7 @@ public class menus extends CordovaActivity {
         super.onCreate(savedInstanceState);
         // need the title to be shown (config.xml) for the options menu to be visible
         super.init();
-        super.registerForContextMenu(super.appView);
+        super.registerForContextMenu(super.appView.getView());
         super.loadUrl("file:///android_asset/www/menus/index.html");
     }
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message