remove warns
Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
parent
e194e70f1a
commit
6013725200
1
Cargo.lock
generated
1
Cargo.lock
generated
@ -5133,6 +5133,7 @@ dependencies = [
|
|||||||
"include_dir",
|
"include_dir",
|
||||||
"jni 0.19.0",
|
"jni 0.19.0",
|
||||||
"lazy_static",
|
"lazy_static",
|
||||||
|
"libloading",
|
||||||
"libpulse-binding",
|
"libpulse-binding",
|
||||||
"libpulse-simple-binding",
|
"libpulse-simple-binding",
|
||||||
"mac_address",
|
"mac_address",
|
||||||
|
@ -70,6 +70,7 @@ hex = "0.4"
|
|||||||
reqwest = { version = "0.11", features = ["blocking", "json", "rustls-tls"], default-features=false }
|
reqwest = { version = "0.11", features = ["blocking", "json", "rustls-tls"], default-features=false }
|
||||||
chrono = "0.4"
|
chrono = "0.4"
|
||||||
cidr-utils = "0.5"
|
cidr-utils = "0.5"
|
||||||
|
libloading = "0.7"
|
||||||
|
|
||||||
[target.'cfg(not(any(target_os = "android", target_os = "linux")))'.dependencies]
|
[target.'cfg(not(any(target_os = "android", target_os = "linux")))'.dependencies]
|
||||||
cpal = "0.15"
|
cpal = "0.15"
|
||||||
|
@ -53,9 +53,7 @@ use scrap::{
|
|||||||
ImageFormat,
|
ImageFormat,
|
||||||
};
|
};
|
||||||
|
|
||||||
use crate::{
|
use crate::common::{self, is_keyboard_mode_supported};
|
||||||
common::{self, is_keyboard_mode_supported},
|
|
||||||
};
|
|
||||||
|
|
||||||
#[cfg(not(any(target_os = "android", target_os = "ios")))]
|
#[cfg(not(any(target_os = "android", target_os = "ios")))]
|
||||||
use crate::common::{check_clipboard, ClipboardContext, CLIPBOARD_INTERVAL};
|
use crate::common::{check_clipboard, ClipboardContext, CLIPBOARD_INTERVAL};
|
||||||
@ -73,6 +71,8 @@ pub const MILLI1: Duration = Duration::from_millis(1);
|
|||||||
pub const SEC30: Duration = Duration::from_secs(30);
|
pub const SEC30: Duration = Duration::from_secs(30);
|
||||||
pub const VIDEO_QUEUE_SIZE: usize = 120;
|
pub const VIDEO_QUEUE_SIZE: usize = 120;
|
||||||
|
|
||||||
|
#[cfg(all(target_os = "linux", feature = "linux_headless"))]
|
||||||
|
#[cfg(not(any(feature = "flatpak", feature = "appimage")))]
|
||||||
pub const LOGIN_MSG_DESKTOP_NOT_INITED: &str = "Desktop env is not inited";
|
pub const LOGIN_MSG_DESKTOP_NOT_INITED: &str = "Desktop env is not inited";
|
||||||
pub const LOGIN_MSG_DESKTOP_SESSION_NOT_READY: &str = "Desktop session not ready";
|
pub const LOGIN_MSG_DESKTOP_SESSION_NOT_READY: &str = "Desktop session not ready";
|
||||||
pub const LOGIN_MSG_DESKTOP_XSESSION_FAILED: &str = "Desktop xsession failed";
|
pub const LOGIN_MSG_DESKTOP_XSESSION_FAILED: &str = "Desktop xsession failed";
|
||||||
@ -88,7 +88,9 @@ pub const LOGIN_MSG_PASSWORD_EMPTY: &str = "Empty Password";
|
|||||||
pub const LOGIN_MSG_PASSWORD_WRONG: &str = "Wrong Password";
|
pub const LOGIN_MSG_PASSWORD_WRONG: &str = "Wrong Password";
|
||||||
pub const LOGIN_MSG_NO_PASSWORD_ACCESS: &str = "No Password Access";
|
pub const LOGIN_MSG_NO_PASSWORD_ACCESS: &str = "No Password Access";
|
||||||
pub const LOGIN_MSG_OFFLINE: &str = "Offline";
|
pub const LOGIN_MSG_OFFLINE: &str = "Offline";
|
||||||
|
#[cfg(target_os = "linux")]
|
||||||
pub const SCRAP_UBUNTU_HIGHER_REQUIRED: &str = "Wayland requires Ubuntu 21.04 or higher version.";
|
pub const SCRAP_UBUNTU_HIGHER_REQUIRED: &str = "Wayland requires Ubuntu 21.04 or higher version.";
|
||||||
|
#[cfg(target_os = "linux")]
|
||||||
pub const SCRAP_OTHER_VERSION_OR_X11_REQUIRED: &str =
|
pub const SCRAP_OTHER_VERSION_OR_X11_REQUIRED: &str =
|
||||||
"Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.";
|
"Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.";
|
||||||
pub const SCRAP_X11_REQUIRED: &str = "x11 expected";
|
pub const SCRAP_X11_REQUIRED: &str = "x11 expected";
|
||||||
|
@ -362,7 +362,10 @@ impl<T: InvokeUiSession> Remote<T> {
|
|||||||
});
|
});
|
||||||
return Some(tx);
|
return Some(tx);
|
||||||
}
|
}
|
||||||
None
|
#[cfg(target_os = "ios")]
|
||||||
|
{
|
||||||
|
None
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn handle_msg_from_ui(&mut self, data: Data, peer: &mut Stream) -> bool {
|
async fn handle_msg_from_ui(&mut self, data: Data, peer: &mut Stream) -> bool {
|
||||||
|
@ -48,7 +48,6 @@ mod license;
|
|||||||
#[cfg(not(any(target_os = "android", target_os = "ios")))]
|
#[cfg(not(any(target_os = "android", target_os = "ios")))]
|
||||||
mod port_forward;
|
mod port_forward;
|
||||||
|
|
||||||
#[cfg(all(feature = "flutter", feature = "plugin_framework"))]
|
|
||||||
#[cfg(not(any(target_os = "android", target_os = "ios")))]
|
#[cfg(not(any(target_os = "android", target_os = "ios")))]
|
||||||
#[cfg(any(feature = "flutter"))]
|
#[cfg(any(feature = "flutter"))]
|
||||||
pub mod api;
|
pub mod api;
|
||||||
@ -56,6 +55,10 @@ pub mod api;
|
|||||||
#[cfg(any(feature = "flutter"))]
|
#[cfg(any(feature = "flutter"))]
|
||||||
pub mod plugins;
|
pub mod plugins;
|
||||||
|
|
||||||
|
#[cfg(all(feature = "flutter", feature = "plugin_framework"))]
|
||||||
|
#[cfg(not(any(target_os = "android", target_os = "ios")))]
|
||||||
|
pub mod plugin;
|
||||||
|
|
||||||
mod tray;
|
mod tray;
|
||||||
|
|
||||||
mod ui_cm_interface;
|
mod ui_cm_interface;
|
||||||
|
@ -14,10 +14,12 @@ use rdev::{Event, EventType::*, KeyCode};
|
|||||||
use uuid::Uuid;
|
use uuid::Uuid;
|
||||||
|
|
||||||
use hbb_common::config::{Config, LocalConfig, PeerConfig};
|
use hbb_common::config::{Config, LocalConfig, PeerConfig};
|
||||||
|
#[cfg(not(feature = "flutter"))]
|
||||||
|
use hbb_common::fs;
|
||||||
use hbb_common::rendezvous_proto::ConnType;
|
use hbb_common::rendezvous_proto::ConnType;
|
||||||
use hbb_common::tokio::{self, sync::mpsc};
|
use hbb_common::tokio::{self, sync::mpsc};
|
||||||
use hbb_common::{allow_err, message_proto::*};
|
use hbb_common::{allow_err, message_proto::*};
|
||||||
use hbb_common::{fs, get_version_number, log, Stream};
|
use hbb_common::{get_version_number, log, Stream};
|
||||||
|
|
||||||
use crate::client::io_loop::Remote;
|
use crate::client::io_loop::Remote;
|
||||||
use crate::client::{
|
use crate::client::{
|
||||||
@ -25,7 +27,7 @@ use crate::client::{
|
|||||||
input_os_password, load_config, send_mouse, start_video_audio_threads, FileManager, Key,
|
input_os_password, load_config, send_mouse, start_video_audio_threads, FileManager, Key,
|
||||||
LoginConfigHandler, QualityStatus, KEY_MAP,
|
LoginConfigHandler, QualityStatus, KEY_MAP,
|
||||||
};
|
};
|
||||||
use crate::common::{self, GrabState};
|
use crate::common::GrabState;
|
||||||
use crate::keyboard;
|
use crate::keyboard;
|
||||||
use crate::{client::Data, client::Interface};
|
use crate::{client::Data, client::Interface};
|
||||||
|
|
||||||
@ -155,6 +157,7 @@ impl<T: InvokeUiSession> Session<T> {
|
|||||||
self.lc.read().unwrap().get_toggle_option(&name)
|
self.lc.read().unwrap().get_toggle_option(&name)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(not(feature = "flutter"))]
|
||||||
pub fn is_privacy_mode_supported(&self) -> bool {
|
pub fn is_privacy_mode_supported(&self) -> bool {
|
||||||
self.lc.read().unwrap().is_privacy_mode_supported()
|
self.lc.read().unwrap().is_privacy_mode_supported()
|
||||||
}
|
}
|
||||||
@ -198,6 +201,7 @@ impl<T: InvokeUiSession> Session<T> {
|
|||||||
self.lc.read().unwrap().remember
|
self.lc.read().unwrap().remember
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(not(feature = "flutter"))]
|
||||||
pub fn set_write_override(
|
pub fn set_write_override(
|
||||||
&mut self,
|
&mut self,
|
||||||
job_id: i32,
|
job_id: i32,
|
||||||
@ -240,6 +244,8 @@ impl<T: InvokeUiSession> Session<T> {
|
|||||||
self.send(Data::Message(msg));
|
self.send(Data::Message(msg));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(all(feature = "flutter", feature = "plugin_framework"))]
|
||||||
|
#[cfg(not(any(target_os = "android", target_os = "ios")))]
|
||||||
pub fn send_plugin(&self, plugin: Plugin) {
|
pub fn send_plugin(&self, plugin: Plugin) {
|
||||||
let mut misc = Misc::new();
|
let mut misc = Misc::new();
|
||||||
misc.set_plugin(plugin);
|
misc.set_plugin(plugin);
|
||||||
@ -270,6 +276,8 @@ impl<T: InvokeUiSession> Session<T> {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(not(feature = "flutter"))]
|
||||||
|
#[cfg(not(any(target_os = "android", target_os = "ios")))]
|
||||||
pub fn is_xfce(&self) -> bool {
|
pub fn is_xfce(&self) -> bool {
|
||||||
#[cfg(not(any(target_os = "ios")))]
|
#[cfg(not(any(target_os = "ios")))]
|
||||||
return crate::platform::is_xfce();
|
return crate::platform::is_xfce();
|
||||||
@ -277,11 +285,6 @@ impl<T: InvokeUiSession> Session<T> {
|
|||||||
false
|
false
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn get_supported_keyboard_modes(&self) -> Vec<KeyboardMode> {
|
|
||||||
let version = self.get_peer_version();
|
|
||||||
common::get_supported_keyboard_modes(version)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn remove_port_forward(&self, port: i32) {
|
pub fn remove_port_forward(&self, port: i32) {
|
||||||
let mut config = self.load_config();
|
let mut config = self.load_config();
|
||||||
config.port_forwards = config
|
config.port_forwards = config
|
||||||
@ -310,6 +313,7 @@ impl<T: InvokeUiSession> Session<T> {
|
|||||||
self.send(Data::AddPortForward(pf));
|
self.send(Data::AddPortForward(pf));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(not(feature = "flutter"))]
|
||||||
pub fn get_id(&self) -> String {
|
pub fn get_id(&self) -> String {
|
||||||
self.id.clone()
|
self.id.clone()
|
||||||
}
|
}
|
||||||
@ -369,6 +373,7 @@ impl<T: InvokeUiSession> Session<T> {
|
|||||||
input_os_password(pass, activate, self.clone());
|
input_os_password(pass, activate, self.clone());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(not(feature = "flutter"))]
|
||||||
pub fn get_chatbox(&self) -> String {
|
pub fn get_chatbox(&self) -> String {
|
||||||
#[cfg(feature = "inline")]
|
#[cfg(feature = "inline")]
|
||||||
return crate::ui::inline::get_chatbox();
|
return crate::ui::inline::get_chatbox();
|
||||||
@ -545,7 +550,8 @@ impl<T: InvokeUiSession> Session<T> {
|
|||||||
position_code: i32,
|
position_code: i32,
|
||||||
lock_modes: i32,
|
lock_modes: i32,
|
||||||
down_or_up: bool,
|
down_or_up: bool,
|
||||||
) {}
|
) {
|
||||||
|
}
|
||||||
|
|
||||||
#[cfg(not(any(target_os = "ios")))]
|
#[cfg(not(any(target_os = "ios")))]
|
||||||
pub fn handle_flutter_key_event(
|
pub fn handle_flutter_key_event(
|
||||||
@ -675,6 +681,7 @@ impl<T: InvokeUiSession> Session<T> {
|
|||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(not(feature = "flutter"))]
|
||||||
pub fn get_icon_path(&self, file_type: i32, ext: String) -> String {
|
pub fn get_icon_path(&self, file_type: i32, ext: String) -> String {
|
||||||
let mut path = Config::icon_path();
|
let mut path = Config::icon_path();
|
||||||
if file_type == FileType::DirLink as i32 {
|
if file_type == FileType::DirLink as i32 {
|
||||||
|
Loading…
Reference in New Issue
Block a user