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

load android custom client for jvm startServer

Browse Source
This commit is contained in:
rustdesk 2024-04-16 21:46:54 +08:00
parent b9792fc17d
commit 01ec539065
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flutter/android/app/src/main/kotlin/com/carriez/flutter_hbb/MainService.kt
View File

@ -207,7 +207,7 @@ class MainService : Service() {
// keep the config dir same with flutter // keep the config dir same with flutter
val prefs = applicationContext.getSharedPreferences(KEY_SHARED_PREFERENCES, FlutterActivity.MODE_PRIVATE) val prefs = applicationContext.getSharedPreferences(KEY_SHARED_PREFERENCES, FlutterActivity.MODE_PRIVATE)
val configPath = prefs.getString(KEY_APP_DIR_CONFIG_PATH, "") ?: "" val configPath = prefs.getString(KEY_APP_DIR_CONFIG_PATH, "") ?: ""
FFI.startServer(configPath) FFI.startServer(configPath, "")
createForegroundNotification() createForegroundNotification()
} }

4
flutter/lib/models/native_model.dart
View File

@ -198,9 +198,7 @@ class PlatformFFI {
await _ffiBind.mainDeviceId(id: id); await _ffiBind.mainDeviceId(id: id);
await _ffiBind.mainDeviceName(name: name); await _ffiBind.mainDeviceName(name: name);
await _ffiBind.mainSetHomeDir(home: _homeDir); await _ffiBind.mainSetHomeDir(home: _homeDir);
final customClientConfig = ''; await _ffiBind.mainInit(appDir: _dir, customClientConfig: '');
await _ffiBind.mainInit(
appDir: _dir, customClientConfig: customClientConfig);
} catch (e) { } catch (e) {
debugPrintStack(label: 'initialize failed: $e'); debugPrintStack(label: 'initialize failed: $e');
} }

4
src/flutter_ffi.rs
View File

@ -2116,12 +2116,16 @@ pub mod server_side {
env: JNIEnv, env: JNIEnv,
_class: JClass, _class: JClass,
app_dir: JString, app_dir: JString,
custom_client_config: JString,
) { ) {
log::debug!("startServer from jvm"); log::debug!("startServer from jvm");
let mut env = env; let mut env = env;
if let Ok(app_dir) = env.get_string(&app_dir) { if let Ok(app_dir) = env.get_string(&app_dir) {
*config::APP_DIR.write().unwrap() = app_dir.into(); *config::APP_DIR.write().unwrap() = app_dir.into();
} }
if let Ok(custom_client_config) = env.get_string(&custom_client_config) {
crate::read_custom_client(custom_client_config);
}
std::thread::spawn(move || start_server(true)); std::thread::spawn(move || start_server(true));
} }