From 7e0e7e4c29e32fbc13583ea573903c594fcf3b46 Mon Sep 17 00:00:00 2001 From: eulaly Date: Tue, 19 May 2026 08:51:39 -0400 Subject: [PATCH] fix: device label reads Settings.Global.DEVICE_NAME (user-set name), falls back to Build.MODEL Co-Authored-By: Claude Sonnet 4.6 --- .../main/kotlin/me/hgsky/synq/data/SettingsRepository.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/android/app/src/main/kotlin/me/hgsky/synq/data/SettingsRepository.kt b/android/app/src/main/kotlin/me/hgsky/synq/data/SettingsRepository.kt index 1c1d7ba..94e7040 100644 --- a/android/app/src/main/kotlin/me/hgsky/synq/data/SettingsRepository.kt +++ b/android/app/src/main/kotlin/me/hgsky/synq/data/SettingsRepository.kt @@ -2,6 +2,7 @@ package me.hgsky.synq.data import android.content.Context import android.os.Build +import android.provider.Settings import androidx.datastore.preferences.core.edit import androidx.datastore.preferences.core.intPreferencesKey import androidx.datastore.preferences.core.stringPreferencesKey @@ -29,7 +30,10 @@ class SettingsRepository(private val context: Context) { SynqSettings( serverUrl = prefs[KEY_URL] ?: "http://jeeves.mother:8765", token = prefs[KEY_TOKEN] ?: "", - deviceLabel = prefs[KEY_DEVICE] ?: Build.MODEL, + deviceLabel = prefs[KEY_DEVICE] ?: ( + Settings.Global.getString(context.contentResolver, Settings.Global.DEVICE_NAME) + ?.takeIf { it.isNotBlank() } ?: Build.MODEL + ), syncIntervalMinutes = prefs[KEY_INTERVAL] ?: 15, ) }