fix(aw-sync): use passed hostname directly instead of client.hostname

- Created push_with_hostname() function that accepts hostname parameter
- Updated JNI functions to use push_with_hostname() with passed hostname
- This ensures sync directory uses actual device name from Android
- Fixes issue where 'localhost' was used despite passing device name

The hostname is now passed directly from Android through JNI to the sync
functions, bypassing the client's hostname entirely.

Author: 0xbrayo

aw-sync/src/android.rs

@@ -4,7 +4,7 @@ use jni::sys::jstring;
 use aw_client_rust::blocking::AwClient;
 use serde_json::json;
 
-use crate::{pull, pull_all, push};
+use crate::{pull, pull_all, push_with_hostname};
 
 /// Helper function to convert Rust string to Java string
 fn rust_string_to_jstring(env: &JNIEnv, s: String) -> jstring {
@@ -128,7 +128,7 @@ pub extern "C" fn Java_net_activitywatch_android_SyncInterface_syncPush(
 
     let result: Result<String, String> = (|| {
         let client = get_client(port)?;
-        push(&client)
+        push_with_hostname(&client, &hostname_str)
             .map_err(|e| format!("Sync push failed: {}", e))?;
         Ok(json!({
             "success": true,
@@ -178,7 +178,7 @@ pub extern "C" fn Java_net_activitywatch_android_SyncInterface_syncBoth(
         pull_all(&client)
             .map_err(|e| format!("Pull phase failed: {}", e))?;
 
-        push(&client)
+        push_with_hostname(&client, &hostname_str)
             .map_err(|e| format!("Push phase failed: {}", e))?;
 
         Ok(json!({

aw-sync/src/lib.rs

@@ -11,7 +11,7 @@ pub use sync::sync_run;
 pub use sync::SyncSpec;
 
 mod sync_wrapper;
-pub use sync_wrapper::push;
+pub use sync_wrapper::{push, push_with_hostname};
 pub use sync_wrapper::{pull, pull_all};
 
 mod accessmethod;

aw-sync/src/sync_wrapper.rs

@@ -57,9 +57,13 @@ pub fn pull(host: &str, client: &AwClient) -> Result<(), Box<dyn Error>> {
 }
 
 pub fn push(client: &AwClient) -> Result<(), Box<dyn Error>> {
+    push_with_hostname(client, &client.hostname)
+}
+
+pub fn push_with_hostname(client: &AwClient, hostname: &str) -> Result<(), Box<dyn Error>> {
     let sync_dir = crate::dirs::get_sync_dir()
         .map_err(|_| "Could not get sync dir")?
-        .join(&client.hostname);
+        .join(hostname);
 
     let sync_spec = SyncSpec {
         path: sync_dir,