You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by na...@apache.org on 2014/11/22 20:39:05 UTC
[1/3] cordova-amazon-fireos git commit: CB-7940 Disable exec bridge
if bridgeSecret is wrong
Repository: cordova-amazon-fireos
Updated Branches:
refs/heads/master 95d806703 -> 4142cbb57
CB-7940 Disable exec bridge if bridgeSecret is wrong
Project: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/commit/db508a2c
Tree: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/tree/db508a2c
Diff: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/diff/db508a2c
Branch: refs/heads/master
Commit: db508a2ce804747b783b5ae200525bf2ffd7fe02
Parents: 95d8067
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue Nov 4 15:57:51 2014 -0500
Committer: Ajitha <aj...@amazon.com>
Committed: Mon Nov 17 00:33:41 2014 +0530
----------------------------------------------------------------------
framework/src/org/apache/cordova/CordovaBridge.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/blob/db508a2c/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 f3e48b6..becbd52 100644
--- a/framework/src/org/apache/cordova/CordovaBridge.java
+++ b/framework/src/org/apache/cordova/CordovaBridge.java
@@ -99,6 +99,8 @@ public class CordovaBridge {
}
// Bridge secret wrong and bridge not due to it being from the previous page.
if (expectedBridgeSecret < 0 || bridgeSecret != expectedBridgeSecret) {
+ Log.e(LOG_TAG, "Bridge access attempt with wrong secret token, possibly from malicious code. Disabling exec() bridge!");
+ clearBridgeSecret();
throw new IllegalAccessException();
}
return true;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[2/3] cordova-amazon-fireos git commit: CB-7974 Cancel timeout timer
if view is destroyed
Posted by na...@apache.org.
CB-7974 Cancel timeout timer if view is destroyed
Project: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/commit/181bf856
Tree: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/tree/181bf856
Diff: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/diff/181bf856
Branch: refs/heads/master
Commit: 181bf856361297d8dcc595a043bf8b0ec43aa88e
Parents: db508a2
Author: Andrew Grieve <ag...@chromium.org>
Authored: Thu Nov 6 15:33:10 2014 -0500
Committer: Ajitha <aj...@amazon.com>
Committed: Mon Nov 17 00:34:49 2014 +0530
----------------------------------------------------------------------
framework/src/org/apache/cordova/CordovaWebView.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/blob/181bf856/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 57011c7..bf16362 100755
--- a/framework/src/org/apache/cordova/CordovaWebView.java
+++ b/framework/src/org/apache/cordova/CordovaWebView.java
@@ -909,6 +909,9 @@ public class CordovaWebView extends AmazonWebView {
public void handleDestroy()
{
+ // Cancel pending timeout timer.
+ loadUrlTimeout++;
+
// Send destroy event to JavaScript
// Since baseUrl is set in loadUrlIntoView, if user hit Back button before loadUrl was called, we'll get an NPE on baseUrl (CB-2458)
this.loadUrl("javascript:try{cordova.require('cordova/channel').onDestroy.fire();}catch(e){};");
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[3/3] cordova-amazon-fireos git commit: CB-7976 Use webView's context
rather than Activity's context for intent receiver
Posted by na...@apache.org.
CB-7976 Use webView's context rather than Activity's context for intent receiver
Project: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/commit/4142cbb5
Tree: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/tree/4142cbb5
Diff: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/diff/4142cbb5
Branch: refs/heads/master
Commit: 4142cbb57cc63c15f5fed1719a981cec75a71251
Parents: 181bf85
Author: Andrew Grieve <ag...@chromium.org>
Authored: Thu Nov 6 16:23:32 2014 -0500
Committer: Ajitha <aj...@amazon.com>
Committed: Mon Nov 17 15:08:47 2014 +0530
----------------------------------------------------------------------
framework/src/org/apache/cordova/App.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/blob/4142cbb5/framework/src/org/apache/cordova/App.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/App.java b/framework/src/org/apache/cordova/App.java
index 7eaceea..a0eab8d 100755
--- a/framework/src/org/apache/cordova/App.java
+++ b/framework/src/org/apache/cordova/App.java
@@ -288,7 +288,7 @@ public class App extends CordovaPlugin {
};
// Register the receiver
- this.cordova.getActivity().registerReceiver(this.telephonyReceiver, intentFilter);
+ webView.getContext().registerReceiver(this.telephonyReceiver, intentFilter);
}
/*
@@ -298,7 +298,7 @@ public class App extends CordovaPlugin {
public void onDestroy()
{
if (this.telephonyReceiver != null) {
- this.cordova.getActivity().unregisterReceiver(this.telephonyReceiver);
+ webView.getContext().unregisterReceiver(this.telephonyReceiver);
this.telephonyReceiver = null;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org