github/cordova-android
4
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2026-04-23 00:00:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Return error conditions from CallbackServer instead of just closing connection.

Browse Source
This commit is contained in:
Bryce Curtis
2010-11-01 13:59:08 -05:00
parent be5cac6d0b
commit 80c15de606
2 changed files with 41 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/assets/js/phonegap.js.base
+27 -3
View File
@@ -578,8 +578,8 @@ PhoneGap.run_command = function() {
};
PhoneGap.JSCallbackPort = CallbackServer.getPort();
PhoneGap.JSCallbackToken = CallbackServer.getToken();
PhoneGap.JSCallbackPort = null;
PhoneGap.JSCallbackToken = null;
/**
* This is only for Android.
@@ -605,7 +605,7 @@ PhoneGap.JSCallback = function() {
}
catch (e) {
// If we're getting an error here, seeing the message will help in debugging
console.log("Message from Server: " + msg);
console.log("JSCallback: Message from Server: " + msg);
console.log("JSCallback Error: "+e);
}
}, 1);
@@ -617,15 +617,38 @@ PhoneGap.JSCallback = function() {
setTimeout(PhoneGap.JSCallback, 10);
}
// If security error
else if (xmlhttp.status == 403) {
console.log("JSCallback Error: Invalid token. Stopping callbacks.");
}
// If server is stopping
else if (xmlhttp.status == 503) {
console.log("JSCallback Error: Service unavailable. Stopping callbacks.");
}
// If request wasn't GET
else if (xmlhttp.status == 400) {
console.log("JSCallback Error: Bad request. Stopping callbacks.");
}
// If error, restart callback server
else {
console.log("JSCallback Error: Request failed.");
CallbackServer.restartServer();
PhoneGap.JSCallbackPort = null;
PhoneGap.JSCallbackToken = null;
setTimeout(PhoneGap.JSCallback, 100);
}
}
}
if (PhoneGap.JSCallbackPort == null) {
PhoneGap.JSCallbackPort = CallbackServer.getPort();
}
if (PhoneGap.JSCallbackToken == null) {
PhoneGap.JSCallbackToken = CallbackServer.getToken();
}
xmlhttp.open("GET", "http://127.0.0.1:"+PhoneGap.JSCallbackPort+"/"+PhoneGap.JSCallbackToken , true);
xmlhttp.send();
};
@@ -651,6 +674,7 @@ PhoneGap.JSCallbackPolling = function() {
var t = eval(""+msg);
}
catch (e) {
console.log("JSCallbackPolling: Message from Server: " + msg);
console.log("JSCallbackPolling Error: "+e);
}
}, 1);