Use device name from settings

kylecorry31 · Nov 17, 2023 · a73a8b6 · a73a8b6
1 parent c8542fb
commit a73a8b6
Showing 1 changed file with 18 additions and 1 deletion.
diff --git a/app/src/main/java/com/kylecorry/trail_sense/shared/alerts/MissingSensorAlert.kt b/app/src/main/java/com/kylecorry/trail_sense/shared/alerts/MissingSensorAlert.kt
@@ -2,6 +2,7 @@ package com.kylecorry.trail_sense.shared.alerts
 
 import android.content.Context
 import android.os.Build
+import android.provider.Settings
 import com.kylecorry.andromeda.alerts.Alerts
 import com.kylecorry.andromeda.core.system.Android
 import com.kylecorry.andromeda.markdown.MarkdownService
@@ -24,7 +25,7 @@ class MissingSensorAlert(private val context: Context) : IValueAlerter<String> {
         }
 
         fun getMissingSensorMessage(context: Context, sensor: String): CharSequence {
-            val deviceName = "${Android.manufacturer} ${Build.MODEL}"
+            val deviceName = getDeviceName(context)
 
             val part1 = context.getString(
                 R.string.missing_sensor_message_1,
@@ -43,6 +44,22 @@ class MissingSensorAlert(private val context: Context) : IValueAlerter<String> {
 
             return MarkdownService(context).toMarkdown(markdown)
         }
+
+        private fun getDeviceName(context: Context): String {
+            val name = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
+                Settings.Global.getString(context.contentResolver, Settings.Global.DEVICE_NAME) ?: Android.model
+            } else {
+                Android.model
+            }
+
+            val manufacturer = Android.manufacturer
+
+            if (name.lowercase().startsWith(manufacturer.lowercase())) {
+                return name
+            }
+
+            return "$manufacturer $name"
+        }
     }
 
 }