Skip to content

fix(sync): pick up aw-server-rust API-key JNI client and set data dir #249

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
ErikBjare merged 1 commit into from
Aug 31, 2026
Merged

fix(sync): pick up aw-server-rust API-key JNI client and set data dir #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion aw-server-rust
Open in desktop
Submodule aw-server-rust updated 14 files
+65 −2 Cargo.lock
+104 −27 aw-datastore/src/datastore.rs
+4 −0 aw-datastore/src/worker.rs
+165 −0 aw-datastore/tests/datastore.rs
+4 −0 aw-server/src/android/mod.rs
+30 −0 aw-server/src/endpoints/bucket.rs
+83 −0 aw-server/tests/api.rs
+1 −0 aw-sync/Cargo.toml
+169 −3 aw-sync/src/android.rs
+51 −1 aw-sync/src/dirs.rs
+25 −3 aw-sync/src/util.rs
+17 −5 aw-sync/tests/sync_roundtrip.rs
+87 −16 aw-transform/src/classify.rs
+1 −1 aw-webui
7 changes: 6 additions & 1 deletion mobile/src/main/java/net/activitywatch/android/SyncInterface.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,12 @@ class SyncInterface(context: Context) {
Os.setenv("XDG_CACHE_HOME", cacheDir, true)
Os.setenv("XDG_CONFIG_HOME", "$filesDir/config", true)
Os.setenv("XDG_DATA_HOME", "$filesDir/data", true)

System.loadLibrary("aw_sync")
// libaw_sync.so has its own ANDROID_DATA_DIR static; RustInterface.setDataDir
// only updates libaw_server.so. Point this copy at filesDir so sync reads
// the same config.toml as the embedded server (ActivityWatch/aw-server-rust#666).
setDataDir(filesDir)
Log.i(TAG, "aw-sync initialized with sync dir: $syncDir")
}

Expand All @@ -72,6 +76,7 @@ class SyncInterface(context: Context) {
}

// Native JNI functions
private external fun setDataDir(path: String)
private external fun syncPullAll(port: Int, hostname: String): String
private external fun syncPull(port: Int, hostname: String): String
private external fun syncPush(port: Int, hostname: String): String
Expand Down
Loading