From 411ddb949bc23145ae01956c703d3b1e0ad5b753 Mon Sep 17 00:00:00 2001 From: fufesou Date: Sat, 11 Mar 2023 18:11:19 +0800 Subject: [PATCH 1/3] fix build android Signed-off-by: fufesou --- src/server/connection.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/server/connection.rs b/src/server/connection.rs index 6bf602596..7127187d8 100644 --- a/src/server/connection.rs +++ b/src/server/connection.rs @@ -543,6 +543,7 @@ impl Connection { if let Some(s) = conn.server.upgrade() { let mut s = s.write().unwrap(); s.remove_connection(&conn.inner); + #[cfg(not(any(target_os = "android", target_os = "ios")))] try_stop_record_cursor_pos(); } log::info!("#{} connection loop exited", id); @@ -951,6 +952,7 @@ impl Connection { noperms.push(super::audio_service::NAME); } let mut s = s.write().unwrap(); + #[cfg(not(any(target_os = "android", target_os = "ios")))] try_start_record_cursor_pos(); s.add_connection(self.inner.clone(), &noperms); } @@ -1740,6 +1742,7 @@ impl Connection { self.lock_after_session_end = q == BoolOption::Yes; } } + #[cfg(not(any(target_os = "android", target_os = "ios")))] if let Ok(q) = o.show_remote_cursor.enum_value() { if q != BoolOption::NotSet { self.show_remote_cursor = q == BoolOption::Yes; From 6cf81c811f1bfaaeb2adf03a2c9f003d7abbb17c Mon Sep 17 00:00:00 2001 From: fufesou Date: Sat, 11 Mar 2023 18:21:23 +0800 Subject: [PATCH 2/3] do not show 'Show remote cursor' if peer side is android Signed-off-by: fufesou --- flutter/lib/desktop/widgets/remote_menubar.dart | 3 +++ 1 file changed, 3 insertions(+) diff --git a/flutter/lib/desktop/widgets/remote_menubar.dart b/flutter/lib/desktop/widgets/remote_menubar.dart index 3e37cef40..ac66c68a3 100644 --- a/flutter/lib/desktop/widgets/remote_menubar.dart +++ b/flutter/lib/desktop/widgets/remote_menubar.dart @@ -1437,6 +1437,9 @@ class _DisplayMenuState extends State<_DisplayMenu> { } showRemoteCursor() { + if (widget.ffi.ffiModel.pi.platform == kPeerPlatformAndroid) { + return Offstage(); + } final visible = !widget.ffi.canvasModel.cursorEmbedded; if (!visible) return Offstage(); final state = ShowRemoteCursorState.find(widget.id); From dc408002105979b0e2a136d711c34e716cbbb962 Mon Sep 17 00:00:00 2001 From: fufesou Date: Sat, 11 Mar 2023 18:26:36 +0800 Subject: [PATCH 3/3] do not show 'zoom cursor' if peer side is android Signed-off-by: fufesou --- flutter/lib/desktop/widgets/remote_menubar.dart | 3 +++ 1 file changed, 3 insertions(+) diff --git a/flutter/lib/desktop/widgets/remote_menubar.dart b/flutter/lib/desktop/widgets/remote_menubar.dart index ac66c68a3..e38e5c992 100644 --- a/flutter/lib/desktop/widgets/remote_menubar.dart +++ b/flutter/lib/desktop/widgets/remote_menubar.dart @@ -1457,6 +1457,9 @@ class _DisplayMenuState extends State<_DisplayMenu> { } zoomCursor() { + if (widget.ffi.ffiModel.pi.platform == kPeerPlatformAndroid) { + return Offstage(); + } final visible = widget.state.viewStyle.value != kRemoteViewStyleOriginal; if (!visible) return Offstage(); final option = 'zoom-cursor';