From f284213a3bf4cf60f9d64bd609c4462d4c980755 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Bj=C3=A4reholt?= <erik@bjareho.lt>
Date: Sun, 24 Sep 2023 18:10:14 +0200
Subject: [PATCH] fix(android): removed use of asset_path in favor of
 asset_resolver

---
 aw-server/src/android/mod.rs | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/aw-server/src/android/mod.rs b/aw-server/src/android/mod.rs
index 36d88dd5..3ab41fc3 100644
--- a/aw-server/src/android/mod.rs
+++ b/aw-server/src/android/mod.rs
@@ -98,22 +98,13 @@ 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,
     ) {
         info!("Starting server...");
-
-        *ASSET_PATH.lock().unwrap() = jstring_to_string(&env, java_asset_path);
-
         start_server();
-
         info!("Server exited");
     }
 
@@ -125,12 +116,11 @@ pub mod android {
         unsafe {
             let server_state: ServerState = endpoints::ServerState {
                 datastore: Mutex::new(openDatastore()),
-                asset_path: PathBuf::from(ASSET_PATH.lock().unwrap().to_owned()),
+                asset_resolver: endpoints::AssetResolver::new(None),
                 device_id: device_id::get_device_id(),
             };
             info!(
-                "Using server_state:: asset dir: {}; device_id: {}",
-                server_state.asset_path.display(),
+                "Using server_state:: device_id: {}",
                 server_state.device_id
             );