Merge branch 'rustdesk:master' into master

flutter/lib/common/widgets/address_book.dart

@@ -1,5 +1,6 @@
 import 'dart:math';
 
+import 'package:bot_toast/bot_toast.dart';
 import 'package:dropdown_button2/dropdown_button2.dart';
 import 'package:dynamic_layouts/dynamic_layouts.dart';
 import 'package:flutter/material.dart';
@@ -316,13 +317,14 @@ class _AddressBookState extends State<AddressBook> {
 
   Widget _buildTags() {
     return Obx(() {
-      final List tags;
+      List tags;
       if (gFFI.abModel.sortTags.value) {
         tags = gFFI.abModel.currentAbTags.toList();
         tags.sort();
       } else {
-        tags = gFFI.abModel.currentAbTags;
+        tags = gFFI.abModel.currentAbTags.toList();
       }
+      tags = [kUntagged, ...tags].toList();
       final editPermission = gFFI.abModel.current.canWrite();
       tagBuilder(String e) {
         return AddressBookTag(
@@ -669,6 +671,14 @@ class _AddressBookState extends State<AddressBook> {
         } else {
           final tags = field.trim().split(RegExp(r"[\s,;\n]+"));
           field = tags.join(',');
+          for (var t in [kUntagged, translate(kUntagged)]) {
+            if (tags.contains(t)) {
+              BotToast.showText(
+                  contentColor: Colors.red, text: 'Tag name cannot be "$t"');
+              isInProgress = false;
+              return;
+            }
+          }
           gFFI.abModel.addTags(tags);
           // final currentPeers
         }
@@ -741,12 +751,14 @@ class AddressBookTag extends StatelessWidget {
     }
 
     const double radius = 8;
+    final isUnTagged = name == kUntagged;
+    final showAction = showActionMenu && !isUnTagged;
     return GestureDetector(
       onTap: onTap,
-      onTapDown: showActionMenu ? setPosition : null,
-      onSecondaryTapDown: showActionMenu ? setPosition : null,
-      onSecondaryTap: showActionMenu ? () => _showMenu(context, pos) : null,
-      onLongPress: showActionMenu ? () => _showMenu(context, pos) : null,
+      onTapDown: showAction ? setPosition : null,
+      onSecondaryTapDown: showAction ? setPosition : null,
+      onSecondaryTap: showAction ? () => _showMenu(context, pos) : null,
+      onLongPress: showAction ? () => _showMenu(context, pos) : null,
       child: Obx(() => Container(
             decoration: BoxDecoration(
                 color: tags.contains(name)
@@ -758,17 +770,18 @@ class AddressBookTag extends StatelessWidget {
             child: IntrinsicWidth(
               child: Row(
                 children: [
-                  Container(
-                    width: radius,
-                    height: radius,
-                    decoration: BoxDecoration(
-                        shape: BoxShape.circle,
-                        color: tags.contains(name)
-                            ? Colors.white
-                            : gFFI.abModel.getCurrentAbTagColor(name)),
-                  ).marginOnly(right: radius / 2),
+                  if (!isUnTagged)
+                    Container(
+                      width: radius,
+                      height: radius,
+                      decoration: BoxDecoration(
+                          shape: BoxShape.circle,
+                          color: tags.contains(name)
+                              ? Colors.white
+                              : gFFI.abModel.getCurrentAbTagColor(name)),
+                    ).marginOnly(right: radius / 2),
                   Expanded(
-                    child: Text(name,
+                    child: Text(isUnTagged ? translate(name) : name,
                         style: TextStyle(
                             overflow: TextOverflow.ellipsis,
                             color: tags.contains(name) ? Colors.white : null)),

flutter/lib/common/widgets/peers_view.dart

@@ -6,6 +6,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hbb/consts.dart';
 import 'package:flutter_hbb/desktop/widgets/scroll_wrapper.dart';
+import 'package:flutter_hbb/models/ab_model.dart';
 import 'package:flutter_hbb/models/peer_tab_model.dart';
 import 'package:flutter_hbb/models/state_model.dart';
 import 'package:get/get.dart';
@@ -532,15 +533,22 @@ class AddressBookPeersView extends BasePeersView {
     if (selectedTags.isEmpty) {
       return true;
     }
+    // The result of a no-tag union with normal tags, still allows normal tags to perform union or intersection operations.
+    final selectedNormalTags =
+        selectedTags.where((tag) => tag != kUntagged).toList();
+    if (selectedTags.contains(kUntagged)) {
+      if (idents.isEmpty) return true;
+      if (selectedNormalTags.isEmpty) return false;
+    }
     if (gFFI.abModel.filterByIntersection.value) {
-      for (final tag in selectedTags) {
+      for (final tag in selectedNormalTags) {
         if (!idents.contains(tag)) {
           return false;
         }
       }
       return true;
     } else {
-      for (final tag in selectedTags) {
+      for (final tag in selectedNormalTags) {
         if (idents.contains(tag)) {
           return true;
         }

flutter/lib/mobile/pages/remote_page.dart

@@ -26,6 +26,19 @@ import '../widgets/dialog.dart';
 
 final initText = '1' * 1024;
 
+// Workaround for Android (default input method, Microsoft SwiftKey keyboard) when using physical keyboard.
+// When connecting a physical keyboard, `KeyEvent.physicalKey.usbHidUsage` are wrong is using Microsoft SwiftKey keyboard.
+// https://github.com/flutter/flutter/issues/159384
+// https://github.com/flutter/flutter/issues/159383
+void _disableAndroidSoftKeyboard({bool? isKeyboardVisible}) {
+  if (isAndroid) {
+    if (isKeyboardVisible != true) {
+      // `enable_soft_keyboard` will be set to `true` when clicking the keyboard icon, in `openKeyboard()`.
+      gFFI.invokeMethod("enable_soft_keyboard", false);
+    }
+  }
+}
+
 class RemotePage extends StatefulWidget {
   RemotePage({Key? key, required this.id, this.password, this.isSharedPassword})
       : super(key: key);
@@ -99,6 +112,8 @@ class _RemotePageState extends State<RemotePage> with WidgetsBindingObserver {
       if (gFFI.recordingModel.start) {
         showToast(translate('Automatically record outgoing sessions'));
       }
+      _disableAndroidSoftKeyboard(
+          isKeyboardVisible: keyboardVisibilityController.isVisible);
     });
     WidgetsBinding.instance.addObserver(this);
   }
@@ -1244,7 +1259,9 @@ void showOptions(
               toggles +
               [privacyModeWidget]),
     );
-  }, clickMaskDismiss: true, backDismiss: true);
+  }, clickMaskDismiss: true, backDismiss: true).then((value) {
+    _disableAndroidSoftKeyboard();
+  });
 }
 
 TTextMenu? getVirtualDisplayMenu(FFI ffi, String id) {
@@ -1263,7 +1280,9 @@ TTextMenu? getVirtualDisplayMenu(FFI ffi, String id) {
             children: children,
           ),
         );
-      }, clickMaskDismiss: true, backDismiss: true);
+      }, clickMaskDismiss: true, backDismiss: true).then((value) {
+        _disableAndroidSoftKeyboard();
+      });
     },
   );
 }
@@ -1305,7 +1324,9 @@ TTextMenu? getResolutionMenu(FFI ffi, String id) {
             children: children,
           ),
         );
-      }, clickMaskDismiss: true, backDismiss: true);
+      }, clickMaskDismiss: true, backDismiss: true).then((value) {
+        _disableAndroidSoftKeyboard();
+      });
     },
   );
 }

flutter/lib/models/ab_model.dart

@@ -33,6 +33,8 @@ bool filterAbTagByIntersection() {
 const _personalAddressBookName = "My address book";
 const _legacyAddressBookName = "Legacy address book";
 
+const kUntagged = "Untagged";
+
 enum ForcePullAb {
   listAndCurrent,
   current,
@@ -424,6 +426,7 @@ class AbModel {
 
 // #region tags
   Future<bool> addTags(List<String> tagList) async {
+    tagList.removeWhere((e) => e == kUntagged);
     final ret = await current.addTags(tagList, {});
     await pullNonLegacyAfterChange();
     _saveCache();

flutter/lib/models/model.dart

@@ -2859,6 +2859,7 @@ class FFI {
           canvasModel.scale,
           ffiModel.pi.currentDisplay);
     }
+    imageModel.callbacksOnFirstImage.clear();
     await imageModel.update(null);
     cursorModel.clear();
     ffiModel.clear();

src/lang/ar.rs

@@ -654,5 +654,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Upload files", ""),
         ("Clipboard is synchronized", ""),
         ("Update client clipboard", ""),
+        ("Untagged", ""),
     ].iter().cloned().collect();
 }

src/lang/be.rs

@@ -654,5 +654,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Upload files", ""),
         ("Clipboard is synchronized", ""),
         ("Update client clipboard", ""),
+        ("Untagged", ""),
     ].iter().cloned().collect();
 }

src/lang/bg.rs

@@ -654,5 +654,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Upload files", ""),
         ("Clipboard is synchronized", ""),
         ("Update client clipboard", ""),
+        ("Untagged", ""),
     ].iter().cloned().collect();
 }

src/lang/ca.rs

@@ -654,5 +654,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Upload files", ""),
         ("Clipboard is synchronized", ""),
         ("Update client clipboard", ""),
+        ("Untagged", ""),
     ].iter().cloned().collect();
 }

src/lang/cn.rs

@@ -654,5 +654,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Upload files", "上传文件"),
         ("Clipboard is synchronized", "剪贴板已同步"),
         ("Update client clipboard", "更新客户端的粘贴板"),
+        ("Untagged", "无标签"),
     ].iter().cloned().collect();
 }

src/lang/cs.rs

@@ -654,5 +654,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Upload files", ""),
         ("Clipboard is synchronized", ""),
         ("Update client clipboard", ""),
+        ("Untagged", ""),
     ].iter().cloned().collect();
 }

src/lang/da.rs

@@ -654,5 +654,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Upload files", ""),
         ("Clipboard is synchronized", ""),
         ("Update client clipboard", ""),
+        ("Untagged", ""),
     ].iter().cloned().collect();
 }

src/lang/de.rs

@@ -654,5 +654,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Upload files", "Dateien hochladen"),
         ("Clipboard is synchronized", "Zwischenablage ist synchronisiert"),
         ("Update client clipboard", "Client-Zwischenablage aktualisieren"),
+        ("Untagged", ""),
     ].iter().cloned().collect();
 }

src/lang/el.rs

@@ -654,5 +654,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Upload files", ""),
         ("Clipboard is synchronized", ""),
         ("Update client clipboard", ""),
+        ("Untagged", ""),
     ].iter().cloned().collect();
 }

src/lang/eo.rs

@@ -654,5 +654,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Upload files", ""),
         ("Clipboard is synchronized", ""),
         ("Update client clipboard", ""),
+        ("Untagged", ""),
     ].iter().cloned().collect();
 }

src/lang/es.rs

@@ -654,5 +654,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Upload files", "Subir archivos"),
         ("Clipboard is synchronized", "Portapapeles sincronizado"),
         ("Update client clipboard", "Actualizar portapapeles del cliente"),
+        ("Untagged", ""),
     ].iter().cloned().collect();
 }

src/lang/et.rs

@@ -654,5 +654,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Upload files", ""),
         ("Clipboard is synchronized", ""),
         ("Update client clipboard", ""),
+        ("Untagged", ""),
     ].iter().cloned().collect();
 }

src/lang/eu.rs

@@ -654,5 +654,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Upload files", ""),
         ("Clipboard is synchronized", ""),
         ("Update client clipboard", ""),
+        ("Untagged", ""),
     ].iter().cloned().collect();
 }

src/lang/fa.rs

@@ -654,5 +654,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Upload files", ""),
         ("Clipboard is synchronized", ""),
         ("Update client clipboard", ""),
+        ("Untagged", ""),
     ].iter().cloned().collect();
 }

src/lang/fr.rs

@@ -654,5 +654,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Upload files", ""),
         ("Clipboard is synchronized", ""),
         ("Update client clipboard", ""),
+        ("Untagged", ""),
     ].iter().cloned().collect();
 }

src/lang/he.rs

@@ -654,5 +654,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Upload files", ""),
         ("Clipboard is synchronized", ""),
         ("Update client clipboard", ""),
+        ("Untagged", ""),
     ].iter().cloned().collect();
 }

src/lang/hr.rs

@@ -654,5 +654,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Upload files", ""),
         ("Clipboard is synchronized", ""),
         ("Update client clipboard", ""),
+        ("Untagged", ""),
     ].iter().cloned().collect();
 }

src/lang/hu.rs

@@ -654,5 +654,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Upload files", "Fájlok feltöltése"),
         ("Clipboard is synchronized", "A vágólap szinkronizálva van"),
         ("Update client clipboard", ""),
+        ("Untagged", ""),
     ].iter().cloned().collect();
 }

src/lang/id.rs

@@ -654,5 +654,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Upload files", ""),
         ("Clipboard is synchronized", ""),
         ("Update client clipboard", ""),
+        ("Untagged", ""),
     ].iter().cloned().collect();
 }

src/lang/it.rs

@@ -654,5 +654,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Upload files", "File upload"),
         ("Clipboard is synchronized", "Gli appunti sono sincronizzati"),
         ("Update client clipboard", "Aggiorna appunti client"),
+        ("Untagged", ""),
     ].iter().cloned().collect();
 }

src/lang/ja.rs

@@ -654,5 +654,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Upload files", ""),
         ("Clipboard is synchronized", ""),
         ("Update client clipboard", ""),
+        ("Untagged", ""),
     ].iter().cloned().collect();
 }

src/lang/ko.rs

@@ -654,5 +654,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Upload files", "파일 업로드"),
         ("Clipboard is synchronized", "클립보드가 동기화됨"),
         ("Update client clipboard", ""),
+        ("Untagged", ""),
     ].iter().cloned().collect();
 }

src/lang/kz.rs

@@ -654,5 +654,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Upload files", ""),
         ("Clipboard is synchronized", ""),
         ("Update client clipboard", ""),
+        ("Untagged", ""),
     ].iter().cloned().collect();
 }

src/lang/lt.rs

@@ -654,5 +654,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Upload files", ""),
         ("Clipboard is synchronized", ""),
         ("Update client clipboard", ""),
+        ("Untagged", ""),
     ].iter().cloned().collect();
 }

src/lang/lv.rs

@@ -654,5 +654,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Upload files", "Augšupielādēt failus"),
         ("Clipboard is synchronized", "Starpliktuve ir sinhronizēta"),
         ("Update client clipboard", ""),
+        ("Untagged", ""),
     ].iter().cloned().collect();
 }

src/lang/nb.rs

@@ -654,5 +654,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Upload files", ""),
         ("Clipboard is synchronized", ""),
         ("Update client clipboard", ""),
+        ("Untagged", ""),
     ].iter().cloned().collect();
 }

src/lang/nl.rs

@@ -654,5 +654,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Upload files", "Bestanden uploaden"),
         ("Clipboard is synchronized", "Klembord is gesynchroniseerd"),
         ("Update client clipboard", "Klembord van client bijwerken"),
+        ("Untagged", ""),
     ].iter().cloned().collect();
 }