diff --git a/.gitignore b/.gitignore index 74c7fbd0a..21fd9e12e 100644 --- a/.gitignore +++ b/.gitignore @@ -9,13 +9,11 @@ src/version.rs *dmg *exe *tgz -*lib cert.pfx *.bak *png *svg *jpg -web_hbb sciter.dll **pdb src/bridge_generated.rs diff --git a/flutter/lib/pages/connection_page.dart b/flutter/lib/pages/connection_page.dart index 1fe4dc6b0..2cfbaa63b 100644 --- a/flutter/lib/pages/connection_page.dart +++ b/flutter/lib/pages/connection_page.dart @@ -256,7 +256,7 @@ class _ConnectionPageState extends State { ? [] : [ PopupMenuItem( - child: Text(translate('File transfer')), value: 'file') + child: Text(translate('Transfer File')), value: 'file') ]), elevation: 8, ); diff --git a/flutter/lib/pages/server_page.dart b/flutter/lib/pages/server_page.dart index 9377f495d..02f2b4aca 100644 --- a/flutter/lib/pages/server_page.dart +++ b/flutter/lib/pages/server_page.dart @@ -204,7 +204,7 @@ class _PermissionCheckerState extends State { serverModel.toggleService), PermissionRow(translate("Input Control"), serverModel.inputOk, serverModel.toggleInput), - PermissionRow(translate("File Transfer"), serverModel.fileOk, + PermissionRow(translate("Transfer File"), serverModel.fileOk, serverModel.toggleFile), hasAudioPermission ? PermissionRow(translate("Audio Capture"), serverModel.audioOk, diff --git a/src/server/connection.rs b/src/server/connection.rs index 481d72f90..304b20655 100644 --- a/src/server/connection.rs +++ b/src/server/connection.rs @@ -651,19 +651,14 @@ impl Connection { } self.authorized = true; - let mut pi = PeerInfo { - hostname: whoami::hostname(), - username, - platform: whoami::platform().to_string(), - version: crate::VERSION.to_owned(), - sas_enabled, - features: Some(Features { - privacy_mode: video_service::is_privacy_mode_supported(), - ..Default::default() - }) - .into(), + pi.username = username; + pi.sas_enabled = sas_enabled; + pi.features = Some(Features { + privacy_mode: video_service::is_privacy_mode_supported(), ..Default::default() - }; + }) + .into(); + let mut sub_service = false; if self.file_transfer.is_some() { res.set_peer_info(pi);