ActivityWatch · 0xbrayo · Jul 18, 2024 · Jul 18, 2024 · Aug 19, 2025 · Oct 3, 2025
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/Makefile b/Makefile
@@ -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?
@@ -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)
@@ -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):
@@ -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 $@
diff --git a/README.md b/README.md
@@ -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)

diff --git a/android.jks.age b/android.jks.age
diff --git a/aw-server-rust b/aw-server-rust
diff --git a/build.gradle b/build.gradle
@@ -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()
@@ -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'
 

diff --git a/fastlane/metadata/android/en-US/images/icon.png b/fastlane/metadata/android/en-US/images/icon.png
diff --git a/gradle.properties b/gradle.properties
@@ -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
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -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
+8 −3		.github/workflows/build.yml
+2 −5		.github/workflows/lint.yml
+25 −0		.pre-commit-config.yaml
+1,290 −814		Cargo.lock
+4 −1		Makefile
+37 −0		README.md
+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
+2 −2		aw-datastore/Cargo.toml
+28 −26		aw-datastore/src/datastore.rs
+5 −5		aw-datastore/src/legacy_import.rs
+17 −2		aw-datastore/src/worker.rs
+41 −4		aw-datastore/tests/datastore.rs
+5 −0		aw-models/src/lib.rs
+76 −0		aw-models/src/settings.rs
+1 −1		aw-query/Cargo.toml
+0 −1		aw-query/src/datatype.rs
+0 −3		aw-query/src/functions.rs
+2 −2		aw-server.service
+9 −6		aw-server/Cargo.toml
+6 −0		aw-server/build.rs
+144 −3		aw-server/src/android/mod.rs
+4 −0		aw-server/src/config.rs
+78 −12		aw-server/src/dirs.rs
+21 −21		aw-server/src/endpoints/bucket.rs
+1 −0		aw-server/src/endpoints/cors.rs
+19 −0		aw-server/src/endpoints/mod.rs
+0 −3		aw-server/src/lib.rs
+7 −2		aw-server/src/main.rs
+2 −1		aw-server/tests/api.rs
+18 −4		aw-sync/Cargo.toml
+70 −13		aw-sync/README.md
+241 −0		aw-sync/src/android.rs
+11 −5		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
+35 −5		aw-transform/src/split_url.rs
+1 −1		aw-webui
+9 −0		compile-android.sh