Skip to content

fix(migration): handle plain-text success response from migrateHostname JNI #172

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

Open
TimeToBuildBob wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix(migration): handle plain-text success response from migrateHostname JNI #172

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
532da7e
fix(migration): handle plain-text success response from migrateHostna…
TimeToBuildBob Jul 3, 2026
ad07391
fix(migration): use raw result as fallback in error log
TimeToBuildBob Jul 3, 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
22 changes: 13 additions & 9 deletions mobile/src/main/java/net/activitywatch/android/BackgroundService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,19 +64,23 @@ class BackgroundService : Service() {
val hostname = rustInterface.getDeviceName(this@BackgroundService)
val result = rustInterface.migrateHostname(hostname)
Log.i(TAG, "Hostname migration result: $result")
// Conservative defaults: treat ambiguous responses (non-JSON or absent "success" key)
// as failures so the migration is retried on the next start rather than being
// permanently silenced before the server was actually ready.
val migrationSucceeded = try {
JSONObject(result).optBoolean("success", false)
} catch (e: JSONException) {
Log.w(TAG, "Migration result was not valid JSON; will retry on next start")
// The native migrateHostname() returns a plain-text success string
// ("Migrated hostname for N bucket(s)") or a JSON error object
// ({"error": "..."}). Treat the plain-text prefix as success; only
// retry when the native lib explicitly reports an error.
val migrationSucceeded = if (result.startsWith("Migrated hostname for")) {
true
} else {
val errorMsg = try {
JSONObject(result).optString("error", result)
} catch (e: JSONException) {
result.ifEmpty { "empty response" }
}
Comment thread
TimeToBuildBob marked this conversation as resolved.
Log.w(TAG, "Hostname migration failed ($errorMsg); will retry on next start")
false
}
if (migrationSucceeded) {
prefs.setHostnameMigrated()
} else {
Log.w(TAG, "Hostname migration reported failure; will retry on next start")
}
}
}
Expand Down
Loading