public/cordova-android
public/cordova-android
9
0
Fork 0
forked from github/cordova-android
Code Pull Requests Activity

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-android

Browse Source
This commit is contained in:
Joe Bowser 2012-10-24 12:07:20 -07:00
commit 8512ebb923
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
framework/src/org/apache/cordova/CordovaWebView.java
View File

@ -734,7 +734,7 @@ public class CordovaWebView extends WebView {
{ {
//Switch back to the old browser history and state the six month policy //Switch back to the old browser history and state the six month policy
this.useBrowserHistory = false; this.useBrowserHistory = false;
Log.w(TAG, "useBrowserHistory=false is deprecated. We will be removing this feature entirely in six months. Please use the browser history and use history.back()."); Log.w(TAG, "useBrowserHistory=false is deprecated as of Cordova 2.2.0 and will be removed six months after the 2.2.0 release. Please use the browser history and use history.back().");
} }
if ("true".equals(this.getProperty("fullscreen", "false"))) { if ("true".equals(this.getProperty("fullscreen", "false"))) {

13
framework/src/org/apache/cordova/NativeToJsMessageQueue.java
View File

@ -398,7 +398,12 @@ public class NativeToJsMessageQueue {
ret += 1 + pluginResult.getMessage().length(); ret += 1 + pluginResult.getMessage().length();
break; break;
case PluginResult.MESSAGE_TYPE_STRING: // s case PluginResult.MESSAGE_TYPE_STRING: // s
ret += 1 + pluginResult.getStrMessage().length(); if (pluginResult.getStrMessage() == null) {
ret += 1;
}
else {
ret += 1 + pluginResult.getStrMessage().length();
}
break; break;
case PluginResult.MESSAGE_TYPE_JSON: case PluginResult.MESSAGE_TYPE_JSON:
default: default:
@ -433,8 +438,10 @@ public class NativeToJsMessageQueue {
.append(pluginResult.getMessage()); .append(pluginResult.getMessage());
break; break;
case PluginResult.MESSAGE_TYPE_STRING: // s case PluginResult.MESSAGE_TYPE_STRING: // s
sb.append('s') sb.append('s');
.append(pluginResult.getStrMessage()); if (pluginResult.getStrMessage() != null) {
sb.append(pluginResult.getStrMessage());
}
break; break;
case PluginResult.MESSAGE_TYPE_JSON: case PluginResult.MESSAGE_TYPE_JSON:
default: default: