fix: no-op if call RtcEngine.release without calling RtcEngine.initia…

…lize directly
AgoraIO-Extensions · Jun 12, 2023 · 95d29ae · 95d29ae
1 parent 6db3838
commit 95d29ae
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 4 deletions.
diff --git a/lib/src/impl/agora_rtc_engine_impl.dart b/lib/src/impl/agora_rtc_engine_impl.dart
@@ -312,24 +312,26 @@ class RtcEngineImpl extends rtc_engine_ex_binding.RtcEngineExImpl
 
   @override
   Future<void> release({bool sync = false}) async {
-    if (_isReleased) return;
-
     // Same as explanation inside `initialize`. We should wait for
     // the `initialize` function is completed here.
     if (_initializingCompleter != null &&
         !_initializingCompleter!.isCompleted) {
       await _initializingCompleter?.future;
     }
 
+    if (!_rtcEngineState.isInitialzed || _isReleased) {
+      return;
+    }
+
     _releasingCompleter = Completer<void>();
 
     _rtcEngineStateInternal?.dispose();
     _rtcEngineStateInternal = null;
 
     await _objectPool.clear();
 
-    await _globalVideoViewController!
-        .detachVideoFrameBufferManager(irisMethodChannel.getNativeHandle());
+    await _globalVideoViewController
+        ?.detachVideoFrameBufferManager(irisMethodChannel.getNativeHandle());
     _globalVideoViewController = null;
 
     await irisMethodChannel.unregisterEventHandlers(_rtcEngineImplScopedKey);

diff --git a/...shard/integration_test_app/integration_test/testcases/rtcengine_smoke_test_testcases.dart b/...shard/integration_test_app/integration_test/testcases/rtcengine_smoke_test_testcases.dart
@@ -371,5 +371,24 @@ void testCases() {
         await rtcEngine.setupLocalVideo(const VideoCanvas());
       },
     );
+
+    testWidgets(
+      'call release without calling initialize directly, do not thorw error',
+      (WidgetTester tester) async {
+        app.main();
+        await tester.pumpAndSettle();
+
+        String engineAppId = const String.fromEnvironment('TEST_APP_ID',
+            defaultValue: '<YOUR_APP_ID>');
+
+        RtcEngineEx rtcEngine = createAgoraRtcEngineEx();
+        await rtcEngine.release();
+
+        await rtcEngine.initialize(RtcEngineContext(
+          appId: engineAppId,
+          areaCode: AreaCode.areaCodeGlob.value(),
+        ));
+      },
+    );
   });
 }