From 8cb71673c28babeb5647a574879adb09efba8e01 Mon Sep 17 00:00:00 2001 From: Joe Bowser Date: Mon, 27 Jun 2011 10:22:57 -0700 Subject: [PATCH 1/4] Changing default target to the highest for maximum compatibility --- framework/default.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/default.properties b/framework/default.properties index c5d5335e..aa2fcdf7 100644 --- a/framework/default.properties +++ b/framework/default.properties @@ -10,5 +10,5 @@ # Indicates whether an apk should be generated for each density. split.density=false # Project target. -target=android-8 +target=android-12 apk-configurations= From c96c9b00b9bda3f810ab032d576e91a8a3c00017 Mon Sep 17 00:00:00 2001 From: Bryce Curtis Date: Mon, 27 Jun 2011 13:48:02 -0500 Subject: [PATCH 2/4] Revert to polling if there are any errors with callback server. This addresses various problems with proxies set by carriers. --- framework/assets/js/phonegap.js.base | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/framework/assets/js/phonegap.js.base b/framework/assets/js/phonegap.js.base index 4f26fd8d..d1daa555 100755 --- a/framework/assets/js/phonegap.js.base +++ b/framework/assets/js/phonegap.js.base @@ -805,13 +805,11 @@ PhoneGap.JSCallback = function() { console.log("JSCallback Error: Bad request. Stopping callbacks."); } - // If error, restart callback server + // If error, revert to polling else { console.log("JSCallback Error: Request failed."); - prompt("restartServer", "gap_callbackServer:"); - PhoneGap.JSCallbackPort = null; - PhoneGap.JSCallbackToken = null; - setTimeout(PhoneGap.JSCallback, 100); + PhoneGap.UsePolling = true; + PhoneGap.JSCallbackPolling(); } } }; From 85dab52cf75dedadedee5cba9f881cefeca7961c Mon Sep 17 00:00:00 2001 From: Bryce Curtis Date: Mon, 27 Jun 2011 13:49:24 -0500 Subject: [PATCH 3/4] Handle errors when adding a service. --- framework/assets/js/phonegap.js.base | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/framework/assets/js/phonegap.js.base b/framework/assets/js/phonegap.js.base index d1daa555..a1e8fe33 100755 --- a/framework/assets/js/phonegap.js.base +++ b/framework/assets/js/phonegap.js.base @@ -936,7 +936,11 @@ PhoneGap.includeJavascript = function(jsfile, successCallback) { */ var PluginManager = { addService: function(serviceType, className) { - navigator.app.addService(serviceType, className); + try { + navigator.app.addService(serviceType, className); + } catch (e) { + console.log("Error adding service "+serviceType+": "+e); + } } }; From f3d7ce8fc368609e73923ca17913f0129f3620cd Mon Sep 17 00:00:00 2001 From: Joe Bowser Date: Mon, 27 Jun 2011 16:01:43 -0700 Subject: [PATCH 4/4] VERSION: --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 03834411..85b7c695 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.9.5 \ No newline at end of file +0.9.6