chore(native_storage): Migrate to jni 0.8 (#105)

Enables isolated Android storage as JNI objects can now be shared via isolates.
celest-dev · Apr 5, 2024 · b755a6e · b755a6e
1 parent 438aca4
commit b755a6e
Show file tree

Hide file tree

Showing 6 changed files with 3,453 additions and 3,222 deletions.
diff --git a/packages/native/storage/CHANGELOG.md b/packages/native/storage/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.1.3
+
+- chore: Migrate to jni 0.8.0 to enable isolated Android storage
+
 ## 0.1.2
 
 - feat: Isolated memory storage on web

diff --git a/packages/native/storage/lib/src/local/local_storage.android.dart b/packages/native/storage/lib/src/local/local_storage.android.dart
@@ -1,7 +1,4 @@
 import 'package:jni/jni.dart';
-import 'package:native_storage/src/isolated/isolated_storage.dart';
-import 'package:native_storage/src/isolated/isolated_storage_platform.unsupported.dart'
-    as unsupported;
 import 'package:native_storage/src/local/local_storage_platform.vm.dart';
 import 'package:native_storage/src/native/android/android.dart';
 
@@ -45,10 +42,4 @@ final class LocalStoragePlatformAndroid extends NativeLocalStoragePlatform {
     _storage.write(key.toJString(), value.toJString());
     return value;
   }
-
-// jni objects cannot be shared across isolates
-// TODO(dnys1): Should be fixed in jni 0.8.0
-  @override
-  IsolatedNativeStorage get isolated =>
-      unsupported.IsolatedNativeStoragePlatform.from(this);
 }
diff --git a/packages/native/storage/lib/src/native/android/android.dart b/packages/native/storage/lib/src/native/android/android.dart
@@ -8,9 +8,9 @@ final class AndroidCommon {
 
   // Must be getters so that they are fresh for each JNI call
   late final Activity _mainActivity =
-      Activity.fromRef(Jni.getCurrentActivity());
+      Activity.fromReference(Jni.getCurrentActivity());
   late final Context _mainActivityContext =
-      Context.fromRef(_mainActivity.reference);
+      Context.fromReference(_mainActivity.reference);
 
   late final String packageName =
       _mainActivityContext.getPackageName().toDartString();