Merge branch 'release/0.3.21'

Author: yulingtianxia

dart_native/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.3.21
+
+* [Fix] Some crash on Android.
+
 ## 0.3.20
 
 * [Feature] Support 64 bit on Android.

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

@@ -9,19 +9,20 @@
 #include "dn_method_call.h"
 #include "dn_signature_helper.h"
 #include "dn_callback.h"
+#include "jni_object_ref.h"
 
 extern "C"
 {
 
   static JavaVM *gJvm = nullptr;
-  static jobject gClassLoader;
+  static JavaGlobalRef<jobject> *gClassLoader = nullptr;
   static jmethodID gFindClassMethod;
   static pthread_key_t detachKey = 0;
 
   /// for invoke result compare
-  static jclass gStrCls;
+  static JavaGlobalRef<jclass> *gStrCls = nullptr;
 
-  /// key is jobject, value is pai which contain jclass and reference count
+  /// key is jobject, value is pair which contain jclass and reference count
   static std::map<jobject, std::pair<jclass, int> > objectGlobalReference;
 
   /// protect objectGlobalReference
@@ -92,13 +93,13 @@ extern "C"
     auto getClassLoaderMethod = env->GetMethodID(pluginClass, "getClassLoader",
                                                  "()Ljava/lang/ClassLoader;");
     auto classLoader = env->CallObjectMethod(plugin, getClassLoaderMethod);
-    gClassLoader = env->NewGlobalRef(classLoader);
+    gClassLoader = new JavaGlobalRef<jobject>(env->NewGlobalRef(classLoader), env);
     gFindClassMethod = env->GetMethodID(classLoaderClass, "findClass",
                                         "(Ljava/lang/String;)Ljava/lang/Class;");
 
     /// cache string class
     jclass strCls = env->FindClass("java/lang/String");
-    gStrCls = static_cast<jclass>(env->NewGlobalRef(strCls));
+    gStrCls = new JavaGlobalRef<jclass>(static_cast<jclass>(env->NewGlobalRef(strCls)), env);
 
     env->DeleteLocalRef(classLoader);
     env->DeleteLocalRef(plugin);
@@ -119,7 +120,7 @@ extern "C"
     {
       env->ExceptionClear();
       DNDebug("findClass exception");
-      return static_cast<jclass>(env->CallObjectMethod(gClassLoader,
+      return static_cast<jclass>(env->CallObjectMethod(gClassLoader->Object(),
                                                        gFindClassMethod,
                                                        env->NewStringUTF(name)));
     }
@@ -227,7 +228,7 @@ extern "C"
         jobject obj = env->CallObjectMethodA(object, method, argValues);
         if (obj != nullptr)
         {
-          if (env->IsInstanceOf(obj, gStrCls))
+          if (env->IsInstanceOf(obj, gStrCls->Object()))
           {
             /// mark the last pointer as string
             /// dart will check this pointer
@@ -380,7 +381,8 @@ extern "C"
       return nullptr;
     }
 
-    char *funName = (char *)env->GetStringUTFChars(functionName, 0);
+    char *funName = functionName == nullptr ? nullptr
+                                            : (char *)env->GetStringUTFChars(functionName, 0);
     char **dataTypes = new char *[argumentCount + 1];
     void **arguments = new void *[argumentCount + 1];
 
@@ -456,8 +458,14 @@ extern "C"
       sem_destroy(&sem);
     }
 
-    env->ReleaseStringUTFChars(returnTypeStr, returnType);
-    env->ReleaseStringUTFChars(functionName, funName);
+    if (returnTypeStr != nullptr)
+    {
+      env->ReleaseStringUTFChars(returnTypeStr, returnType);
+    }
+    if (functionName != nullptr)
+    {
+      env->ReleaseStringUTFChars(functionName, funName);
+    }
     delete[] arguments;
     delete[] dataTypes;
 

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

@@ -73,7 +73,3 @@ void *callNativeStringMethod(JNIEnv *env, jobject object, jmethodID methodId, jv
   auto javaString = (jstring)env->CallObjectMethodA(object, methodId, arguments);
   return convertToDartUtf16(env, javaString);
 }
-
-void *callNativeObjectMethod(JNIEnv *env, jobject object, jmethodID methodId, jvalue *arguments)
-{
-}

dart_native/android/src/main/jni/dn_method_call.h

@@ -27,7 +27,6 @@ extern "C"
     void *callNativeVoidMethod(JNIEnv *env, jobject object, jmethodID methodId, jvalue *arguments);
 
     void *callNativeStringMethod(JNIEnv *env, jobject object, jmethodID methodId, jvalue *arguments);
-    void *callNativeObjectMethod(JNIEnv *env, jobject object, jmethodID methodId, jvalue *arguments);
 
     const std::map<char, std::function<CallNativeMethod> > methodCallerMap = {
         {'C', callNativeCharMethod},

dart_native/android/src/main/jni/jni_object_ref.h

@@ -0,0 +1,40 @@
+//
+// Created by Hui on 6/9/21.
+//
+
+#ifndef DART_NATIVE_JNI_OBJECT_REF_H
+#define DART_NATIVE_JNI_OBJECT_REF_H
+
+#include <jni.h>
+
+/**
+ * Global reference will auto delete in destructor
+ */
+template <typename T>
+class JavaGlobalRef {
+ public:
+  explicit JavaGlobalRef(T t, JNIEnv *env): env(env) {
+    this->obj = env->NewGlobalRef(t);
+  }
+
+  JavaGlobalRef() = delete;
+
+  T Object() const { return static_cast<T>(obj); }
+
+  ~JavaGlobalRef() { this->DeleteGlobalRef(); }
+
+ protected:
+  jobject obj = nullptr;
+
+ private:
+  JNIEnv *env;
+
+  void DeleteGlobalRef() {
+    if (this->obj) {
+      env->DeleteGlobalRef(this->obj);
+      this->obj = nullptr;
+    }
+  }
+};
+
+#endif //DART_NATIVE_JNI_OBJECT_REF_H

dart_native/example/pubspec.lock

@@ -168,7 +168,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "0.3.20"
+    version: "0.3.21"
   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.20
+version: 0.3.21
 homepage: https://github.com/dart-native/dart_native
 
 environment: