Use translated channel name strings where possible to update them whe…

…n language changes (#4833) * Use translated channel name strings where possible to update them when language changes * Update sensor worker channel name to be more user friendly
home-assistant · Nov 21, 2024 · 8c6afda · 8c6afda
1 parent a918482
commit 8c6afda
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 21 deletions.
diff --git a/app/src/main/java/io/homeassistant/companion/android/websocket/WebsocketManager.kt b/app/src/main/java/io/homeassistant/companion/android/websocket/WebsocketManager.kt
@@ -215,16 +215,12 @@ class WebsocketManager(
      */
     private suspend fun createNotification(): Boolean {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            var notificationChannel =
-                notificationManager.getNotificationChannel(CHANNEL_WEBSOCKET)
-            if (notificationChannel == null) {
-                notificationChannel = NotificationChannel(
-                    CHANNEL_WEBSOCKET,
-                    applicationContext.getString(R.string.websocket_setting_name),
-                    NotificationManager.IMPORTANCE_LOW
-                )
-                notificationManager.createNotificationChannel(notificationChannel)
-            }
+            val notificationChannel = NotificationChannel(
+                CHANNEL_WEBSOCKET,
+                applicationContext.getString(R.string.websocket_setting_name),
+                NotificationManager.IMPORTANCE_LOW
+            )
+            notificationManager.createNotificationChannel(notificationChannel)
         }
 
         val intent = WebViewActivity.newInstance(applicationContext)

diff --git a/...ain/java/io/homeassistant/companion/android/common/notifications/NotificationFunctions.kt b/...ain/java/io/homeassistant/companion/android/common/notifications/NotificationFunctions.kt
@@ -75,7 +75,7 @@ fun handleChannel(
 ): String {
     // Define some values for a default channel
     var channelID = CHANNEL_GENERAL
-    var channelName = "General"
+    var channelName = context.getString(R.string.general)
 
     if (!data[NotificationData.CHANNEL].isNullOrEmpty()) {
         channelID = createChannelID(data[NotificationData.CHANNEL].toString())

diff --git a/common/src/main/java/io/homeassistant/companion/android/common/sensors/SensorWorkerBase.kt b/common/src/main/java/io/homeassistant/companion/android/common/sensors/SensorWorkerBase.kt
@@ -92,16 +92,12 @@ abstract class SensorWorkerBase(
 
     protected fun createNotificationChannel() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            var notificationChannel =
-                notificationManager.getNotificationChannel(CHANNEL_SENSOR_WORKER)
-            if (notificationChannel == null) {
-                notificationChannel = NotificationChannel(
-                    CHANNEL_SENSOR_WORKER,
-                    TAG,
-                    NotificationManager.IMPORTANCE_LOW
-                )
-                notificationManager.createNotificationChannel(notificationChannel)
-            }
+            val notificationChannel = NotificationChannel(
+                CHANNEL_SENSOR_WORKER,
+                appContext.getString(commonR.string.sensor_updates),
+                NotificationManager.IMPORTANCE_LOW
+            )
+            notificationManager.createNotificationChannel(notificationChannel)
         }
     }
 }
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
@@ -1313,4 +1313,6 @@
     <string name="sensor_description_steps">Total steps taken since midnight from Health Connect</string>
     <string name="basic_sensor_name_blood_glucose">Blood glucose</string>
     <string name="sensor_description_blood_glucose">Last recorded blood glucose reading in milligrams per deciliter from Health Connect</string>
+    <string name="general">General</string>
+    <string name="sensor_updates">Sensor updates</string>
 </resources>