fix chat model

flutter/lib/models/chat_model.dart

@@ -6,41 +6,68 @@ import 'package:flutter/material.dart';
 import '../widgets/overlay.dart';
 import 'model.dart';
 
+class MessageBody {
+  ChatUser chatUser;
+  List<ChatMessage> chatMessages;
+  MessageBody(this.chatUser, this.chatMessages);
+
+  void add(ChatMessage cm) {
+    this.chatMessages.add(cm);
+  }
+
+  void clear() {
+    this.chatMessages.clear();
+  }
+}
+
 class ChatModel with ChangeNotifier {
   static final clientModeID = -1;
 
-  final Map<int, List<ChatMessage>> _messages = Map()..[clientModeID] = [];
-
   final ChatUser me = ChatUser(
     uid: "",
     name: "Me",
   );
 
+  late final Map<int, MessageBody> _messages = Map()
+    ..[clientModeID] = MessageBody(me, []);
+
   final _scroller = ScrollController();
 
   var _currentID = clientModeID;
 
   ScrollController get scroller => _scroller;
 
-  Map<int, List<ChatMessage>> get messages => _messages;
+  Map<int, MessageBody> get messages => _messages;
 
   int get currentID => _currentID;
 
-  ChatUser get currentUser =>
-      FFI.serverModel.clients[_currentID]?.chatUser ?? me;
+  ChatUser get currentUser {
+    final user = messages[currentID]?.chatUser;
+    if (user == null) {
+      _currentID = clientModeID;
+      return me;
+    } else {
+      return user;
+    }
+  }
 
   changeCurrentID(int id) {
     if (_messages.containsKey(id)) {
       _currentID = id;
       notifyListeners();
     } else {
-      final chatUser = FFI.serverModel.clients[id]?.chatUser;
-      if (chatUser == null) {
+      final client = FFI.serverModel.clients[id];
+      if (client == null) {
         return debugPrint(
             "Failed to changeCurrentID,remote user doesn't exist");
       }
-      _messages[id] = [];
+      final chatUser = ChatUser(
+        uid: client.peerId,
+        name: client.name,
+      );
+      _messages[id] = MessageBody(chatUser, []);
       _currentID = id;
+      notifyListeners();
     }
   }
 
@@ -57,13 +84,15 @@ class ChatModel with ChangeNotifier {
         uid: FFI.getId(),
       );
     } else {
-      chatUser = FFI.serverModel.clients[id]?.chatUser;
-    }
-    if (chatUser == null) {
-      return debugPrint("Failed to receive msg,user doesn't exist");
+      final client = FFI.serverModel.clients[id];
+      if (client == null) {
+        return debugPrint("Failed to receive msg,user doesn't exist");
+      }
+      chatUser = ChatUser(uid: client.peerId, name: client.name);
     }
+
     if (!_messages.containsKey(id)) {
-      _messages[id] = [];
+      _messages[id] = MessageBody(chatUser, []);
     }
     _messages[id]!.add(ChatMessage(text: text, user: chatUser));
     _currentID = id;
@@ -100,4 +129,8 @@ class ChatModel with ChangeNotifier {
     hideChatWindowOverlay();
     notifyListeners();
   }
+
+  resetClientMode() {
+    _messages[clientModeID]?.clear();
+  }
 }

flutter/lib/models/model.dart

@@ -221,8 +221,8 @@ class FfiModel with ChangeNotifier {
 
   void showMsgBox(String type, String title, String text, bool hasRetry) {
     msgBox(type, title, text);
+    _timer?.cancel();
     if (hasRetry) {
-      _timer?.cancel();
       _timer = Timer(Duration(seconds: _reconnects), () {
         FFI.reconnect();
         showLoading(translate('Connecting...'));
@@ -245,7 +245,7 @@ class FfiModel with ChangeNotifier {
     if (isPeerAndroid) {
       _touchMode = true;
       if (FFI.ffiModel.permissions['keyboard'] != false) {
-        showMobileActionsOverlay();
+        Timer(Duration(milliseconds: 100), showMobileActionsOverlay);
       }
     } else {
       _touchMode = FFI.getByName('peer_option', "touch-mode") != '';
@@ -757,6 +757,7 @@ class FFI {
     if (isFileTransfer) {
       setByName('connect_file_transfer', id);
     } else {
+      FFI.chatModel.resetClientMode();
       setByName('connect', id);
     }
     FFI.id = id;

flutter/lib/models/server_model.dart

@@ -448,7 +448,6 @@ class Client {
   bool keyboard = false;
   bool clipboard = false;
   bool audio = false;
-  late ChatUser chatUser;
 
   Client(this.authorized, this.isFileTransfer, this.name, this.peerId,
       this.keyboard, this.clipboard, this.audio);
@@ -462,10 +461,6 @@ class Client {
     keyboard = json['keyboard'];
     clipboard = json['clipboard'];
     audio = json['audio'];
-    chatUser = ChatUser(
-      uid: peerId,
-      name: name,
-    );
   }
 
   Map<String, dynamic> toJson() {