Merge branch 'release/0.3.19'

Author: yulingtianxia

dart_native/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.3.19
+
+* [Fix] Some crash on Android.
+
 ## 0.3.18
 
 * [Feature] Support multi-isolates.

dart_native/android/src/main/jni/dart_native.cpp

@@ -312,7 +312,6 @@ void registerNativeCallback(void *target, char* targetName, char *funName, void
     jobject callbackOJ = getEnv()->NewGlobalRef(getEnv()->CallStaticObjectMethodA(callbackManager, registerCallback, argValues));
     callbackObjCache[target] = callbackOJ;
     targetCache[targetAddr] = target;
-    NSLog("HUIZZ dartport %d", dartPort);
     dartPortCache[targetAddr] = dartPort;
 
     registerCallbackManager(targetAddr, funName, callback);
@@ -419,11 +418,16 @@ JNIEXPORT jobject JNICALL Java_com_dartnative_dart_1native_CallbackInvocationHan
         }
         else if (strcmp(argTypes[i], "Ljava/lang/String;") == 0) {
             jstring argString = (jstring) argument;
-            arguments[i] = (char *) env->GetStringUTFChars(argString, 0);
+            arguments[i] = argString == nullptr ? (char *) ""
+                                                : (char *) env->GetStringUTFChars(argString, 0);
             env->DeleteLocalRef(argString);
         }
     }
-    char *returnType = (char *) env->GetStringUTFChars(return_type, 0);
+
+    /// when return void, jstring which from native is null.
+    char *returnType = return_type == nullptr ? nullptr
+                                              : (char *) env->GetStringUTFChars(return_type, 0);
+
     argTypes[argTypeLength] = returnType;
 
     sem_t sem;
@@ -452,7 +456,8 @@ JNIEXPORT jobject JNICALL Java_com_dartnative_dart_1native_CallbackInvocationHan
         if (returnType == nullptr) {
           NSLog("void");
         } else if (strcmp(returnType, "Ljava/lang/String;") == 0) {
-            callbackResult = env->NewStringUTF((char *) arguments[0]);
+            callbackResult = env->NewStringUTF(arguments[0] == nullptr ? (char *) ""
+                                                                              : (char *) arguments[0]);
         } else if (strcmp(returnType, "Z") == 0) {
           jclass booleanClass = env->FindClass("java/lang/Boolean");
           jmethodID methodID = env->GetMethodID(booleanClass, "<init>", "(Z)V");

dart_native/example/pubspec.lock

@@ -168,7 +168,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "0.3.18"
+    version: "0.3.19"
   dart_native_gen:
     dependency: transitive
     description:

dart_native/pubspec.yaml

@@ -1,6 +1,6 @@
 name: dart_native
 description: Write native code using Dart. This package liberates you from native code and low performance channel.
-version: 0.3.18
+version: 0.3.19
 homepage: https://github.com/dart-native/dart_native
 
 environment: