fix: [native] Fix errors when hot restarted

AgoraIO-Extensions · Sep 13, 2023 · 8c352d8 · 8c352d8
1 parent 1d5d8f9
commit 8c352d8
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -274,7 +274,7 @@ jobs:
       - name: run macos integration test
         run: |
           flutter packages get
-          flutter test integration_test/iris_event_smoke_test.dart -d macos
+          flutter test integration_test -d macos
         working-directory: example
 
   integration_test_android:

diff --git a/example/test/widget_test.dart b/example/test/widget_test.dart
@@ -18,8 +18,8 @@ void main() {
     // Verify that platform version is retrieved.
     expect(
       find.byWidgetPredicate(
-        (Widget widget) => widget is Text &&
-                           widget.data!.startsWith('Running on:'),
+        (Widget widget) =>
+            widget is Text && widget.data!.startsWith('Running on:'),
       ),
       findsOneWidget,
     );

diff --git a/lib/src/platform/io/iris_method_channel_internal_io.dart b/lib/src/platform/io/iris_method_channel_internal_io.dart
@@ -150,14 +150,16 @@ class _HotRestartFinalizer {
     nativeBindingDelegate.initialize();
 
     nativeBindingDelegate.destroyNativeApiEngine(IrisApiEngineHandle(
-        ffi.Pointer.fromAddress(_debugIrisApiEngineNativeHandle!)));
+        ffi.Pointer<ffi.Void>.fromAddress(_debugIrisApiEngineNativeHandle!)));
 
-    calloc.free(ffi.Pointer.fromAddress(_debugIrisCEventHandlerNativeHandle!));
+    calloc.free(ffi.Pointer<ffi.Void>.fromAddress(
+        _debugIrisCEventHandlerNativeHandle!));
     nativeBindingDelegate.destroyIrisEventHandler(IrisEventHandlerHandle(
-        ffi.Pointer.fromAddress(_debugIrisEventHandlerNativeHandle!)));
+        ffi.Pointer<ffi.Void>.fromAddress(
+            _debugIrisEventHandlerNativeHandle!)));
 
-    assert(provider.provideIrisEvent() != null);
-    final irisEvent = provider.provideIrisEvent()! as IrisEventIO;
+    final irisEvent =
+        (provider.provideIrisEvent() ?? IrisEventIO()) as IrisEventIO;
     irisEvent.dispose();
 
     _onExitSubscription?.cancel();

diff --git a/lib/src/platform/utils_expect.dart b/lib/src/platform/utils_expect.dart
@@ -1,6 +1,6 @@
 import 'dart:typed_data';
 
-/// Stub function for translate the int ptr to the [Uint8List]. 
+/// Stub function for translate the int ptr to the [Uint8List].
 /// See implementation:
 /// io: `io/utils_actual_io.dart`
 /// web: `web/utils_actual_web.dart`(Empty implementation)

diff --git a/test/platform/platform_cases.dart b/test/platform/platform_cases.dart
@@ -1,3 +1,3 @@
 export 'platform_cases_expect.dart'
-    if (dart.library.io)  'platform_cases_actual_io.dart'
+    if (dart.library.io) 'platform_cases_actual_io.dart'
     if (dart.library.html) 'platform_cases_actual_web.dart';