You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2015/02/19 16:34:50 UTC
[1/5] android commit: Make cookieManager a field in
AndroidCookieManager rather than using getInstance() every time
Repository: cordova-android
Updated Branches:
refs/heads/master 11d6b8029 -> de4d7cd10
Make cookieManager a field in AndroidCookieManager rather than using getInstance() every time
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/7be600d8
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/7be600d8
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/7be600d8
Branch: refs/heads/master
Commit: 7be600d8e918d5528f98bd3394c307de2709b7e0
Parents: 11d6b80
Author: Andrew Grieve <ag...@chromium.org>
Authored: Thu Feb 19 10:28:18 2015 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Thu Feb 19 10:28:18 2015 -0500
----------------------------------------------------------------------
.../org/apache/cordova/AndroidCookieManager.java | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/7be600d8/framework/src/org/apache/cordova/AndroidCookieManager.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/AndroidCookieManager.java b/framework/src/org/apache/cordova/AndroidCookieManager.java
index 09d3a0f..16eaa7a 100644
--- a/framework/src/org/apache/cordova/AndroidCookieManager.java
+++ b/framework/src/org/apache/cordova/AndroidCookieManager.java
@@ -24,38 +24,37 @@ import android.webkit.CookieManager;
import android.webkit.WebView;
class AndroidCookieManager implements ICordovaCookieManager {
-
- protected WebView webView;
+ protected final WebView webView;
+ private final CookieManager cookieManager;
public AndroidCookieManager(WebView webview) {
webView = webview;
+ cookieManager = CookieManager.getInstance();
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)
- {
- CookieManager cookieManager = CookieManager.getInstance();
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
cookieManager.setAcceptThirdPartyCookies(webView, true);
}
}
public void setCookiesEnabled(boolean accept) {
- CookieManager.getInstance().setAcceptCookie(accept);
+ cookieManager.setAcceptCookie(accept);
}
public void setCookie(final String url, final String value) {
- CookieManager.getInstance().setCookie(url, value);
+ cookieManager.setCookie(url, value);
}
public String getCookie(final String url) {
- return CookieManager.getInstance().getCookie(url);
+ return cookieManager.getCookie(url);
}
public void clearCookies() {
- CookieManager.getInstance().removeAllCookie();
+ cookieManager.removeAllCookie();
}
public void flush() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
- CookieManager.getInstance().flush();
+ cookieManager.flush();
}
}
};
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[3/5] android commit: Delete some dead code. Add a license header.
Posted by ag...@apache.org.
Delete some dead code. Add a license header.
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/fb0987b8
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/fb0987b8
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/fb0987b8
Branch: refs/heads/master
Commit: fb0987b824bcac9481a5daf4a32162b903f78de1
Parents: 88f50a6
Author: Andrew Grieve <ag...@chromium.org>
Authored: Thu Feb 19 10:31:44 2015 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Thu Feb 19 10:31:44 2015 -0500
----------------------------------------------------------------------
.../src/org/apache/cordova/AndroidWebView.java | 9 ++++----
.../src/org/apache/cordova/CordovaActivity.java | 2 --
.../src/org/apache/cordova/CordovaBridge.java | 6 +-----
.../src/org/apache/cordova/CordovaWebView.java | 22 +++++++++++++++-----
4 files changed, 23 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/fb0987b8/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 de171f2..a5f568b 100755
--- a/framework/src/org/apache/cordova/AndroidWebView.java
+++ b/framework/src/org/apache/cordova/AndroidWebView.java
@@ -80,6 +80,7 @@ public class AndroidWebView extends WebView implements CordovaWebView {
private long lastMenuEventTime = 0;
+ private NativeToJsMessageQueue nativeToJsMessageQueue;
CordovaBridge bridge;
/** custom view created by the browser (a video player for example) */
@@ -123,7 +124,7 @@ public class AndroidWebView extends WebView implements CordovaWebView {
pluginManager = new PluginManager(this, this.cordova, pluginEntries);
cookieManager = new AndroidCookieManager(this);
resourceApi = new CordovaResourceApi(this.getContext(), pluginManager);
- NativeToJsMessageQueue nativeToJsMessageQueue = new NativeToJsMessageQueue();
+ nativeToJsMessageQueue = new NativeToJsMessageQueue();
nativeToJsMessageQueue.addBridgeMode(new NativeToJsMessageQueue.NoOpBridgeMode());
nativeToJsMessageQueue.addBridgeMode(new NativeToJsMessageQueue.LoadUrlBridgeMode(this, cordova));
nativeToJsMessageQueue.addBridgeMode(new NativeToJsMessageQueue.OnlineEventsBridgeMode(new NativeToJsMessageQueue.OnlineEventsBridgeMode.OnlineEventsBridgeModeDelegate() {
@@ -137,7 +138,7 @@ public class AndroidWebView extends WebView implements CordovaWebView {
cordova.getActivity().runOnUiThread(r);
}
}));
- bridge = new CordovaBridge(pluginManager, nativeToJsMessageQueue, this.cordova.getActivity().getPackageName());
+ bridge = new CordovaBridge(pluginManager, nativeToJsMessageQueue);
initWebViewSettings();
pluginManager.addService(CoreAndroid.PLUGIN_NAME, CoreAndroid.class.getCanonicalName());
pluginManager.init();
@@ -403,14 +404,14 @@ public class AndroidWebView extends WebView implements CordovaWebView {
* (This is a convenience method)
*/
public void sendJavascript(String statement) {
- bridge.getMessageQueue().addJavaScript(statement);
+ nativeToJsMessageQueue.addJavaScript(statement);
}
/**
* Send a plugin result back to JavaScript.
*/
public void sendPluginResult(PluginResult result, String callbackId) {
- bridge.getMessageQueue().addPluginResult(result, callbackId);
+ nativeToJsMessageQueue.addPluginResult(result, callbackId);
}
/**
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/fb0987b8/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 bc262a6..08876ab 100755
--- a/framework/src/org/apache/cordova/CordovaActivity.java
+++ b/framework/src/org/apache/cordova/CordovaActivity.java
@@ -19,7 +19,6 @@
package org.apache.cordova;
import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.Locale;
@@ -350,7 +349,6 @@ public class CordovaActivity extends Activity {
// If errorUrl specified, then load it
final String errorUrl = preferences.getString("errorUrl", null);
- CordovaUriHelper helper = new CordovaUriHelper(this.cordovaInterface, appView);
if ((errorUrl != null) && (!failingUrl.equals(errorUrl)) && (appView != null)) {
// Load URL on UI thread
me.runOnUiThread(new Runnable() {
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/fb0987b8/framework/src/org/apache/cordova/CordovaBridge.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/CordovaBridge.java b/framework/src/org/apache/cordova/CordovaBridge.java
index bf95588..50eb901 100644
--- a/framework/src/org/apache/cordova/CordovaBridge.java
+++ b/framework/src/org/apache/cordova/CordovaBridge.java
@@ -36,7 +36,7 @@ public class CordovaBridge {
private NativeToJsMessageQueue jsMessageQueue;
private volatile int expectedBridgeSecret = -1; // written by UI thread, read by JS thread.
- public CordovaBridge(PluginManager pluginManager, NativeToJsMessageQueue jsMessageQueue, String packageName) {
+ public CordovaBridge(PluginManager pluginManager, NativeToJsMessageQueue jsMessageQueue) {
this.pluginManager = pluginManager;
this.jsMessageQueue = jsMessageQueue;
}
@@ -177,8 +177,4 @@ public class CordovaBridge {
}
return null;
}
-
- public NativeToJsMessageQueue getMessageQueue() {
- return jsMessageQueue;
- }
}
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/fb0987b8/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 3b209d5..de04c6a 100644
--- a/framework/src/org/apache/cordova/CordovaWebView.java
+++ b/framework/src/org/apache/cordova/CordovaWebView.java
@@ -1,3 +1,19 @@
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+*/
package org.apache.cordova;
import java.util.Map;
@@ -5,15 +21,13 @@ import java.util.List;
import android.content.Context;
import android.content.Intent;
-import android.net.Uri;
import android.view.View;
import android.webkit.WebChromeClient.CustomViewCallback;
public interface CordovaWebView {
public static final String CORDOVA_VERSION = "4.0.0-dev";
- void init(CordovaInterface cordova, List<PluginEntry> pluginEntries,
- CordovaPreferences preferences);
+ void init(CordovaInterface cordova, List<PluginEntry> pluginEntries, CordovaPreferences preferences);
View getView();
@@ -39,9 +53,7 @@ public interface CordovaWebView {
/**
* Send JavaScript statement back to JavaScript.
- * (This is a convenience method)
*
- * @param statement
* Deprecated (https://issues.apache.org/jira/browse/CB-6851)
* Instead of executing snippets of JS, you should use the exec bridge
* to create a Java->JS communication channel.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[4/5] android commit: Address TODO: Move requestFocusFromTouch() to
CordovaActivity rather than AndroidWebView
Posted by ag...@apache.org.
Address TODO: Move requestFocusFromTouch() to CordovaActivity rather than AndroidWebView
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/804dcac1
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/804dcac1
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/804dcac1
Branch: refs/heads/master
Commit: 804dcac12fc76b75bf995f541119d5166d846d79
Parents: fb0987b
Author: Andrew Grieve <ag...@chromium.org>
Authored: Thu Feb 19 10:32:29 2015 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Thu Feb 19 10:32:29 2015 -0500
----------------------------------------------------------------------
.../src/org/apache/cordova/AndroidWebView.java | 20 --------------------
.../src/org/apache/cordova/CordovaActivity.java | 2 ++
2 files changed, 2 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/804dcac1/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 a5f568b..60296a9 100755
--- a/framework/src/org/apache/cordova/AndroidWebView.java
+++ b/framework/src/org/apache/cordova/AndroidWebView.java
@@ -163,16 +163,6 @@ public class AndroidWebView extends WebView implements CordovaWebView {
private void initWebViewSettings() {
this.setInitialScale(0);
this.setVerticalScrollBarEnabled(false);
- // TODO: The Activity is the one that should call requestFocus().
- if (shouldRequestFocusOnInit()) {
- this.requestFocusFromTouch();
- }
- this.setInitialScale(0);
- this.setVerticalScrollBarEnabled(false);
- if (shouldRequestFocusOnInit()) {
- this.requestFocusFromTouch();
- }
- // Enable JavaScript
final WebSettings settings = this.getSettings();
settings.setJavaScriptEnabled(true);
settings.setJavaScriptCanOpenWindowsAutomatically(true);
@@ -267,16 +257,6 @@ public class AndroidWebView extends WebView implements CordovaWebView {
}
}
- /**
- * Override this method to decide whether or not you need to request the
- * focus when your application start
- *
- * @return true unless this method is overriden to return a different value
- */
- protected boolean shouldRequestFocusOnInit() {
- return true;
- }
-
private void exposeJsInterface() {
if ((Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR1)) {
Log.i(TAG, "Disabled addJavascriptInterface() bridge since Android version is old.");
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/804dcac1/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 08876ab..9aa5e1f 100755
--- a/framework/src/org/apache/cordova/CordovaActivity.java
+++ b/framework/src/org/apache/cordova/CordovaActivity.java
@@ -147,6 +147,8 @@ public class CordovaActivity extends Activity {
if ("media".equals(volumePref.toLowerCase(Locale.ENGLISH))) {
setVolumeControlStream(AudioManager.STREAM_MUSIC);
}
+
+ appView.getView().requestFocusFromTouch();
}
@SuppressWarnings("deprecation")
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[5/5] android commit: Deprecate custom view methods in CordovaWebView.
Posted by ag...@apache.org.
Deprecate custom view methods in CordovaWebView.
They are just helper methods that plugins should just be implementing
for themselves.
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/de4d7cd1
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/de4d7cd1
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/de4d7cd1
Branch: refs/heads/master
Commit: de4d7cd10d0d0e7c55f20101e4b7337c46101a21
Parents: 804dcac
Author: Andrew Grieve <ag...@chromium.org>
Authored: Thu Feb 19 10:33:06 2015 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Thu Feb 19 10:33:06 2015 -0500
----------------------------------------------------------------------
framework/src/org/apache/cordova/CordovaWebView.java | 12 ++++++++++++
1 file changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/de4d7cd1/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 de04c6a..2a27a33 100644
--- a/framework/src/org/apache/cordova/CordovaWebView.java
+++ b/framework/src/org/apache/cordova/CordovaWebView.java
@@ -77,10 +77,22 @@ public interface CordovaWebView {
void showWebPage(String errorUrl, boolean b, boolean c, Map<String, Object> params);
+ /**
+ * Deprecated in 4.0.0. Use your own View-toggling logic.
+ */
+ @Deprecated
boolean isCustomViewShowing();
+ /**
+ * Deprecated in 4.0.0. Use your own View-toggling logic.
+ */
+ @Deprecated
void showCustomView(View view, CustomViewCallback callback);
+ /**
+ * Deprecated in 4.0.0. Use your own View-toggling logic.
+ */
+ @Deprecated
void hideCustomView();
CordovaResourceApi getResourceApi();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[2/5] android commit: Make showWebPage() take a Map instead of a
HashMap
Posted by ag...@apache.org.
Make showWebPage() take a Map instead of a HashMap
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/88f50a66
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/88f50a66
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/88f50a66
Branch: refs/heads/master
Commit: 88f50a66ff395bde710910e6382c0c706e1f1a68
Parents: 7be600d
Author: Andrew Grieve <ag...@chromium.org>
Authored: Thu Feb 19 10:30:26 2015 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Thu Feb 19 10:30:26 2015 -0500
----------------------------------------------------------------------
framework/src/org/apache/cordova/AndroidWebView.java | 4 ++--
framework/src/org/apache/cordova/CordovaWebView.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/88f50a66/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 50641fe..de171f2 100755
--- a/framework/src/org/apache/cordova/AndroidWebView.java
+++ b/framework/src/org/apache/cordova/AndroidWebView.java
@@ -21,9 +21,9 @@ package org.apache.cordova;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
+import java.util.Map;
import android.annotation.SuppressLint;
import android.annotation.TargetApi;
@@ -442,7 +442,7 @@ public class AndroidWebView extends WebView implements CordovaWebView {
* @param clearHistory Clear the history stack, so new page becomes top of history
* @param params Parameters for new app
*/
- public void showWebPage(String url, boolean openExternal, boolean clearHistory, HashMap<String, Object> params) {
+ public void showWebPage(String url, boolean openExternal, boolean clearHistory, Map<String, Object> params) {
LOG.d(TAG, "showWebPage(%s, %b, %b, HashMap", url, openExternal, clearHistory);
// If clearing history
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/88f50a66/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 1cb0601..3b209d5 100644
--- a/framework/src/org/apache/cordova/CordovaWebView.java
+++ b/framework/src/org/apache/cordova/CordovaWebView.java
@@ -1,6 +1,6 @@
package org.apache.cordova;
-import java.util.HashMap;
+import java.util.Map;
import java.util.List;
import android.content.Context;
@@ -63,7 +63,7 @@ public interface CordovaWebView {
@Deprecated
void sendJavascript(String statememt);
- void showWebPage(String errorUrl, boolean b, boolean c, HashMap<String, Object> params);
+ void showWebPage(String errorUrl, boolean b, boolean c, Map<String, Object> params);
boolean isCustomViewShowing();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org