weyne/rustdesk
1
0
Fork 0
mirror of https://github.com/weyne85/rustdesk.git synced 2025-10-29 17:00:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4343 from 21pages/fix

Browse Source 
fix android build
This commit is contained in:
RustDesk
2023-05-12 14:41:48 +08:00
committed by GitHub
parent db2735dfdb 5738f3a949
commit 744097a562
3 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/client.rs
View File

@@ -754,6 +754,7 @@ pub struct AudioHandler {
#[cfg(not(any(target_os = "android", target_os = "linux")))]
audio_stream: Option<Box<dyn StreamTrait>>,
channels: u16,
#[cfg(not(any(target_os = "android", target_os = "linux")))]
device_channel: u16,
#[cfg(not(any(target_os = "android", target_os = "linux")))]
ready: Arc<std::sync::Mutex<bool>>,

11
src/flutter_ffi.rs
View File

@@ -35,7 +35,7 @@ fn initialize(app_dir: &str) {
{
android_logger::init_once(
android_logger::Config::default()
.with_min_level(log::Level::Debug) // limit log level
.with_max_level(log::LevelFilter::Debug) // limit log level
.with_tag("ffi"), // logs will show under mytag tag
);
#[cfg(feature = "mediacodec")]
@@ -1607,7 +1607,8 @@ pub mod server_side {
app_dir: JString,
) {
log::debug!("startServer from jvm");
if let Ok(app_dir) = env.get_string(app_dir) {
let mut env = env;
if let Ok(app_dir) = env.get_string(&app_dir) {
*config::APP_DIR.write().unwrap() = app_dir.into();
}
std::thread::spawn(move || start_server(true));
@@ -1630,14 +1631,16 @@ pub mod server_side {
locale: JString,
input: JString,
) -> jstring {
let res = if let (Ok(input), Ok(locale)) = (env.get_string(input), env.get_string(locale)) {
let mut env = env;
let res = if let (Ok(input), Ok(locale)) = (env.get_string(&input), env.get_string(&locale))
{
let input: String = input.into();
let locale: String = locale.into();
crate::client::translate_locale(input, &locale)
} else {
"".into()
};
return env.new_string(res).unwrap_or(input).into_inner();
return env.new_string(res).unwrap_or(input).into_raw();
}
#[no_mangle]