hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4596 from NicKoehler/multiline-fix

Browse Source 
fix empty messages
This commit is contained in:
RustDesk 2023-06-09 16:10:38 +08:00 committed by GitHub
commit 0968780d7a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
flutter/lib/models/chat_model.dart
View File

@ -89,25 +89,24 @@ class ChatModel with ChangeNotifier {
ChatModel(this.parent) {
sessionId = parent.target!.sessionId;
inputNode = FocusNode(
onKey: (node, event) {
onKey: (_, event) {
bool isShiftPressed = event.isKeyPressed(LogicalKeyboardKey.shiftLeft);
bool isEnterPressed = event.isKeyPressed(LogicalKeyboardKey.enter);
String trimmedText = textController.text.trim();
// don't send empty message
if (trimmedText.isEmpty) {
textController.text = trimmedText;
// don't send empty messages
if (isEnterPressed && isEnterPressed && textController.text.isEmpty) {
return KeyEventResult.handled;
}
if (isEnterPressed && !isShiftPressed) {
final ChatMessage message = ChatMessage(
text: trimmedText,
text: textController.text,
user: me,
createdAt: DateTime.now(),
);
send(message);
textController.text = "";
textController.clear();
return KeyEventResult.handled;
}
return KeyEventResult.ignored;
@ -335,16 +334,18 @@ class ChatModel with ChangeNotifier {
}
send(ChatMessage message) {
if (message.text.isNotEmpty) {
_messages[_currentID]?.insert(message);
if (_currentID == clientModeID) {
if (parent.target != null) {
bind.sessionSendChat(sessionId: sessionId, text: message.text);
String trimmedText = message.text.trim();
if (trimmedText.isEmpty) {
return;
}
message.text = trimmedText;
_messages[_currentID]?.insert(message);
if (_currentID == clientModeID && parent.target != null) {
bind.sessionSendChat(sessionId: sessionId, text: message.text);
} else {
bind.cmSendChat(connId: _currentID, msg: message.text);
}
}
notifyListeners();
inputNode.requestFocus();
}