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

Fix exception when plugin returns a null string.

Browse Source
This commit is contained in:
Bryce Curtis 2012-10-24 12:36:30 -06:00
parent 7d3afcab94
commit cba0d59021
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
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
if (pluginResult.getStrMessage() == null) {
ret += 1;
}
else {
ret += 1 + pluginResult.getStrMessage().length(); 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: