Skip to content

fix(android): return an error object from getBuckets instead of panicking #680

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
Sep 14, 2026
Merged

fix(android): return an error object from getBuckets instead of panicking #680

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
10 changes: 8 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 @@ -195,8 +195,14 @@ pub mod android {
env: JNIEnv,
_: JClass,
) -> jstring {
let buckets = openDatastore().get_buckets().unwrap();
string_to_jstring(&env, json!(buckets).to_string())
// Return an error object instead of unwrapping: if the datastore worker
// is gone (it panicked, e.g. the database could not be opened), the
// request fails with SendError/RecvError and a panic here unwinds across
// the JNI boundary on whatever thread called getBuckets — usually main.
match openDatastore().get_buckets() {
Ok(buckets) => string_to_jstring(&env, json!(buckets).to_string()),
Err(e) => create_error_object(&env, format!("Failed to get buckets: {e:?}")),
}
}

#[no_mangle]
Expand Down
Loading