[tizen_bundle, tizen_rpc_port] Fix token in finalizer to be different…

… from value related issue : flutter-tizen#637
JSUYA · Dec 11, 2023 · 0b99173 · 0b99173
1 parent e86f535
commit 0b99173
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 11 deletions.
diff --git a/packages/tizen_bundle/CHANGELOG.md b/packages/tizen_bundle/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## NEXT
 
 * Increase the minimum Flutter version to 3.3.
+* Fix token in finalizer to be different from value.
 
 ## 0.1.1
 

diff --git a/packages/tizen_bundle/lib/tizen_bundle.dart b/packages/tizen_bundle/lib/tizen_bundle.dart
@@ -20,20 +20,20 @@ class Bundle extends MapMixin<String, Object> {
   /// Creates an empty [Bundle].
   Bundle() {
     _handle = tizen.bundle_create();
-    _finalizer.attach(this, this, detach: this);
+    _finalizer.attach(this, _handle, detach: this);
   }
 
   /// Creates a [Bundle] from the encoded bundle string.
   Bundle.decode(String raw) {
     _handle = tizen.bundle_decode(
         raw.toNativeInt8().cast<UnsignedChar>(), raw.length);
-    _finalizer.attach(this, this, detach: this);
+    _finalizer.attach(this, _handle, detach: this);
   }
 
   /// Creates a copy of the given [bundle].
   Bundle.fromBundle(Bundle bundle) {
     _handle = tizen.bundle_dup(bundle._handle);
-    _finalizer.attach(this, this, detach: this);
+    _finalizer.attach(this, _handle, detach: this);
   }
 
   /// Creates a [Bundle] from the given [map].
@@ -44,8 +44,9 @@ class Bundle extends MapMixin<String, Object> {
   }
 
   late final Pointer<bundle> _handle;
-  static final Finalizer<Bundle> _finalizer =
-      Finalizer<Bundle>((Bundle bundle) => tizen.bundle_free(bundle._handle));
+  static final Finalizer<Pointer<bundle>> _finalizer =
+      Finalizer<Pointer<bundle>>(
+          (Pointer<bundle> bundle) => tizen.bundle_free(bundle));
 
   static final List<String> _keys = <String>[];
 

diff --git a/packages/tizen_rpc_port/CHANGELOG.md b/packages/tizen_rpc_port/CHANGELOG.md
@@ -1,3 +1,7 @@
+## NEXT
+
+* Fix token in finalizer to be different from value.
+
 ## 0.1.3
 
 * Remove unnecessary `StreamHandlerError` implementation.

diff --git a/packages/tizen_rpc_port/lib/src/proxy_base.dart b/packages/tizen_rpc_port/lib/src/proxy_base.dart
@@ -38,13 +38,14 @@ abstract class ProxyBase {
       return pProxy.value;
     });
 
-    _finalizer.attach(this, this);
+    _finalizer.attach(this, <String, ProxyBase>{'proxy': this});
   }
 
   late final rpc_port_proxy_h _handle;
 
-  final Finalizer<ProxyBase> _finalizer =
-      Finalizer<ProxyBase>((ProxyBase proxy) {
+  final Finalizer<Map<String, ProxyBase>> _finalizer =
+      Finalizer<Map<String, ProxyBase>>((Map<String, ProxyBase> map) {
+    final ProxyBase proxy = map['proxy']!;
     proxy._streamSubscription?.cancel();
     tizen.rpc_port_proxy_destroy(proxy._handle);
   });

diff --git a/packages/tizen_rpc_port/lib/src/stub_base.dart b/packages/tizen_rpc_port/lib/src/stub_base.dart
@@ -33,13 +33,15 @@ abstract class StubBase {
       return pStub.value;
     });
 
-    _finalizer.attach(this, this);
+    _finalizer.attach(this, <String, StubBase>{'stub': this});
   }
 
   late final rpc_port_stub_h _handle;
 
-  final Finalizer<StubBase> _finalizer = Finalizer<StubBase>((StubBase stub) {
-    stub.close();
+  final Finalizer<Map<String, StubBase>> _finalizer =
+      Finalizer<Map<String, StubBase>>((Map<String, StubBase> map) {
+    final StubBase stub = map['stub']!;
+    stub._streamSubscription?.cancel();
   });
 
   /// A port name to use when listening for connections.