Skip to content
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

truncate timezone ID only if it is too long #311

Merged
merged 2 commits into from
Feb 9, 2025
Merged

truncate timezone ID only if it is too long #311

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4cb6031
truncate timezone ID only if it is too long
jhoule86 Feb 9, 2025
a05d79f
call take on local variable instead of original value
jhoule86 Feb 9, 2025
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
13 changes: 10 additions & 3 deletions android/shared/src/commonMain/kotlin/io/rebble/cobble/shared/handlers/SystemHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,13 +122,20 @@ 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.id} (truncated: ${timezone.id.take(MAX_TIMEZONE_NAME_LENGTH)}), offset: $timezoneOffsetMinutes")

val normalizedZone = timezone.id
if (normalizedZone.length > MAX_TIMEZONE_NAME_LENGTH) {
normalizedZone = normalizedZone.take(MAX_TIMEZONE_NAME_LENGTH)
Logging.i("Time Zone ${timezone.id} exceeds maximum value length and has been truncated to ${normalizedZone}")
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since this truncation

  1. is a recent addition - a436039
  2. most likely is an edge case

I felt it was worth being noisy about it in this separate log, instead of trying to shoehorn it into the existing log.

}

val updateTimePacket = TimeMessage.SetUTC(
now.epochSeconds.toUInt(),
timezoneOffsetMinutes.toShort(),
timezone.id.take(MAX_TIMEZONE_NAME_LENGTH)
normalizedZone
)

Logging.i("Sending current time to watch: $now, timezone: ${normalizedZone}, offset: $timezoneOffsetMinutes")
Copy link
Contributor Author

@jhoule86 jhoule86 Feb 9, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moving the log down to this line is admittedly trivial, but I felt that it helped the flow of the code, and prepares for the potential change to
Logging.i("Sending current time to watch: ${updateTimePacket}")
if/when there is a good toString implemented.

systemService.send(updateTimePacket)
}

Expand Down Expand Up @@ -162,4 +169,4 @@ class SystemHandler(
}

expect fun platformTimeChangedFlow(context: PlatformContext): Flow<Unit>
expect fun getPlatformPebbleFlags(context: PlatformContext): Set<PhoneAppVersion.PlatformFlag>
expect fun getPlatformPebbleFlags(context: PlatformContext): Set<PhoneAppVersion.PlatformFlag>
Loading