Skip to content

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

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 2 commits into from
Jul 18, 2026
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d81b36
fix(android): update JNI androidQuery to use new aw-watcher-android b…
0xbrayo Jul 14, 2026
626a555
fix(query): prefer exact match in find_bucket to prevent incorrect bu…
0xbrayo Jul 18, 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
4 changes: 2 additions & 2 deletions aw-server/src/android/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,8 +343,8 @@ pub mod android {
Err(err) => return create_error_object(&env, err.to_string()),
};

// 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();

@greptile-apps greptile-apps Bot Jul 14, 2026

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.


// Get classes from server settings via HTTP API
let classes = match AwClient::new("127.0.0.1", 5600, "aw-android-query") {
Expand Down
19 changes: 14 additions & 5 deletions aw-transform/src/find_bucket.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,27 @@ pub fn find_bucket<'a>(
hostname_filter: &Option<String>,
buckets: impl IntoIterator<Item = &'a Bucket>,
) -> Option<String> {
let mut prefix_match = None;
for bucket in buckets {
if bucket.id.starts_with(bucket_filter) {
if let Some(hostname) = hostname_filter {
if hostname == &bucket.hostname {
let hostname_matches = match hostname_filter {
Some(hostname) => hostname == &bucket.hostname,
None => true,
};

if hostname_matches {
if bucket.id == bucket_filter {
// Exact match, return immediately
return Some(bucket.id.to_string());
}
} else {
return Some(bucket.id.to_string());
if prefix_match.is_none() {
// Save the first prefix match in case we don't find an exact match
prefix_match = Some(bucket.id.to_string());
}
}
}
}
None
prefix_match
}

#[cfg(test)]
Expand Down
Loading