mirror/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2024-12-18 13:37:52 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #731 from Heap-Hop/master

Browse Source 
Fix two small bugs of Android
This commit is contained in:
RustDesk 2022-06-08 23:13:05 +08:00 committed by GitHub
commit d1da63fc97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -9,13 +9,11 @@ src/version.rs
*dmg *dmg
*exe *exe
*tgz *tgz
*lib
cert.pfx cert.pfx
*.bak *.bak
*png *png
*svg *svg
*jpg *jpg
web_hbb
sciter.dll sciter.dll
**pdb **pdb
src/bridge_generated.rs src/bridge_generated.rs

2
flutter/lib/pages/connection_page.dart
View File

@ -256,7 +256,7 @@ class _ConnectionPageState extends State<ConnectionPage> {
? [] ? []
: [ : [
PopupMenuItem<String>( PopupMenuItem<String>(
child: Text(translate('File transfer')), value: 'file') child: Text(translate('Transfer File')), value: 'file')
]), ]),
elevation: 8, elevation: 8,
); );

2
flutter/lib/pages/server_page.dart
View File

@ -204,7 +204,7 @@ class _PermissionCheckerState extends State<PermissionChecker> {
serverModel.toggleService), serverModel.toggleService),
PermissionRow(translate("Input Control"), serverModel.inputOk, PermissionRow(translate("Input Control"), serverModel.inputOk,
serverModel.toggleInput), serverModel.toggleInput),
PermissionRow(translate("File Transfer"), serverModel.fileOk, PermissionRow(translate("Transfer File"), serverModel.fileOk,
serverModel.toggleFile), serverModel.toggleFile),
hasAudioPermission hasAudioPermission
? PermissionRow(translate("Audio Capture"), serverModel.audioOk, ? PermissionRow(translate("Audio Capture"), serverModel.audioOk,

19
src/server/connection.rs
View File

@ -651,19 +651,14 @@ impl Connection {
} }
self.authorized = true; self.authorized = true;
let mut pi = PeerInfo { pi.username = username;
hostname: whoami::hostname(), pi.sas_enabled = sas_enabled;
username, pi.features = Some(Features {
platform: whoami::platform().to_string(), privacy_mode: video_service::is_privacy_mode_supported(),
version: crate::VERSION.to_owned(),
sas_enabled,
features: Some(Features {
privacy_mode: video_service::is_privacy_mode_supported(),
..Default::default()
})
.into(),
..Default::default() ..Default::default()
}; })
.into();
let mut sub_service = false; let mut sub_service = false;
if self.file_transfer.is_some() { if self.file_transfer.is_some() {
res.set_peer_info(pi); res.set_peer_info(pi);