incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bows...@apache.org
Subject [2/13] android commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-android into CordovaWebView
Date Thu, 19 Apr 2012 23:24:58 GMT
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-android
into CordovaWebView


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

Branch: refs/heads/CordovaWebView
Commit: d5dd43289b26aa62b32c0868eb6804ca5887da33
Parents: 1bd7a66 31d5a94
Author: Joe Bowser <bowserj@apache.org>
Authored: Thu Apr 19 15:37:54 2012 -0700
Committer: Joe Bowser <bowserj@apache.org>
Committed: Thu Apr 19 15:37:54 2012 -0700

----------------------------------------------------------------------
 framework/src/org/apache/cordova/DroidGap.java     |   39 ++++++++++++---
 framework/src/org/apache/cordova/FileTransfer.java |   23 ++++++++-
 .../src/org/apache/cordova/NetworkManager.java     |   15 ++---
 3 files changed, 60 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/d5dd4328/framework/src/org/apache/cordova/DroidGap.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/d5dd4328/framework/src/org/apache/cordova/FileTransfer.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/d5dd4328/framework/src/org/apache/cordova/NetworkManager.java
----------------------------------------------------------------------
diff --cc framework/src/org/apache/cordova/NetworkManager.java
index d54b506,0fac00f..61e6459
--- a/framework/src/org/apache/cordova/NetworkManager.java
+++ b/framework/src/org/apache/cordova/NetworkManager.java
@@@ -87,9 -87,9 +87,9 @@@ public class NetworkManager extends Plu
       * 
       * @param ctx The context of the main Activity.
       */
 -    public void setContext(CordovaInterface ctx) {
 +    public void setContext(Context ctx) {
          super.setContext(ctx);
-         this.sockMan = (ConnectivityManager) ctx.getSystemService(Context.CONNECTIVITY_SERVICE);
       
+         this.sockMan = (ConnectivityManager) ctx.getSystemService(Context.CONNECTIVITY_SERVICE);
          this.connectionCallbackId = null;
          
          // We need to listen to connectivity events to update navigator.connection


Mime
View raw message