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

mobile virtual display, resolution menu, proxy setting (#8717)

Browse Source 
1. Merge code of mobile and desktop virtual display menu.
2. Mobile add seperate resolution menu, only support changing
   resolutions.
3. Android add proxy setting

Signed-off-by: 21pages <sunboeasy@gmail.com>
This commit is contained in:
21pages
2024-07-15 18:53:14 +08:00
committed by GitHub
parent eec879a801
commit 09466680d3
7 changed files with 297 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/ui_interface.rs
View File

@@ -415,33 +415,44 @@ pub fn install_path() -> String {
#[inline]
pub fn get_socks() -> Vec<String> {
#[cfg(any(target_os = "android", target_os = "ios"))]
return Vec::new();
#[cfg(not(any(target_os = "android", target_os = "ios")))]
{
let s = ipc::get_socks();
match s {
None => Vec::new(),
Some(s) => {
let mut v = Vec::new();
v.push(s.proxy);
v.push(s.username);
v.push(s.password);
v
}
let s = ipc::get_socks();
#[cfg(target_os = "android")]
let s = Config::get_socks();
#[cfg(target_os = "ios")]
let s: Option<config::Socks5Server> = None;
match s {
None => Vec::new(),
Some(s) => {
let mut v = Vec::new();
v.push(s.proxy);
v.push(s.username);
v.push(s.password);
v
}
}
}
#[inline]
#[cfg(not(any(target_os = "android", target_os = "ios")))]
pub fn set_socks(proxy: String, username: String, password: String) {
ipc::set_socks(config::Socks5Server {
let socks = config::Socks5Server {
proxy,
username,
password,
})
.ok();
};
#[cfg(not(any(target_os = "android", target_os = "ios")))]
ipc::set_socks(socks).ok();
#[cfg(target_os = "android")]
{
if socks.proxy.is_empty() {
Config::set_socks(None);
} else {
Config::set_socks(Some(socks));
}
crate::common::test_nat_type();
crate::RendezvousMediator::restart();
log::info!("socks updated");
}
}
#[inline]
@@ -454,9 +465,6 @@ pub fn get_proxy_status() -> bool {
return false;
}
#[cfg(any(target_os = "android", target_os = "ios"))]
pub fn set_socks(_: String, _: String, _: String) {}
#[cfg(not(any(target_os = "android", target_os = "ios")))]
#[inline]
pub fn is_installed() -> bool {