cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agri...@apache.org
Subject android commit: Add missing changes from previous merge commit
Date Fri, 04 Jul 2014 14:32:34 GMT
Repository: cordova-android
Updated Branches:
  refs/heads/4.0.x 4ca230569 -> a8330773c


Add missing changes from previous merge commit


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

Branch: refs/heads/4.0.x
Commit: a8330773ca529ea6584d5f5716a5d51ce6315e0e
Parents: 4ca2305
Author: Andrew Grieve <agrieve@chromium.org>
Authored: Fri Jul 4 10:32:02 2014 -0400
Committer: Andrew Grieve <agrieve@chromium.org>
Committed: Fri Jul 4 10:32:02 2014 -0400

----------------------------------------------------------------------
 .../org/apache/cordova/AndroidChromeClient.java | 22 ++------------------
 .../src/org/apache/cordova/AndroidWebView.java  | 20 ++----------------
 .../src/org/apache/cordova/CordovaActivity.java |  2 +-
 .../org/apache/cordova/CordovaChromeClient.java |  1 -
 .../src/org/apache/cordova/CordovaWebView.java  |  6 ------
 .../src/org/apache/cordova/PluginManager.java   |  1 +
 6 files changed, 6 insertions(+), 46 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/a8330773/framework/src/org/apache/cordova/AndroidChromeClient.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/AndroidChromeClient.java b/framework/src/org/apache/cordova/AndroidChromeClient.java
index 31d9b68..55ce0f5 100755
--- a/framework/src/org/apache/cordova/AndroidChromeClient.java
+++ b/framework/src/org/apache/cordova/AndroidChromeClient.java
@@ -65,7 +65,7 @@ public class AndroidChromeClient extends WebChromeClient implements CordovaChrom
     private static final String LOG_TAG = "CordovaChromeClient";
     private long MAX_QUOTA = 100 * 1024 * 1024;
     protected CordovaInterface cordova;
-    protected CordovaWebView appView;
+    protected AndroidWebView appView;
 
     // the video progress view
     private View mVideoProgressView;
@@ -75,34 +75,16 @@ public class AndroidChromeClient extends WebChromeClient implements CordovaChrom
     
     /**
      * Constructor.
-     *
-     * @param cordova
-     */
-    public AndroidChromeClient(CordovaInterface cordova) {
-        this.cordova = cordova;
-    }
-
-    /**
-     * Constructor.
      * 
      * @param ctx
      * @param app
      */
-    public AndroidChromeClient(CordovaInterface ctx, CordovaWebView app) {
+    public AndroidChromeClient(CordovaInterface ctx, AndroidWebView app) {
         this.cordova = ctx;
         this.appView = app;
     }
 
     /**
-     * Constructor.
-     * 
-     * @param view
-     */
-    public void setWebView(CordovaWebView view) {
-        this.appView = view;
-    }
-
-    /**
      * Tell the client to display a javascript alert dialog.
      *
      * @param view

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/a8330773/framework/src/org/apache/cordova/AndroidWebView.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/AndroidWebView.java b/framework/src/org/apache/cordova/AndroidWebView.java
index a169d30..df4f1f9 100755
--- a/framework/src/org/apache/cordova/AndroidWebView.java
+++ b/framework/src/org/apache/cordova/AndroidWebView.java
@@ -93,7 +93,7 @@ public class AndroidWebView extends WebView implements CordovaWebView {
     private long lastMenuEventTime = 0;
 
     NativeToJsMessageQueue jsMessageQueue;
-    ExposedJsApi exposedJsApi;
+    AndroidExposedJsApi exposedJsApi;
 
     /** custom view created by the browser (a video player for example) */
     private View mCustomView;
@@ -235,7 +235,7 @@ public class AndroidWebView extends WebView implements CordovaWebView
{
      */
     @Override
     public CordovaChromeClient makeWebChromeClient() {
-        return (CordovaChromeClient) new AndroidChromeClient(this.cordova);
+        return (CordovaChromeClient) new AndroidChromeClient(this.cordova, this);
     }
 
     /**
@@ -992,22 +992,6 @@ public class AndroidWebView extends WebView implements CordovaWebView
{
     }
 
     @Override
-    public String exec(String service, String action, String callbackId,
-            String message) throws JSONException {
-        return this.exposedJsApi.exec(service, action, callbackId, message);
-    }
-
-    @Override
-    public void setNativeToJsBridgeMode(int parseInt) {
-        this.exposedJsApi.setNativeToJsBridgeMode(parseInt);
-    }
-
-    @Override
-    public String retrieveJsMessages(boolean equals) {
-        return this.exposedJsApi.retrieveJsMessages(equals);
-    }
-
-    @Override
     public boolean onOverrideUrlLoading(String url) {
         return this.pluginManager.onOverrideUrlLoading(url);
     }

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/a8330773/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 c8b9e96..77e896c 100755
--- a/framework/src/org/apache/cordova/CordovaActivity.java
+++ b/framework/src/org/apache/cordova/CordovaActivity.java
@@ -753,7 +753,7 @@ public class CordovaActivity extends Activity implements CordovaInterface
{
         LOG.d(TAG, "Incoming Result");
         super.onActivityResult(requestCode, resultCode, intent);
         Log.d(TAG, "Request code = " + requestCode);
-        if (appView != null && requestCode == CordovaChromeClient.FILECHOOSER_RESULTCODE)
{
+        if (appView != null && requestCode == AndroidChromeClient.FILECHOOSER_RESULTCODE)
{
         	ValueCallback<Uri> mUploadMessage = ((CordovaChromeClient) this.appView.getWebChromeClient()).getValueCallback();
             Log.d(TAG, "did we get here?");
             if (null == mUploadMessage)

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/a8330773/framework/src/org/apache/cordova/CordovaChromeClient.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/CordovaChromeClient.java b/framework/src/org/apache/cordova/CordovaChromeClient.java
index 87177b4..f5f470f 100644
--- a/framework/src/org/apache/cordova/CordovaChromeClient.java
+++ b/framework/src/org/apache/cordova/CordovaChromeClient.java
@@ -22,6 +22,5 @@ import android.net.Uri;
 import android.webkit.ValueCallback;
 
 public interface CordovaChromeClient {
-    void setWebView(CordovaWebView appView);
     ValueCallback<Uri> getValueCallback();
 }

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/a8330773/framework/src/org/apache/cordova/CordovaWebView.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/CordovaWebView.java b/framework/src/org/apache/cordova/CordovaWebView.java
index 6534a5d..ac73ecb 100644
--- a/framework/src/org/apache/cordova/CordovaWebView.java
+++ b/framework/src/org/apache/cordova/CordovaWebView.java
@@ -102,12 +102,6 @@ public interface CordovaWebView {
 
     boolean isCustomViewShowing();
 
-    String exec(String service, String action, String callbackId, String message) throws
JSONException;
-
-    void setNativeToJsBridgeMode(int parseInt);
-
-    String retrieveJsMessages(boolean equals);
-
     void showCustomView(View view, CustomViewCallback callback);
 
     void hideCustomView();

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/a8330773/framework/src/org/apache/cordova/PluginManager.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/PluginManager.java b/framework/src/org/apache/cordova/PluginManager.java
index c8cecf2..feb5680 100755
--- a/framework/src/org/apache/cordova/PluginManager.java
+++ b/framework/src/org/apache/cordova/PluginManager.java
@@ -23,6 +23,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Set;
 
 import org.apache.cordova.CordovaWebView;
 import org.apache.cordova.CallbackContext;


Mime
View raw message