Skip to content

fix(android): update JNI androidQuery bucket name to aw-watcher-android#632

Open
0xbrayo wants to merge 1 commit into
ActivityWatch:masterfrom
0xbrayo:fix-android-query-bucket
Open

fix(android): update JNI androidQuery bucket name to aw-watcher-android#632
0xbrayo wants to merge 1 commit into
ActivityWatch:masterfrom
0xbrayo:fix-android-query-bucket

Conversation

@0xbrayo

@0xbrayo 0xbrayo commented Jul 14, 2026

Copy link
Copy Markdown
Member

Closes ActivityWatch/aw-android#191

This fixes an issue introduced in #628 where the legacy '-test' suffix was dropped from buckets but not from the query.

…ucket name

This fixes an issue introduced in ActivityWatch#628 where the legacy '-test' suffix was dropped from buckets but not from the query.
@greptile-apps

greptile-apps Bot commented Jul 14, 2026

Copy link
Copy Markdown

Greptile Summary

This PR updates the Android JNI query bucket name. The main change is:

  • androidQuery now queries aw-watcher-android instead of aw-watcher-android-test.

Confidence Score: 4/5

The Android query path can fail for existing users until the separate bucket migration has run.

  • The new bucket prefix matches migrated watcher buckets.
  • Datastores that still only contain aw-watcher-android-test... buckets no longer match this query.
  • The function has no fallback or local migration before building the query.

aw-server/src/android/mod.rs

Important Files Changed

Filename Overview
aw-server/src/android/mod.rs Updates the hardcoded bucket prefix used by the Android JNI query path.

Reviews (1): Last reviewed commit: "fix(android): update JNI androidQuery to..." | Re-trigger Greptile

// Hardcoded bucket ID for testing
let bid_android = "aw-watcher-android-test".to_string();
// Hardcoded bucket ID
let bid_android = "aw-watcher-android".to_string();

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Unmigrated Buckets Stop Querying

When androidQuery runs before migrateWatcherAndroidBucketNames has renamed existing aw-watcher-android-test... buckets, the new aw-watcher-android filter no longer matches the only stored Android watcher bucket. That makes the JNI query return an error JSON instead of the user's events until the separate migration entry point has run successfully.

@0xbrayo 0xbrayo changed the title fix(android): update JNI androidQuery to use new aw-watcher-android b… fix(android): update JNI androidQuery bucket name to aw-watcher-android Jul 14, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Widget not displaying data.

1 participant