Merge branch 'release/0.7.10'

Author: yulingtianxia

.github/workflows/dart.yml

@@ -18,7 +18,7 @@ jobs:
  - uses: subosito/flutter-action@v2
  with:
  # same with pubspec.yaml
- flutter-version: "2.2.0"
+ flutter-version: "3.3.8"
  - run: flutter pub get
  working-directory: dart_native/example
  - run: flutter test --no-pub test/

.github/workflows/release.yml

@@ -18,7 +18,7 @@ jobs:
  - uses: subosito/flutter-action@v2
  with:
  # same with pubspec.yaml
- flutter-version: "2.2.0"
+ flutter-version: "3.3.8"
  - run: flutter pub get
  working-directory: dart_native/example
  - run: flutter analyze --no-pub --no-current-package lib/ test/

dart_native/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.7.10
+
+* [Fix] A dangling pointer on Android.
+* [Fix] DetachCurrentThread crash on Android.
+* [Feature] Collections support automatic type conversions on Android.
+
 ## 0.7.9
 
 * Bump to ffi >=1.1.2

dart_native/android/src/libs/arm64-v8a/libdart_native.so

@@ -14,8 +14,7 @@
 
 namespace dartnative {
 
-typedef void(*InvokeCallback)(void *result, char *method, char **typePointers, int argumentCount);
-
+typedef void(*InvokeCallback)(void *result, char *method, char **typePointers, int argumentCount, int isInterface);
 
 JavaLocalRef<jclass> FindClass(const char *name, JNIEnv *env = nullptr);
 
@@ -41,7 +40,8 @@ void *DoInvokeNativeMethod(jobject object,
  uint32_t stringTypeBitmask,
  void *callback,
  Dart_Port dartPort,
- TaskThread thread);
+ TaskThread thread,
+ bool isInterface);
 
 jobject InvokeDartFunction(bool is_same_thread,
  int return_async,

dart_native/android/src/libs/armeabi-v7a/libdart_native.so

@@ -161,7 +161,7 @@ void *InvokeNativeMethod(void *objPtr,
  auto type = TaskThread(thread);
  auto invokeFunction = [=] {
  return DoInvokeNativeMethod(object, methodName, arguments, dataTypes, argumentCount, returnType,
- stringTypeBitmask, callback, dartPort, type);
+ stringTypeBitmask, callback, dartPort, type, isInterface);
  };
  if (type == TaskThread::kFlutterUI) {
  return invokeFunction();

dart_native/android/src/libs/x86/libdart_native.so

@@ -8,31 +8,41 @@
 namespace dartnative {
 
 static JavaVM *g_vm = nullptr;
-static pthread_key_t detach_key = 0;
+static pthread_key_t t_key = 0;
 
 void InitWithJavaVM(JavaVM *vm) { g_vm = vm; }
 
 void DetachThreadDestructor(void *arg) {
  DNDebug("detach from current thread");
  g_vm->DetachCurrentThread();
- detach_key = 0;
+ t_key = 0;
 }
 
 JNIEnv *AttachCurrentThread() {
+ JNIEnv *env;
+ env = (JNIEnv *)pthread_getspecific(t_key);
+ if (env != nullptr) {
+ return env;
+ }
+
  if (g_vm == nullptr) {
  return nullptr;
  }
 
- if (detach_key == 0) {
- pthread_key_create(&detach_key, DetachThreadDestructor);
+ if (t_key == 0) {
+ pthread_key_create(&t_key, DetachThreadDestructor);
  }
- JNIEnv *env;
+
  jint ret = g_vm->GetEnv((void **) &env, JNI_VERSION_1_6);
 
  switch (ret) {
- case JNI_OK:return env;
- case JNI_EDETACHED:DNDebug("attach to current thread");
+ case JNI_OK:
+ pthread_setspecific(t_key, env);
+ return env;
+ case JNI_EDETACHED:
+ DNDebug("attach to current thread");
  g_vm->AttachCurrentThread(&env, nullptr);
+ pthread_setspecific(t_key, env);
  return env;
  default:DNError("fail to get env");
  return nullptr;