hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

android fix:protobuf 3.1.0

Browse Source
This commit is contained in:
csf 2022-07-17 16:47:19 +08:00
parent 88fef77980
commit f587bdee5a
3 changed files with 37 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
flutter/lib/pages/settings_page.dart
View File

@ -146,13 +146,7 @@ class _SettingsState extends State<SettingsPage> with WidgetsBindingObserver {
leading: Icon(Icons.cloud), leading: Icon(Icons.cloud),
onPressed: (context) { onPressed: (context) {
showServerSettings(); showServerSettings();
}), })
SettingsTile.navigation(
title: Text(translate('Language')),
leading: Icon(Icons.translate),
onPressed: (context) {
showLanguageSettings();
}),
]), ]),
SettingsSection( SettingsSection(
title: Text(translate("Enhancements")), title: Text(translate("Enhancements")),
@ -191,13 +185,6 @@ void showServerSettings() {
showServerSettingsWithValue(id, relay, key, api); showServerSettingsWithValue(id, relay, key, api);
} }
void showLanguageSettings() {
try {
final langs = json.decode(FFI.getByName('langs')) as Map<String, String>;
debugPrint("langs:$langs");
} catch (e) {}
}
void showAbout() { void showAbout() {
DialogManager.show((setState, close) { DialogManager.show((setState, close) {
return CustomAlertDialog( return CustomAlertDialog(

72
src/mobile.rs
View File

@ -599,7 +599,7 @@ impl Connection {
async fn handle_msg_from_peer(&mut self, data: &[u8], peer: &mut Stream) -> bool { async fn handle_msg_from_peer(&mut self, data: &[u8], peer: &mut Stream) -> bool {
if let Ok(msg_in) = Message::parse_from_bytes(&data) { if let Ok(msg_in) = Message::parse_from_bytes(&data) {
match msg_in.union { match msg_in.union {
Some(message::Union::video_frame(vf)) => { Some(message::Union::VideoFrame(vf)) => {
if !self.first_frame { if !self.first_frame {
self.first_frame = true; self.first_frame = true;
} }
@ -610,21 +610,21 @@ impl Connection {
s.add(ZeroCopyBuffer(self.video_handler.rgb.clone())); s.add(ZeroCopyBuffer(self.video_handler.rgb.clone()));
} }
} }
Some(message::Union::hash(hash)) => { Some(message::Union::Hash(hash)) => {
self.session.handle_hash(hash, peer).await; self.session.handle_hash(hash, peer).await;
} }
Some(message::Union::login_response(lr)) => match lr.union { Some(message::Union::LoginResponse(lr)) => match lr.union {
Some(login_response::Union::error(err)) => { Some(login_response::Union::Error(err)) => {
if !self.session.handle_login_error(&err) { if !self.session.handle_login_error(&err) {
return false; return false;
} }
} }
Some(login_response::Union::peer_info(pi)) => { Some(login_response::Union::PeerInfo(pi)) => {
self.session.handle_peer_info(pi); self.session.handle_peer_info(pi);
} }
_ => {} _ => {}
}, },
Some(message::Union::clipboard(cb)) => { Some(message::Union::Clipboard(cb)) => {
if !self.session.lc.read().unwrap().disable_clipboard { if !self.session.lc.read().unwrap().disable_clipboard {
let content = if cb.compress { let content = if cb.compress {
decompress(&cb.content) decompress(&cb.content)
@ -637,7 +637,7 @@ impl Connection {
} }
} }
} }
Some(message::Union::cursor_data(cd)) => { Some(message::Union::CursorData(cd)) => {
let colors = hbb_common::compress::decompress(&cd.colors); let colors = hbb_common::compress::decompress(&cd.colors);
self.session.push_event( self.session.push_event(
"cursor_data", "cursor_data",
@ -654,18 +654,18 @@ impl Connection {
], ],
); );
} }
Some(message::Union::cursor_id(id)) => { Some(message::Union::CursorId(id)) => {
self.session self.session
.push_event("cursor_id", vec![("id", &id.to_string())]); .push_event("cursor_id", vec![("id", &id.to_string())]);
} }
Some(message::Union::cursor_position(cp)) => { Some(message::Union::CursorPosition(cp)) => {
self.session.push_event( self.session.push_event(
"cursor_position", "cursor_position",
vec![("x", &cp.x.to_string()), ("y", &cp.y.to_string())], vec![("x", &cp.x.to_string()), ("y", &cp.y.to_string())],
); );
} }
Some(message::Union::file_response(fr)) => match fr.union { Some(message::Union::FileResponse(fr)) => match fr.union {
Some(file_response::Union::dir(fd)) => { Some(file_response::Union::Dir(fd)) => {
let mut entries = fd.entries.to_vec(); let mut entries = fd.entries.to_vec();
if self.session.peer_platform() == "Windows" { if self.session.peer_platform() == "Windows" {
fs::transform_windows_path(&mut entries); fs::transform_windows_path(&mut entries);
@ -679,7 +679,7 @@ impl Connection {
job.set_files(entries); job.set_files(entries);
} }
} }
Some(file_response::Union::block(block)) => { Some(file_response::Union::Block(block)) => {
if let Some(job) = fs::get_job(block.id, &mut self.write_jobs) { if let Some(job) = fs::get_job(block.id, &mut self.write_jobs) {
if let Err(_err) = job.write(block, None).await { if let Err(_err) = job.write(block, None).await {
// to-do: add "skip" for writing job // to-do: add "skip" for writing job
@ -687,17 +687,17 @@ impl Connection {
self.update_jobs_status(); self.update_jobs_status();
} }
} }
Some(file_response::Union::done(d)) => { Some(file_response::Union::Done(d)) => {
if let Some(job) = fs::get_job(d.id, &mut self.write_jobs) { if let Some(job) = fs::get_job(d.id, &mut self.write_jobs) {
job.modify_time(); job.modify_time();
fs::remove_job(d.id, &mut self.write_jobs); fs::remove_job(d.id, &mut self.write_jobs);
} }
self.handle_job_status(d.id, d.file_num, None); self.handle_job_status(d.id, d.file_num, None);
} }
Some(file_response::Union::error(e)) => { Some(file_response::Union::Error(e)) => {
self.handle_job_status(e.id, e.file_num, Some(e.error)); self.handle_job_status(e.id, e.file_num, Some(e.error));
} }
Some(file_response::Union::digest(digest)) => { Some(file_response::Union::Digest(digest)) => {
if digest.is_upload { if digest.is_upload {
if let Some(job) = fs::get_job(digest.id, &mut self.read_jobs) { if let Some(job) = fs::get_job(digest.id, &mut self.read_jobs) {
if let Some(file) = job.files().get(digest.file_num as usize) { if let Some(file) = job.files().get(digest.file_num as usize) {
@ -708,9 +708,9 @@ impl Connection {
id: digest.id, id: digest.id,
file_num: digest.file_num, file_num: digest.file_num,
union: Some(if overwrite { union: Some(if overwrite {
file_transfer_send_confirm_request::Union::offset_blk(0) file_transfer_send_confirm_request::Union::OffsetBlk(0)
} else { } else {
file_transfer_send_confirm_request::Union::skip( file_transfer_send_confirm_request::Union::Skip(
true, true,
) )
}), }),
@ -740,7 +740,7 @@ impl Connection {
let msg= new_send_confirm(FileTransferSendConfirmRequest { let msg= new_send_confirm(FileTransferSendConfirmRequest {
id: digest.id, id: digest.id,
file_num: digest.file_num, file_num: digest.file_num,
union: Some(file_transfer_send_confirm_request::Union::skip(true)), union: Some(file_transfer_send_confirm_request::Union::Skip(true)),
..Default::default() ..Default::default()
}); });
self.session.send_msg(msg); self.session.send_msg(msg);
@ -752,9 +752,9 @@ impl Connection {
id: digest.id, id: digest.id,
file_num: digest.file_num, file_num: digest.file_num,
union: Some(if overwrite { union: Some(if overwrite {
file_transfer_send_confirm_request::Union::offset_blk(0) file_transfer_send_confirm_request::Union::OffsetBlk(0)
} else { } else {
file_transfer_send_confirm_request::Union::skip(true) file_transfer_send_confirm_request::Union::Skip(true)
}), }),
..Default::default() ..Default::default()
}, },
@ -774,7 +774,7 @@ impl Connection {
FileTransferSendConfirmRequest { FileTransferSendConfirmRequest {
id: digest.id, id: digest.id,
file_num: digest.file_num, file_num: digest.file_num,
union: Some(file_transfer_send_confirm_request::Union::offset_blk(0)), union: Some(file_transfer_send_confirm_request::Union::OffsetBlk(0)),
..Default::default() ..Default::default()
}, },
); );
@ -791,15 +791,15 @@ impl Connection {
} }
_ => {} _ => {}
}, },
Some(message::Union::misc(misc)) => match misc.union { Some(message::Union::Misc(misc)) => match misc.union {
Some(misc::Union::audio_format(f)) => { Some(misc::Union::AudioFormat(f)) => {
self.audio_handler.handle_format(f); // self.audio_handler.handle_format(f); //
} }
Some(misc::Union::chat_message(c)) => { Some(misc::Union::ChatMessage(c)) => {
self.session self.session
.push_event("chat_client_mode", vec![("text", &c.text)]); .push_event("chat_client_mode", vec![("text", &c.text)]);
} }
Some(misc::Union::permission_info(p)) => { Some(misc::Union::PermissionInfo(p)) => {
log::info!("Change permission {:?} -> {}", p.permission, p.enabled); log::info!("Change permission {:?} -> {}", p.permission, p.enabled);
use permission_info::Permission; use permission_info::Permission;
self.session.push_event( self.session.push_event(
@ -815,7 +815,7 @@ impl Connection {
)], )],
); );
} }
Some(misc::Union::switch_display(s)) => { Some(misc::Union::SwitchDisplay(s)) => {
self.video_handler.reset(); self.video_handler.reset();
self.session.push_event( self.session.push_event(
"switch_display", "switch_display",
@ -828,22 +828,22 @@ impl Connection {
], ],
); );
} }
Some(misc::Union::close_reason(c)) => { Some(misc::Union::CloseReason(c)) => {
self.session.msgbox("error", "Connection Error", &c); self.session.msgbox("error", "Connection Error", &c);
return false; return false;
} }
_ => {} _ => {}
}, },
Some(message::Union::test_delay(t)) => { Some(message::Union::TestDelay(t)) => {
self.session.handle_test_delay(t, peer).await; self.session.handle_test_delay(t, peer).await;
} }
Some(message::Union::audio_frame(frame)) => { Some(message::Union::AudioFrame(frame)) => {
if !self.session.lc.read().unwrap().disable_audio { if !self.session.lc.read().unwrap().disable_audio {
self.audio_handler.handle_frame(frame); self.audio_handler.handle_frame(frame);
} }
} }
Some(message::Union::file_action(action)) => match action.union { Some(message::Union::FileAction(action)) => match action.union {
Some(file_action::Union::send_confirm(c)) => { Some(file_action::Union::SendConfirm(c)) => {
if let Some(job) = fs::get_job(c.id, &mut self.read_jobs) { if let Some(job) = fs::get_job(c.id, &mut self.read_jobs) {
job.confirm(&c); job.confirm(&c);
} }
@ -1029,9 +1029,9 @@ impl Connection {
id, id,
file_num, file_num,
union: if need_override { union: if need_override {
Some(file_transfer_send_confirm_request::Union::offset_blk(0)) Some(file_transfer_send_confirm_request::Union::OffsetBlk(0))
} else { } else {
Some(file_transfer_send_confirm_request::Union::skip(true)) Some(file_transfer_send_confirm_request::Union::Skip(true))
}, },
..Default::default() ..Default::default()
}); });
@ -1047,9 +1047,9 @@ impl Connection {
id, id,
file_num, file_num,
union: if need_override { union: if need_override {
Some(file_transfer_send_confirm_request::Union::offset_blk(0)) Some(file_transfer_send_confirm_request::Union::OffsetBlk(0))
} else { } else {
Some(file_transfer_send_confirm_request::Union::skip(true)) Some(file_transfer_send_confirm_request::Union::Skip(true))
}, },
..Default::default() ..Default::default()
}); });
@ -1451,7 +1451,7 @@ pub mod connection_manager {
let mut req = FileTransferSendConfirmRequest { let mut req = FileTransferSendConfirmRequest {
id, id,
file_num, file_num,
union: Some(file_transfer_send_confirm_request::Union::offset_blk(0)), union: Some(file_transfer_send_confirm_request::Union::OffsetBlk(0)),
..Default::default() ..Default::default()
}; };
let digest = FileTransferDigest { let digest = FileTransferDigest {

3
src/mobile_ffi.rs
View File

@ -130,9 +130,6 @@ unsafe extern "C" fn get_by_name(name: *const c_char, arg: *const c_char) -> *co
.clone() .clone()
.to_string(); .to_string();
} }
"langs" => {
res = crate::lang::LANGS.to_string();
}
// File Action // File Action
"get_home_dir" => { "get_home_dir" => {
res = fs::get_home_as_string(); res = fs::get_home_as_string();