truncate timezone ID if too long

pebble-dev · Nov 29, 2024 · a436039 · a436039
1 parent 3ac7b52
commit a436039
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/...oid/app/src/main/kotlin/io/rebble/cobble/bridges/ui/FirmwareUpdateControlFlutterBridge.kt b/...oid/app/src/main/kotlin/io/rebble/cobble/bridges/ui/FirmwareUpdateControlFlutterBridge.kt
@@ -8,6 +8,7 @@ import io.rebble.cobble.pigeons.BooleanWrapper
 import io.rebble.cobble.pigeons.Pigeons
 import io.rebble.cobble.shared.domain.state.ConnectionStateManager
 import io.rebble.cobble.shared.domain.state.watchOrNull
+import io.rebble.cobble.shared.handlers.SystemHandler
 import io.rebble.cobble.shared.util.zippedSource
 import io.rebble.cobble.util.launchPigeonResult
 import io.rebble.libpebblecommon.metadata.WatchHardwarePlatform
@@ -84,7 +85,7 @@ class FirmwareUpdateControlFlutterBridge @Inject constructor(
         val updateTimePacket = TimeMessage.SetUTC(
                 now.toUInt(),
                 offsetMinutes.toShort(),
-                timezone.id
+                timezone.id.take(SystemHandler.MAX_TIMEZONE_NAME_LENGTH)
         )
 
         ConnectionStateManager.connectionState.value.watchOrNull?.systemService?.send(updateTimePacket)

diff --git a/android/shared/src/commonMain/kotlin/io/rebble/cobble/shared/handlers/SystemHandler.kt b/android/shared/src/commonMain/kotlin/io/rebble/cobble/shared/handlers/SystemHandler.kt
@@ -39,6 +39,10 @@ class SystemHandler(
         }
     }
 
+    companion object {
+        const val MAX_TIMEZONE_NAME_LENGTH = 32
+    }
+
     fun negotiationsComplete(watch: PebbleDevice) {
         if (ConnectionStateManager.connectionState.value is ConnectionState.Negotiating) {
             ConnectionStateManager.connectionState.value = ConnectionState.Connected(watch)
@@ -118,11 +122,11 @@ class SystemHandler(
         val timezone = TimeZone.currentSystemDefault()
         val now = Clock.System.now()
         val timezoneOffsetMinutes = timezone.offsetAt(now).totalSeconds.seconds.inWholeMinutes
-        Logging.i("Sending current time to watch: $now, timezone: $timezone, offset: $timezoneOffsetMinutes")
+        Logging.i("Sending current time to watch: $now, timezone: ${timezone.id} (truncated: ${timezone.id.take(MAX_TIMEZONE_NAME_LENGTH)}), offset: $timezoneOffsetMinutes")
         val updateTimePacket = TimeMessage.SetUTC(
                 now.epochSeconds.toUInt(),
                 timezoneOffsetMinutes.toShort(),
-                timezone.id
+                timezone.id.take(MAX_TIMEZONE_NAME_LENGTH)
         )
 
         systemService.send(updateTimePacket)