Skip to content

fix: several android fixes #323

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Nov 24, 2022
Merged

fix: several android fixes #323

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fcfa2dc
fix: pulling aw-android to current master
ShootingKing-AM Nov 5, 2022
e05098a
linting changes
ShootingKing-AM Nov 5, 2022
1ba9729
made more code safe
ShootingKing-AM Nov 7, 2022
b7adc5d
Apply suggestions from code review
ErikBjare Nov 8, 2022
5728ffc
fix unused imports and impl simple mutex as suggested
ShootingKing-AM Nov 13, 2022
f4a5962
Update mod.rs
ShootingKing-AM Nov 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 41 additions & 17 deletions aw-server/src/android/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,13 @@ pub mod android {
use self::jni::sys::{jdouble, jint, jstring};
use self::jni::JNIEnv;
use super::*;

use std::path::PathBuf;
use std::sync::Mutex;

use crate::config::AWConfig;
use crate::endpoints;
use crate::endpoints::ServerState;
use aw_datastore::Datastore;
use aw_models::{Bucket, Event};

Expand Down Expand Up @@ -93,33 +100,49 @@ pub mod android {
string_to_jstring(&env, obj.to_string())
}

lazy_static! {
static ref ASSET_PATH: Mutex<String> = Mutex::new(String::new());
}

#[no_mangle]
pub unsafe extern "C" fn Java_net_activitywatch_android_RustInterface_startServer(
env: JNIEnv,
_: JClass,
java_asset_path: JString,
) {
use crate::config::AWConfig;
use std::path::PathBuf;
info!("Starting server...");

*ASSET_PATH.lock().unwrap() = jstring_to_string(&env, java_asset_path);

start_server();

use crate::endpoints;
info!("Server exited");
}

#[rocket::main]
async fn start_server() {
info!("Building server state...");

let asset_path = jstring_to_string(&env, java_asset_path);
info!("Using asset dir: {}", asset_path);
// FIXME: Why is unsafe needed here? Can we get rid of it?
unsafe {
let server_state: ServerState = endpoints::ServerState {
datastore: Mutex::new(openDatastore()),
asset_path: PathBuf::from(ASSET_PATH.lock().unwrap().to_owned()),
device_id: device_id::get_device_id(),
};
info!(
"Using server_state:: asset dir: {}; device_id: {}",
server_state.asset_path.display(),
server_state.device_id
);

let server_state = endpoints::ServerState {
datastore: Mutex::new(openDatastore()),
asset_path: PathBuf::from(asset_path),
device_id: device_id::get_device_id(),
};
let mut server_config: AWConfig = AWConfig::default();
server_config.port = 5600;

let mut config = AWConfig::default();
config.port = 5600;
info!("Starting server...");
endpoints::build_rocket(server_state, config).launch();
info!("Server exited");
endpoints::build_rocket(server_state, server_config)
.launch()
.await;
}
}

static mut INITIALIZED: bool = false;
Expand Down Expand Up @@ -157,8 +180,9 @@ pub mod android {
_: JClass,
java_dir: JString,
) {
debug!("Setting android data dir");
dirs::set_android_data_dir(&jstring_to_string(&env, java_dir));
let path = &jstring_to_string(&env, java_dir);
debug!("Setting android data dir as {}", path);
dirs::set_android_data_dir(path);
}

#[no_mangle]
Expand Down