Skip to content

feat: playing around with aw-sync on android and misc #139

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

Draft
0xbrayo wants to merge 17 commits into
base: master
Choose a base branch
from
Draft

feat: playing around with aw-sync on android and misc #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
4baeba6
chore: add 'sh' to README.md
0xbrayo Jul 18, 2024
7503d15
docs: update deprecated magick command
0xbrayo Jul 18, 2024
45ec429
refactor: refactored to improve accuracy of the timeline
0xbrayo Aug 19, 2025
050a8e1
feat:use device name as hostname
0xbrayo Oct 3, 2025
5bfaa03
chore: gradle version bump and misc
0xbrayo Oct 8, 2025
70edb5b
feat(android): add SyncInterface.kt with JNI bindings for aw-sync
0xbrayo Oct 16, 2025
6095ed3
feat(android): implement automatic background sync
0xbrayo Oct 16, 2025
94faca4
build(deps): updated project dependencies, jvm target to 11, gradle t…
konrad-krol-incubly Sep 26, 2025
2f00811
feat: implemented generic web watcher with support of multiple web br…
konrad-krol-incubly Sep 26, 2025
e0af0b6
feat: always active in the background
0xbrayo Nov 24, 2025
5d420e9
chore: minimum api target bump
0xbrayo Nov 26, 2025
b2780c8
feat: experimental parsing of events in background
0xbrayo Dec 11, 2025
00b7720
fix: fix launch on boot not working
0xbrayo Dec 11, 2025
010db47
build: update makefile to package aw-sync.so
0xbrayo Dec 22, 2025
172d208
fix: fix single-instance errors on android
0xbrayo Dec 23, 2025
5f2b2ef
fix: fix doNotStrip property not working
0xbrayo Jan 2, 2026
8b6e2f0
Update mobile/src/main/java/net/activitywatch/android/watcher/WebWatc…
0xbrayo Jan 2, 2026
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 .idea/compiler.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 8 additions & 3 deletions .idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .idea/vcs.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 28 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,8 @@ export ON_ANDROID := -- --android
aw-server-rust: $(JNILIBS)

.PHONY: $(JNILIBS)
$(JNILIBS): $(JNI_arm7)/libaw_server.so $(JNI_arm8)/libaw_server.so $(JNI_x86)/libaw_server.so $(JNI_x64)/libaw_server.so
$(JNILIBS): $(JNI_arm7)/libaw_server.so $(JNI_arm8)/libaw_server.so $(JNI_x86)/libaw_server.so $(JNI_x64)/libaw_server.so \
$(JNI_arm7)/libaw_sync.so $(JNI_arm8)/libaw_sync.so $(JNI_x86)/libaw_sync.so $(JNI_x64)/libaw_sync.so
@ls -lL $@/*/* # Check that symlinks are valid

# There must be a better way to do this without repeating almost the same rule over and over?
Expand All @@ -170,6 +171,20 @@ $(JNI_x64)/libaw_server.so: $(TARGETDIR_x64)/$(RELEASE_TYPE)/libaw_server.so
mkdir -p $$(dirname $@)
if [ -z "$(TARGET)" ] || [ "$(TARGET)" == "x86_64" ]; then ln -fnv $$(pwd)/$^ $@; fi

$(JNI_arm7)/libaw_sync.so: $(TARGETDIR_arm7)/$(RELEASE_TYPE)/libaw_sync.so
mkdir -p $$(dirname $@)
# if target is empty, then create symlink
if [ -z "$(TARGET)" ] || [ "$(TARGET)" == "arm" ]; then ln -fnv $$(pwd)/$^ $@; fi
$(JNI_arm8)/libaw_sync.so: $(TARGETDIR_arm8)/$(RELEASE_TYPE)/libaw_sync.so
mkdir -p $$(dirname $@)
if [ -z "$(TARGET)" ] || [ "$(TARGET)" == "arm64" ]; then ln -fnv $$(pwd)/$^ $@; fi
$(JNI_x86)/libaw_sync.so: $(TARGETDIR_x86)/$(RELEASE_TYPE)/libaw_sync.so
mkdir -p $$(dirname $@)
if [ -z "$(TARGET)" ] || [ "$(TARGET)" == "x86" ]; then ln -fnv $$(pwd)/$^ $@; fi
$(JNI_x64)/libaw_sync.so: $(TARGETDIR_x64)/$(RELEASE_TYPE)/libaw_sync.so
mkdir -p $$(dirname $@)
if [ -z "$(TARGET)" ] || [ "$(TARGET)" == "x86_64" ]; then ln -fnv $$(pwd)/$^ $@; fi

RUSTFLAGS_ANDROID="-C debuginfo=2 -Awarnings"
# Explanation of RUSTFLAGS:
# `-Awarnings` allows all warnings, for cleaner output (warnings should be detected in aw-server-rust CI anyway)
Expand All @@ -192,6 +207,17 @@ $(RS_SRCDIR)/target/%/$(RELEASE_TYPE)/libaw_server.so: $(RS_SOURCES) $(WEBUI_DIS
env RUSTFLAGS=$(RUSTFLAGS_ANDROID) make -C aw-server-rust android; \
fi

# Same rule for libaw_sync.so (but without webui dependency)
$(RS_SRCDIR)/target/%/$(RELEASE_TYPE)/libaw_sync.so: $(RS_SOURCES)
@echo $@
@echo "Release type: $(RELEASE_TYPE)"
@if [ "$$USE_PREBUILT" == "true" ] && [ -f $@ ]; then \
echo "Using prebuilt libaw_sync.so"; \
else \
echo "Building libaw_sync.so from aw-server-rust repo"; \
env RUSTFLAGS=$(RUSTFLAGS_ANDROID) make -C aw-server-rust android; \
fi

# aw-webui
.PHONY: $(WEBUI_DISTDIR)
$(WEBUI_DISTDIR):
Expand All @@ -210,4 +236,4 @@ clean:

.PHONY: fastlane/metadata/android/en-US/images/icon.png
fastlane/metadata/android/en-US/images/icon.png: aw-server-rust/aw-webui/media/logo/logo.png
convert $< -resize 75% -gravity center -background white -extent 512x512 $@
magick $< -resize 75% -gravity center -background white -extent 512x512 $@
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ If you haven't already, initialize the submodules with: `git submodule update --

To build aw-server-rust you need to have Rust nightly installed (with rustup). Then you can build it with:

```
```sh
export ANDROID_NDK_HOME=`pwd`/aw-server-rust/NDK # The path to your NDK
pushd aw-server-rust && ./install-ndk.sh; popd # This configures the NDK for use with Rust, and installs the NDK if missing
env RELEASE=false make aw-server-rust # Set RELEASE=true to build in release mode (slower build, harder to debug)
Expand Down
2 changes: 1 addition & 1 deletion aw-server-rust
Open in desktop
Submodule aw-server-rust updated 41 files
+8 −3 .github/workflows/build.yml
+1,300 −737 Cargo.lock
+4 −1 Makefile
+8 −1 aw-client-rust/Cargo.toml
+12 −1 aw-client-rust/src/blocking.rs
+144 −0 aw-client-rust/src/classes.rs
+85 −3 aw-client-rust/src/lib.rs
+484 −0 aw-client-rust/src/queries.rs
+84 −0 aw-client-rust/src/single_instance.rs
+16 −0 aw-client-rust/tests/test.rs
+1 −1 aw-datastore/Cargo.toml
+4 −18 aw-datastore/src/datastore.rs
+5 −0 aw-models/src/lib.rs
+76 −0 aw-models/src/settings.rs
+1 −1 aw-query/Cargo.toml
+2 −3 aw-query/src/datatype.rs
+2 −5 aw-query/src/functions.rs
+2 −2 aw-server.service
+7 −5 aw-server/Cargo.toml
+6 −0 aw-server/build.rs
+2 −2 aw-server/src/android/mod.rs
+22 −22 aw-server/src/endpoints/bucket.rs
+19 −0 aw-server/src/endpoints/mod.rs
+8 −3 aw-server/src/main.rs
+18 −3 aw-sync/Cargo.toml
+70 −13 aw-sync/README.md
+248 −0 aw-sync/src/android.rs
+6 −1 aw-sync/src/dirs.rs
+4 −1 aw-sync/src/lib.rs
+176 −69 aw-sync/src/main.rs
+12 −3 aw-sync/src/sync.rs
+8 −27 aw-sync/src/sync_wrapper.rs
+1 −1 aw-sync/src/util.rs
+2 −2 aw-transform/Cargo.toml
+1 −1 aw-transform/src/chunk.rs
+1 −1 aw-transform/src/filter_period.rs
+2 −2 aw-transform/src/flood.rs
+1 −1 aw-transform/src/merge.rs
+5 −4 aw-transform/src/split_url.rs
+1 −1 aw-webui
+7 −0 compile-android.sh
10 changes: 5 additions & 5 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlin_version = '1.7.20'
ext.androidXTestVersion = '1.5.0'
ext.espressoVersion = '3.5.0'
ext.extJUnitVersion = '1.1.4'
ext.kotlin_version = '1.9.0'
ext.androidXTestVersion = '1.7.0'
ext.espressoVersion = '3.7.0'
ext.extJUnitVersion = '1.3.0'
ext.servicesVersion = '1.4.2'
repositories {
google()
Expand All @@ -14,7 +14,7 @@ buildscript {
}
}
dependencies {
classpath 'com.android.tools.build:gradle:8.1.1'
classpath 'com.android.tools.build:gradle:8.13.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'gradle.plugin.org.mozilla.rust-android-gradle:plugin:0.8.3'

Expand Down
3 changes: 3 additions & 0 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,6 @@ org.gradle.jvmargs=-Xmx1536m
kotlin.code.style=official
android.useAndroidX=true
android.enableJetifier=true

# Enable native symbol preservation for debugging
# doNotStrip=true
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
5 changes: 4 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#Fri Sep 26 14:49:59 CEST 2025
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading
Loading