Merge branch 'rustdesk:master' into master

zhangbo8418 · Oct 29, 2024 · 3fb72ea · 3fb72ea
2 parents 31dbbdc + 415d2c5
commit 3fb72ea
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/flutter/lib/common/widgets/remote_input.dart b/flutter/lib/common/widgets/remote_input.dart
@@ -185,7 +185,9 @@ class _RawTouchGestureDetectorRegionState
       ffi.cursorModel
           .move(_cacheLongPressPosition.dx, _cacheLongPressPosition.dy);
     }
-    inputModel.tap(MouseButtons.right);
+    if (!ffi.ffiModel.isPeerMobile) {
+      inputModel.tap(MouseButtons.right);
+    }
   }
 
   onDoubleFinerTapDown(TapDownDetails d) {

diff --git a/flutter/lib/models/model.dart b/flutter/lib/models/model.dart
@@ -142,6 +142,7 @@ class FfiModel with ChangeNotifier {
   bool get touchMode => _touchMode;
 
   bool get isPeerAndroid => _pi.platform == kPeerPlatformAndroid;
+  bool get isPeerMobile => isPeerAndroid;
 
   bool get viewOnly => _viewOnly;
 

diff --git a/libs/hbb_common/src/config.rs b/libs/hbb_common/src/config.rs
@@ -2225,6 +2225,7 @@ pub mod keys {
     pub const OPTION_ALLOW_LINUX_HEADLESS: &str = "allow-linux-headless";
     pub const OPTION_ENABLE_HWCODEC: &str = "enable-hwcodec";
     pub const OPTION_APPROVE_MODE: &str = "approve-mode";
+    pub const OPTION_VERIFICATION_METHOD: &str = "verification-method";
     pub const OPTION_CUSTOM_RENDEZVOUS_SERVER: &str = "custom-rendezvous-server";
     pub const OPTION_API_SERVER: &str = "api-server";
     pub const OPTION_KEY: &str = "key";
@@ -2370,6 +2371,7 @@ pub mod keys {
         OPTION_ALLOW_LINUX_HEADLESS,
         OPTION_ENABLE_HWCODEC,
         OPTION_APPROVE_MODE,
+        OPTION_VERIFICATION_METHOD,
         OPTION_PROXY_URL,
         OPTION_PROXY_USERNAME,
         OPTION_PROXY_PASSWORD,