Skip to content

fix: use Build.DEVICE instead of Build.MODEL for hostname fallback #183

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 4 commits into from
Jul 12, 2026
Merged

fix: use Build.DEVICE instead of Build.MODEL for hostname fallback #183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
990ff6d
fix: use Build.DEVICE instead of Build.MODEL for hostname fallback
TimeToBuildBob Jul 12, 2026
0f1cbfd
fix: sanitize hostname to be space-free regardless of source
TimeToBuildBob Jul 12, 2026
f9ea7c1
fix: strengthen hostname sanitization to strip all non-hostname chars
TimeToBuildBob Jul 12, 2026
5fff8bb
fix: filter blank DEVICE_NAME before falling back to Build.DEVICE in …
TimeToBuildBob Jul 12, 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
12 changes: 10 additions & 2 deletions mobile/src/main/java/net/activitywatch/android/RustInterface.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,16 @@ class RustInterface(context: Context? = null) {
}

fun getDeviceName(context: Context): String {
return Settings.Global.getString(context.contentResolver, Settings.Global.DEVICE_NAME)
?: android.os.Build.MODEL ?: "Unknown"
val raw = Settings.Global.getString(context.contentResolver, Settings.Global.DEVICE_NAME)
?.trim()
?.takeIf { it.isNotEmpty() }
?: android.os.Build.DEVICE
?: "unknown"
Comment thread
TimeToBuildBob marked this conversation as resolved.
return raw.trim()
.lowercase(java.util.Locale.ROOT)
.replace(Regex("[^a-z0-9_-]+"), "_")
.trim('_')
.ifEmpty { "unknown" }
}

}
12 changes: 9 additions & 3 deletions mobile/src/main/java/net/activitywatch/android/SyncInterface.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,16 @@ class SyncInterface(context: Context) {
external fun getSyncDir(): String

private fun getDeviceName(): String {
return android.provider.Settings.Global.getString(
appContext.contentResolver,
val raw = android.provider.Settings.Global.getString(
appContext.contentResolver,
android.provider.Settings.Global.DEVICE_NAME
) ?: android.os.Build.MODEL ?: "Unknown"
)?.trim()?.takeIf { it.isNotEmpty() }
?: android.os.Build.DEVICE ?: "unknown"
return raw.trim()
.lowercase(java.util.Locale.ROOT)
.replace(Regex("[^a-z0-9_-]+"), "_")
.trim('_')
.ifEmpty { "unknown" }
}

// Async wrapper for syncPullAll
Expand Down
Loading