cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agri...@apache.org
Subject android commit: CB-8411 Initialize plugins only after createViews() is called
Date Tue, 03 Feb 2015 21:03:38 GMT
Repository: cordova-android
Updated Branches:
  refs/heads/master aed485964 -> 20723896e


CB-8411 Initialize plugins only after createViews() is called


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

Branch: refs/heads/master
Commit: 20723896e12599ef7a5a0e6bee8cd967b410bdbd
Parents: aed4859
Author: Andrew Grieve <agrieve@chromium.org>
Authored: Tue Feb 3 16:03:15 2015 -0500
Committer: Andrew Grieve <agrieve@chromium.org>
Committed: Tue Feb 3 16:03:15 2015 -0500

----------------------------------------------------------------------
 framework/src/org/apache/cordova/CordovaActivity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/20723896/framework/src/org/apache/cordova/CordovaActivity.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/CordovaActivity.java b/framework/src/org/apache/cordova/CordovaActivity.java
index e4ec1b5..684c81b 100755
--- a/framework/src/org/apache/cordova/CordovaActivity.java
+++ b/framework/src/org/apache/cordova/CordovaActivity.java
@@ -155,6 +155,7 @@ public class CordovaActivity extends Activity implements CordovaInterface
{
     protected void init() {
         appView = makeWebView();
         createViews();
+        appView.init(this, pluginEntries, internalWhitelist, externalWhitelist, preferences);
 
         // Wire the hardware volume controls to control media if desired.
         String volumePref = preferences.getString("DefaultVolumeStream", "");
@@ -222,7 +223,6 @@ public class CordovaActivity extends Activity implements CordovaInterface
{
             Class<?> webViewClass = Class.forName(webViewClassName);
             Constructor<?> constructor = webViewClass.getConstructor(Context.class);
             CordovaWebView ret = (CordovaWebView) constructor.newInstance((Context)this);
-            ret.init(this, pluginEntries, internalWhitelist, externalWhitelist, preferences);
             return ret;
         } catch (Exception e) {
             throw new RuntimeException("Failed to create webview. ", e);


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


Mime
View raw message