Merge pull request #59 from dart-native/bugfix/callback

yulingtianxia · web-flow · commit 9c5c5472ef0f · 2021-07-13T19:14:08.000+08:00
fix: callback return void crash
diff --git a/dart_native/android/src/main/jni/dart_native.cpp b/dart_native/android/src/main/jni/dart_native.cpp
@@ -440,11 +440,15 @@ extern "C"
       if (notifyResult)
       {
         sem_wait(&sem);
-        if (strcmp(returnType, "java.lang.String") == 0)
+        if (returnType == nullptr || strcmp(returnType, "void") == 0)
+        {
+          DNDebug("Native callback to Dart return type is void");
+        }
+        else if (strcmp(returnType, "java.lang.String") == 0)
         {
           callbackResult = convertToJavaUtf16(env, (char *)arguments[argumentCount], nullptr, 0);
         }
-        else if (strcmp(returnType, "void") != 0)
+        else
         {
           callbackResult = (jobject)arguments[argumentCount];
         }

Original file line number	Diff line number	Diff line change
`@@ -440,11 +440,15 @@ extern "C"`
`440`	`440`	`if (notifyResult)`
`441`	`441`	`{`
`442`	`442`	`sem_wait(&sem);`
`443`		`- if (strcmp(returnType, "java.lang.String") == 0)`
	`443`	`+ if (returnType == nullptr \|\| strcmp(returnType, "void") == 0)`
	`444`	`+ {`
	`445`	`+ DNDebug("Native callback to Dart return type is void");`
	`446`	`+ }`
	`447`	`+ else if (strcmp(returnType, "java.lang.String") == 0)`
`444`	`448`	`{`
`445`	`449`	`callbackResult = convertToJavaUtf16(env, (char *)arguments[argumentCount], nullptr, 0);`
`446`	`450`	`}`
`447`		`- else if (strcmp(returnType, "void") != 0)`
	`451`	`+ else`
`448`	`452`	`{`
`449`	`453`	`callbackResult = (jobject)arguments[argumentCount];`
`450`	`454`	`}`