github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-02-22 08:53:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Android 2.2+ supports W3C Connection API

Browse Source 
For Android version 2.2 or better the navigator.connection object already
exists. If this case we should immediately fire the onPhoneGapConnectionReady
event so we don't tie up the 'deviceready' event.
This commit is contained in:
macdonst 2011-05-06 04:18:35 +08:00
parent bde59adc04
commit 346ed60f0d
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
framework/assets/js/network.js
View File

@ -96,18 +96,6 @@ Connection.NONE = 20;
* @param {Function} errorCallback The function to call when there is an error getting the Connection data. (OPTIONAL) * @param {Function} errorCallback The function to call when there is an error getting the Connection data. (OPTIONAL)
*/ */
Connection.prototype.getInfo = function(successCallback, errorCallback) { Connection.prototype.getInfo = function(successCallback, errorCallback) {
// successCallback required
if (typeof successCallback !== "function") {
console.log("Connection Error: successCallback is not a function");
return;
}
// errorCallback optional
if (errorCallback && (typeof errorCallback !== "function")) {
console.log("Connection Error: errorCallback is not a function");
return;
}
// Get info // Get info
PhoneGap.exec(successCallback, errorCallback, "Network Status", "getConnectionInfo", []); PhoneGap.exec(successCallback, errorCallback, "Network Status", "getConnectionInfo", []);
}; };
@ -117,8 +105,13 @@ PhoneGap.addConstructor(function() {
if (typeof navigator.network === "undefined") { if (typeof navigator.network === "undefined") {
navigator.network = new Network(); navigator.network = new Network();
} }
// No native connection object for Android 2.1 or earlier, so use PhoneGap connection
if (typeof navigator.connection === "undefined") { if (typeof navigator.connection === "undefined") {
navigator.connection = new Connection(); navigator.connection = new Connection();
} }
// If Android 2.2+ then fire the connection ready event
else {
PhoneGap.onPhoneGapConnectionReady.fire();
}
}); });
}; };