fix: callback return void crash

hui19 · hui19 · commit e5d6733f1ba5 · 2021-07-12T16:26:00.000+08:00
diff --git a/dart_native/android/src/main/jni/dart_native.cpp b/dart_native/android/src/main/jni/dart_native.cpp
@@ -441,11 +441,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
`@@ -441,11 +441,15 @@ extern "C"`
`441`	`441`	`if (notifyResult)`
`442`	`442`	`{`
`443`	`443`	`sem_wait(&sem);`
`444`		`- if (strcmp(returnType, "java.lang.String") == 0)`
	`444`	`+ if (returnType == nullptr \|\| strcmp(returnType, "void") == 0)`
	`445`	`+ {`
	`446`	`+ DNDebug("Native callback to Dart return type is void");`
	`447`	`+ }`
	`448`	`+ else if (strcmp(returnType, "java.lang.String") == 0)`
`445`	`449`	`{`
`446`	`450`	`callbackResult = convertToJavaUtf16(env, (char *)arguments[argumentCount], nullptr, 0);`
`447`	`451`	`}`
`448`		`- else if (strcmp(returnType, "void") != 0)`
	`452`	`+ else`
`449`	`453`	`{`
`450`	`454`	`callbackResult = (jobject)arguments[argumentCount];`
`451`	`455`	`}`