Merge branch 'main' into 57-fullscreen-mode

bennyboer · Nov 25, 2020 · 146c4de · 146c4de
2 parents 364bed8 + 9d598c1
commit 146c4de
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/lib/src/connect/meeting/main_websocket/main_websocket.dart b/lib/src/connect/meeting/main_websocket/main_websocket.dart
@@ -1,5 +1,6 @@
 import 'dart:async';
 import 'dart:convert';
+import 'dart:io';
 
 import 'package:bbb_app/src/connect/meeting/main_websocket/chat/chat.dart';
 import 'package:bbb_app/src/connect/meeting/main_websocket/meeting/meeting.dart';
@@ -87,7 +88,7 @@ class MainWebSocket {
       moduleEntry.value.onDisconnectBeforeWebsocketClose();
     }
 
-    _webSocket.close();
+    _webSocket.closeWithReason(WebSocketStatus.goingAway);
 
     // Call logout URL
     await http.get(_meetingInfo.logoutUrl, headers: {

diff --git a/lib/src/connect/meeting/main_websocket/user/user.dart b/lib/src/connect/meeting/main_websocket/user/user.dart
@@ -17,6 +17,7 @@ class UserModule extends Module {
 
   @override
   void onConnected() {
+    subscribe("current-user");
     subscribe("users");
   }
 

diff --git a/lib/src/utils/websocket.dart b/lib/src/utils/websocket.dart
@@ -51,6 +51,11 @@ class SimpleWebSocket {
     if (_socket != null) _socket.close(WebSocketStatus.normalClosure);
   }
 
+  closeWithReason(int reason) {
+    if (_socket != null) _socket.close(reason);
+  }
+
+
   Future<WebSocket> _connectForSelfSignedCert(
     String url, {
     String cookie,