move flutter_window_close handler from sdk to the example app.

example/lib/main.dart

@@ -1,8 +1,10 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_window_close/flutter_window_close.dart';
 import 'package:livekit_example/theme.dart';
 import 'package:logging/logging.dart';
 import 'package:intl/intl.dart';
 import 'pages/connect.dart';
+import 'utils.dart';
 
 void main() async {
   final format = DateFormat('HH:mm:ss');
@@ -14,6 +16,10 @@ void main() async {
 
   WidgetsFlutterBinding.ensureInitialized();
 
+  FlutterWindowClose.setWindowShouldCloseHandler(() async {
+    await onWindowShouldClose?.call();
+    return true;
+  });
   runApp(const LiveKitExampleApp());
 }
 

example/lib/pages/room.dart

@@ -1,10 +1,12 @@
+import 'dart:async';
 import 'dart:convert';
 import 'dart:math' as math;
 
 import 'package:flutter/material.dart';
 import 'package:livekit_client/livekit_client.dart';
 
 import '../exts.dart';
+import '../utils.dart';
 import '../widgets/controls.dart';
 import '../widgets/participant.dart';
 import '../widgets/participant_info.dart';
@@ -25,7 +27,6 @@ class RoomPage extends StatefulWidget {
 }
 
 class _RoomPageState extends State<RoomPage> {
-  //
   List<ParticipantTrack> participantTracks = [];
   EventsListener<RoomEvent> get _listener => widget.listener;
   bool get fastConnection => widget.room.engine.fastConnectOptions != null;
@@ -46,6 +47,14 @@ class _RoomPageState extends State<RoomPage> {
     if (lkPlatformIsMobile()) {
       Hardware.instance.setSpeakerphoneOn(true);
     }
+
+    if (!lkPlatformIs(PlatformType.web) && !lkPlatformIsTest()) {
+      onWindowShouldClose = () async {
+        unawaited(widget.room.disconnect());
+        await _listener.waitFor<RoomDisconnectedEvent>(
+            duration: const Duration(seconds: 5));
+      };
+    }
   }
 
   @override
@@ -56,6 +65,7 @@ class _RoomPageState extends State<RoomPage> {
       await _listener.dispose();
       await widget.room.dispose();
     })();
+    onWindowShouldClose = null;
     super.dispose();
   }
 

example/lib/utils.dart

@@ -0,0 +1,3 @@
+import 'dart:async';
+
+FutureOr<void> Function()? onWindowShouldClose;

example/pubspec.yaml

@@ -19,7 +19,7 @@ dependencies:
   shared_preferences: ^2.0.7
   google_fonts: ^4.0.4
   flutter_svg: ^2.0.5
-
+  flutter_window_close: ^0.2.2
   livekit_client:
     path: ../
 

lib/src/core/room.dart

@@ -34,7 +34,6 @@ import '../participant/participant.dart';
 import '../participant/remote.dart';
 import '../proto/livekit_models.pb.dart' as lk_models;
 import '../proto/livekit_rtc.pb.dart' as lk_rtc;
-import '../support/app_state.dart';
 import '../support/disposable.dart';
 import '../support/platform.dart';
 import '../track/local/audio.dart';
@@ -109,8 +108,6 @@ class Room extends DisposableChangeNotifier with EventsEmittable<RoomEvent> {
   //
   late EventsListener<SignalEvent> _signalListener;
 
-  StreamSubscription<String>? _appCloseSubscription;
-
   Room({
     ConnectOptions connectOptions = const ConnectOptions(),
     RoomOptions roomOptions = const RoomOptions(),
@@ -124,13 +121,6 @@ class Room extends DisposableChangeNotifier with EventsEmittable<RoomEvent> {
     _engineListener = this.engine.createListener();
     _setUpEngineListeners();
 
-    if (!kIsWeb && !lkPlatformIsTest()) {
-      _appCloseSubscription =
-          AppStateListener.instance.onWindowShouldClose.stream.listen((event) {
-        disconnect();
-      });
-    }
-
     _signalListener = this.engine.signalClient.createListener();
     _setUpSignalListeners();
 
@@ -153,8 +143,6 @@ class Room extends DisposableChangeNotifier with EventsEmittable<RoomEvent> {
       await _engineListener.dispose();
       // dispose the engine
       await this.engine.dispose();
-      // dispose the app state listener
-      await _appCloseSubscription?.cancel();
     });
   }
 

pubspec.yaml

@@ -39,7 +39,6 @@ dependencies:
   synchronized: ^3.0.0+3
   protobuf: ^3.0.0
   flutter_webrtc: 0.9.46
-  flutter_window_close: ^0.2.2
   device_info_plus: '>=8.0.0'
   js: ^0.6.4
   platform_detect: ^2.0.7