feat: aw-sync android support

aw-server/Cargo.toml

@@ -46,3 +46,4 @@ jni = { version = "0.20", default-features = false }
 libc = "0.2"
 android_logger = "0.13"
 openssl-sys = { version = "0.9.82", features = ["vendored"]}
+aw-client-rust = { path = "../aw-client-rust" }

aw-server/src/android/mod.rs

@@ -41,8 +41,12 @@ pub mod android {
     use crate::config::AWConfig;
     use crate::endpoints;
     use crate::endpoints::ServerState;
+    use aw_client_rust::classes::default_classes;
+    use aw_client_rust::queries::{
+        build_android_canonical_events, AndroidQueryParams, QueryParamsBase,
+    };
     use aw_datastore::Datastore;
-    use aw_models::{Bucket, Event};
+    use aw_models::{Bucket, Event, TimeInterval};
 
     static mut DATASTORE: Option<Datastore> = None;
 
@@ -243,4 +247,91 @@ pub mod android {
             ),
         }
     }
+
+    #[no_mangle]
+    pub unsafe extern "C" fn Java_net_activitywatch_android_RustInterface_query(
+        env: JNIEnv,
+        _: JClass,
+        java_query: JString,
+        java_timeperiods: JString,
+    ) -> jstring {
+        let query_code = jstring_to_string(&env, java_query);
+        let timeperiods_str = jstring_to_string(&env, java_timeperiods);
+        let timeperiods: Vec<TimeInterval> = match serde_json::from_str(&timeperiods_str) {
+            Ok(json) => json,
+            Err(err) => return create_error_object(&env, err.to_string()),
+        };
+
+        let datastore = openDatastore();
+        let mut results = Vec::new();
+
+        for interval in &timeperiods {
+            let result = match aw_query::query(&query_code, interval, &datastore) {
+                Ok(data) => data,
+                Err(e) => {
+                    return create_error_object(
+                        &env,
+                        format!("Something went wrong when trying to query: {:?}", e),
+                    )
+                }
+            };
+            results.push(result);
+        }
+
+        string_to_jstring(&env, json!(results).to_string())
+    }
+
+    #[no_mangle]
+    pub unsafe extern "C" fn Java_net_activitywatch_android_RustInterface_androidQuery(
+        env: JNIEnv,
+        _: JClass,
+        java_timeperiods: JString,
+    ) -> jstring {
+        let timeperiods_str = jstring_to_string(&env, java_timeperiods);
+
+        let timeperiods: Vec<TimeInterval> = match serde_json::from_str(&timeperiods_str) {
+            Ok(json) => json,
+            Err(err) => return create_error_object(&env, err.to_string()),
+        };
+
+        // Hardcoded bucket ID for testing
+        let bid_android = "aw-watcher-android-test".to_string();
+
+        // Build canonical Android query
+        let params = AndroidQueryParams {
+            base: QueryParamsBase {
+                bid_browsers: Vec::new(),
+                classes: default_classes(),
+                filter_classes: Vec::new(),
+                filter_afk: true,
+                include_audible: true,
+            },
+            bid_android,
+        };
+        let query_code = format!(
+            r#"{}
+duration = sum_durations(events);
+cat_events = sort_by_duration(merge_events_by_keys(events, ["$category"]));
+RETURN = {{"events": events, "duration": duration, "cat_events": cat_events}};"#,
+            build_android_canonical_events(&params)
+        );
+
+        let datastore = openDatastore();
+        let mut results = Vec::new();
+
+        for interval in &timeperiods {
+            let result = match aw_query::query(&query_code, interval, &datastore) {
+                Ok(data) => data,
+                Err(e) => {
+                    return create_error_object(
+                        &env,
+                        format!("Something went wrong when trying to query: {:?}", e),
+                    )
+                }
+            };
+            results.push(result);
+        }
+
+        string_to_jstring(&env, json!(results).to_string())
+    }
 }

aw-sync/Cargo.toml

@@ -7,6 +7,7 @@ edition = "2021"
 [lib]
 name = "aw_sync"
 path = "src/lib.rs"
+crate-type = ["cdylib", "rlib"]
 
 [[bin]]
 name = "aw-sync"
@@ -19,11 +20,13 @@ chrono = { version = "0.4", features = ["serde"] }
 serde = "1.0"
 serde_json = "1.0"
 reqwest = { version = "0.11", features = ["json", "blocking"] }
-clap = { version = "4.1", features = ["derive"] }
 appdirs = "0.2.0"
 dirs = "6.0.0"
 gethostname = "0.4.3"
-ctrlc = "3.4.5"
+
+# CLI-only dependencies (optional)
+clap = { version = "4.1", features = ["derive"], optional = true }
+ctrlc = { version = "3.4.5", optional = true }
 
 aw-server = { path = "../aw-server" }
 aw-models = { path = "../aw-models" }
@@ -32,3 +35,10 @@ aw-client-rust = { path = "../aw-client-rust" }
 
 [target.'cfg(target_os="linux")'.dependencies]
 openssl = { version = "0.10.64", features = ["vendored"] }  # https://github.com/ActivityWatch/aw-server-rust/issues/478
+
+[target.'cfg(target_os="android")'.dependencies]
+jni = { version = "0.21", default-features = false }
+
+[features]
+default = ["cli"]
+cli = ["clap", "ctrlc"]