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

CB-12218: (android) Fix consistency of null result message

Browse Source 
Fix problem that JavaScript receives ""(empty string) instead of null
if plugin sends null result from new thread.
This commit is contained in:
KIHARA Hideto 2018-01-02 12:41:17 +09:00
parent a24ba41eda
commit 45a7b90c6c
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -511,6 +511,9 @@ public class NativeToJsMessageQueue {
.append(pluginResult.getMessage())
.append("')");
break;
case PluginResult.MESSAGE_TYPE_NULL:
sb.append("null");
break;
default:
sb.append(pluginResult.getMessage());
}

13
test/app/src/test/java/org/apache/cordova/unittests/NativeToJsMessageQueueTest.java
View File

@ -161,4 +161,17 @@ public class NativeToJsMessageQueueTest {
assertEquals(result, "cordova.callbackFromNative('37',true,1,[0,1,2,3,4],false);");
}
@Test
public void testNullPopAndEncodeAsJs()
{
NativeToJsMessageQueue queue = new NativeToJsMessageQueue();
queue.addBridgeMode(new NativeToJsMessageQueue.NoOpBridgeMode());
queue.setBridgeMode(0);
PluginResult result = new PluginResult(PluginResult.Status.OK, (String)null);
queue.addPluginResult(result, TEST_CALLBACK_ID);
assertFalse(queue.isEmpty());
String resultString = queue.popAndEncodeAsJs();
assertEquals(resultString, "cordova.callbackFromNative('" + TEST_CALLBACK_ID + "',true,1,[null],false);");
}
}