Merge branch 'release/0.5.0'

README.md

@@ -7,7 +7,8 @@ Replaces the low-performing Flutter channel with faster and more concise code.
 * Under development
 
 [![pub package](https://img.shields.io/pub/v/dart_native.svg)](https://pub.dev/packages/dart_native)
-[![Build Status](https://travis-ci.org/dart-native/dart_native.svg?branch=master)](https://travis-ci.org/dart-native/dart_native)
+[![Build Status](https://app.travis-ci.com/dart-native/dart_native.svg?branch=master)](https://app.travis-ci.com/dart-native/dart_native)
+[![Dart CI](https://github.com/dart-native/dart_native/actions/workflows/dart.yml/badge.svg)](https://github.com/dart-native/dart_native/actions/workflows/dart.yml)
 
 This package is the blue part(DartNative Bridge):
 

dart_native/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.5.0
+
+* [Feature] Add annotation for Android: `@native(javaClass:)`
+* [Feature] Update annotation for iOS: `@native` -> `@native()`
+* [Fix] Crash on Android simulator.
+
 ## 0.4.0
 
 * [Feature] Adapted to Flutter 2.2 and nullsafety.

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

@@ -174,6 +174,23 @@ void _fillArgs(void **arguments, char **argumentTypes,
   }
 }
 
+void *getClassName(void *objectPtr) {
+  if (objectPtr == nullptr) {
+    return nullptr;
+  }
+  auto env = _getEnv();
+  auto cls = _findClass(env, "java/lang/Class");
+  jmethodID getName = env->GetMethodID(cls, "getName", "()Ljava/lang/String;");
+  auto object = static_cast<jobject>(objectPtr);
+  auto objCls = env->GetObjectClass(object);
+  auto jstr = (jstring) env->CallObjectMethod(objCls, getName);
+  uint16_t* clsName = ConvertToDartUtf16(env, jstr);
+
+  env->DeleteLocalRef(cls);
+  env->DeleteLocalRef(objCls);
+  return clsName;
+}
+
 jobject _newObject(jclass cls,
                    void **arguments,
                    char **argumentTypes,
@@ -280,7 +297,7 @@ void *_doInvokeMethod(jobject object,
           /// mark the last pointer as string
           /// dart will check this pointer
           typePointers[argumentCount] = (char *) "java.lang.String";
-          nativeInvokeResult = convertToDartUtf16(env, (jstring) obj);
+          nativeInvokeResult = ConvertToDartUtf16(env, (jstring) obj);
         } else {
           typePointers[argumentCount] = (char *) "java.lang.Object";
           jobject gObj = env->NewGlobalRef(obj);
@@ -331,6 +348,7 @@ void *_doInvokeMethod(jobject object,
   free(returnType);
   free(arguments);
   free(methodSignature);
+  env->DeleteLocalRef(cls);
   return nativeInvokeResult;
 }
 
@@ -353,7 +371,7 @@ void *invokeNativeMethod(void *objPtr,
     return nullptr;
   }
   auto type = TaskThread(thread);
-  if (type == TaskThread::kFlutterUI) {
+  auto invokeFunction = [=] {
     return _doInvokeMethod(object,
                            methodName,
                            arguments,
@@ -364,20 +382,12 @@ void *invokeNativeMethod(void *objPtr,
                            callback,
                            dartPort,
                            type);
+  };
+  if (type == TaskThread::kFlutterUI) {
+    return invokeFunction();
   }
 
-  gTaskRunner->ScheduleInvokeTask(type, [=] {
-    _doInvokeMethod(object,
-                    methodName,
-                    arguments,
-                    dataTypes,
-                    argumentCount,
-                    returnType,
-                    stringTypeBitmask,
-                    callback,
-                    dartPort,
-                    type);
-  });
+  gTaskRunner->ScheduleInvokeTask(type, invokeFunction);
   return nullptr;
 }
 
@@ -489,15 +499,16 @@ Java_com_dartnative_dart_1native_CallbackInvocationHandler_hookCallback(JNIEnv *
     auto argument = env->GetObjectArrayElement(argumentsArray, i);
     dataTypes[i] = (char *) env->GetStringUTFChars(argTypeString, 0);
     if (strcmp(dataTypes[i], "java.lang.String") == 0) {
-      arguments[i] = convertToDartUtf16(env, (jstring) argument);
+      /// argument will delete in ConvertToDartUtf16
+      arguments[i] = ConvertToDartUtf16(env, (jstring) argument);
     } else {
       jobject gObj = env->NewGlobalRef(argument);
       _addGlobalObject(gObj);
       arguments[i] = gObj;
+      env->DeleteLocalRef(argument);
     }
 
     env->DeleteLocalRef(argTypeString);
-    env->DeleteLocalRef(argument);
   }
 
   /// when return void, jstring which from native is null.

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

@@ -79,5 +79,5 @@ void *callNativeStringMethod(JNIEnv *env,
                              jvalue *arguments) {
   auto javaString =
       (jstring) env->CallObjectMethodA(object, methodId, arguments);
-  return convertToDartUtf16(env, javaString);
+  return ConvertToDartUtf16(env, javaString);
 }

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

@@ -59,7 +59,7 @@ jstring convertToJavaUtf16(JNIEnv *env, void *value) {
 }
 
 /// nativeString not null
-uint16_t *convertToDartUtf16(JNIEnv *env, jstring nativeString) {
+uint16_t *ConvertToDartUtf16(JNIEnv *env, jstring nativeString) {
   if (nativeString == nullptr) {
     return nullptr;
   }

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

@@ -17,7 +17,7 @@ typedef bool BasicTypeToNative(void *, jvalue *, int);
 
 jstring convertToJavaUtf16(JNIEnv *env, void *value);
 
-uint16_t *convertToDartUtf16(JNIEnv *env, jstring nativeString);
+uint16_t *ConvertToDartUtf16(JNIEnv *env, jstring nativeString);
 
 std::map<char, std::function<BasicTypeToNative>> GetTypeConvertMap();
 

dart_native/example/lib/android/delegate_stub.dart

@@ -2,13 +2,16 @@ import 'dart:ffi';
 
 import 'package:dart_native/dart_native.dart';
 import 'package:dart_native_example/android/runtimestub.dart';
+import 'package:dart_native_gen/dart_native_gen.dart';
 
+@native(javaClass: 'com/dartnative/dart_native_example/SampleDelegate')
 class DelegateStub extends JObject with SampleDelegate {
-  DelegateStub()
-      : super("com/dartnative/dart_native_example/SampleDelegate", isInterface: true) {
+  DelegateStub() : super(isInterface: true) {
     super.registerSampleDelegate();
   }
 
+  DelegateStub.fromPointer(Pointer<Void> ptr) : super.fromPointer(ptr);
+
   @override
   callbackFloat(double f) {
     print("callback from native $f");

dart_native/example/lib/android/entity.dart

@@ -1,12 +1,13 @@
 import 'dart:ffi';
 
 import 'package:dart_native/dart_native.dart';
+import 'package:dart_native_gen/dart_native_gen.dart';
 
+@native(javaClass: 'com/dartnative/dart_native_example/Entity')
 class Entity extends JObject {
-  Entity(): super("com/dartnative/dart_native_example/Entity");
+  Entity() : super();
 
-  Entity.fromPointer(Pointer<Void> ptr)
-      : super.fromPointer("com/dartnative/dart_native_example/Entity", ptr);
+  Entity.fromPointer(Pointer<Void> ptr) : super.fromPointer(ptr);
 
   int getCurrentTime() {
     return invoke('getCurrentTime', "I", args: []);

dart_native/example/lib/android/runtimestub.dart

@@ -1,5 +1,8 @@
+import 'dart:ffi';
+
 import 'package:dart_native/dart_native.dart';
 import 'package:dart_native_example/android/entity.dart';
+import 'package:dart_native_gen/dart_native_gen.dart';
 
 abstract class SampleDelegate {
   registerSampleDelegate() {
@@ -17,8 +20,11 @@ abstract class SampleDelegate {
   callbackComplex(int i, double d, String s);
 }
 
+@native(javaClass: 'com/dartnative/dart_native_example/RuntimeStub')
 class RuntimeStub extends JObject {
-  RuntimeStub() : super("com/dartnative/dart_native_example/RuntimeStub");
+  RuntimeStub() : super();
+
+  RuntimeStub.fromPointer(Pointer<Void> ptr) : super.fromPointer(ptr);
 
   int getInt(int i) {
     return invokeInt('getInt', args: [i]);
@@ -66,24 +72,21 @@ class RuntimeStub extends JObject {
 
   bool complexCall(String s, int i, String c, double d, double f, int b, int sh,
       int l, bool boo) {
-    return invokeBool(
-        'complexCall',
-        args: [
-          s,
-          i,
-          jchar(c.codeUnitAt(0)),
-          d,
-          float(f),
-          byte(b),
-          short(sh),
-          long(l),
-          boo
-        ]);
+    return invokeBool('complexCall', args: [
+      s,
+      i,
+      jchar(c.codeUnitAt(0)),
+      d,
+      float(f),
+      byte(b),
+      short(sh),
+      long(l),
+      boo
+    ]);
   }
 
   Entity createEntity() {
-    return Entity.fromPointer(invoke(
-        'createEntity', "Lcom/dartnative/dart_native_example/Entity;"));
+    return invokeObject<Entity>('createEntity');
   }
 
   int getTime(Entity entity) {
@@ -95,8 +98,7 @@ class RuntimeStub extends JObject {
   }
 
   int getInteger() {
-    return JInteger.fromPointer(
-            invoke("getInteger", "Ljava/lang/Integer;"))
+    return JInteger.fromPointer(invoke("getInteger", "Ljava/lang/Integer;"))
         .raw;
   }
 
@@ -121,7 +123,8 @@ class RuntimeStub extends JObject {
   }
 
   List getByteArray(List list) {
-    return JArray.fromPointer(invoke("getByteArray", "[B", args: [JArray(list)])).raw;
+    return JArray.fromPointer(
+        invoke("getByteArray", "[B", args: [JArray(list)])).raw;
   }
 
   Set? getIntSet(Set set) {

dart_native/example/lib/android/runtimestub_async.dart

@@ -3,8 +3,8 @@ import 'package:dart_native_example/android/runtimestub.dart';
 
 extension RuntimeStubAsync on RuntimeStub {
   Future<String> getStringAsync(String s) async {
-    return invokeAsync('getString', "Ljava/lang/String;", args: [s],
-            thread: Thread.MainThread)
+    return invokeAsync('getString', "Ljava/lang/String;",
+            args: [s], thread: Thread.MainThread)
         .then((value) => value);
   }
 }

dart_native/example/lib/android/unit_test.dart

@@ -86,7 +86,7 @@ testAndroid(RuntimeStub stub) async {
   print('entity get time : ${entity.getCurrentTime()}');
   print('stub get time : ${stub.getTime(entity)}');
 
-  print('new entity get time : ${stub.getTime(new Entity())}');
+  print('new entity get time : ${stub.getTime(Entity())}');
 
   List? list = stub.getList([1, 2, 3, 4]);
   if (list != null) {

dart_native/example/lib/ios/runtimeson.dart

@@ -4,7 +4,7 @@ import 'package:dart_native/dart_native.dart';
 import 'package:dart_native_gen/dart_native_gen.dart';
 import 'runtimestub.dart';
 
-@native
+@native()
 class RuntimeSon extends RuntimeStub {
   RuntimeSon([Class? isa]) : super(isa ?? Class('RuntimeSon'));
   RuntimeSon.fromPointer(Pointer<Void> ptr) : super.fromPointer(ptr);

dart_native/example/lib/ios/runtimestub.dart

@@ -37,7 +37,7 @@ typedef NSDictionaryRetBlock = NSDictionary? Function(NSDictionary? a);
 
 typedef CGFloatRetBlock = CGFloat? Function(CGFloat? a);
 
-@native
+@native()
 class RuntimeStub extends NSObject {
   RuntimeStub([Class? isa]) : super(isa ?? Class('RuntimeStub'));
   RuntimeStub.fromPointer(Pointer<Void> ptr) : super.fromPointer(ptr);

dart_native/example/lib/ios/swiftstub.dart

@@ -3,7 +3,7 @@ import 'dart:ffi';
 import 'package:dart_native/dart_native.dart';
 import 'package:dart_native_gen/dart_native_gen.dart';
 
-@native
+@native()
 class SwiftStub extends NSObject {
   static final _objcClassName = 'Runner.SwiftStub';
   SwiftStub([Class? isa]) : super(isa ?? Class(_objcClassName));

dart_native/example/pubspec.lock

@@ -168,14 +168,14 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "0.4.0"
+    version: "0.5.0"
   dart_native_gen:
     dependency: transitive
     description:
       name: dart_native_gen
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.0"
+    version: "0.3.0"
   dart_style:
     dependency: transitive
     description: