meshtastic/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-20 22:23:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix #3528 Handle duplicate values in the broadcast interval enum (#3538)

Browse source
This commit is contained in:
Dane Evans 2025-10-30 13:33:57 +11:00 • committed by GitHub
parent 9d3f903492
commit 213cb78491
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
feature/settings/src/main/kotlin/org/meshtastic/feature/settings/util/FixedUpdateIntervals.kt
View file

@ -57,7 +57,6 @@ enum class FixedUpdateIntervals(val value: Long) {
FORTY_EIGHT_HOURS(TimeUnit.HOURS.toSeconds(48)), FORTY_EIGHT_HOURS(TimeUnit.HOURS.toSeconds(48)),
SEVENTY_TWO_HOURS(TimeUnit.HOURS.toSeconds(72)), SEVENTY_TWO_HOURS(TimeUnit.HOURS.toSeconds(72)),
ALWAYS_ON(Int.MAX_VALUE.toLong()), ALWAYS_ON(Int.MAX_VALUE.toLong()),
SIXTY_SECONDS(TimeUnit.MINUTES.toSeconds(1)),
EIGHTY_SECONDS(TimeUnit.SECONDS.toSeconds(80)), EIGHTY_SECONDS(TimeUnit.SECONDS.toSeconds(80)),
NINETY_SECONDS(TimeUnit.SECONDS.toSeconds(90)), NINETY_SECONDS(TimeUnit.SECONDS.toSeconds(90)),
EIGHT_SECONDS(TimeUnit.SECONDS.toSeconds(8)), EIGHT_SECONDS(TimeUnit.SECONDS.toSeconds(8)),
@ -260,7 +259,7 @@ enum class IntervalConfiguration {
POSITION_BROADCAST -> POSITION_BROADCAST ->
listOf( listOf(
FixedUpdateIntervals.UNSET, FixedUpdateIntervals.UNSET,
FixedUpdateIntervals.SIXTY_SECONDS, FixedUpdateIntervals.ONE_MINUTE,
FixedUpdateIntervals.NINETY_SECONDS, FixedUpdateIntervals.NINETY_SECONDS,
FixedUpdateIntervals.FIVE_MINUTES, FixedUpdateIntervals.FIVE_MINUTES,
FixedUpdateIntervals.FIFTEEN_MINUTES, FixedUpdateIntervals.FIFTEEN_MINUTES,
@ -283,7 +282,7 @@ enum class IntervalConfiguration {
FixedUpdateIntervals.EIGHT_SECONDS, FixedUpdateIntervals.EIGHT_SECONDS,
FixedUpdateIntervals.TWENTY_SECONDS, FixedUpdateIntervals.TWENTY_SECONDS,
FixedUpdateIntervals.FORTY_SECONDS, FixedUpdateIntervals.FORTY_SECONDS,
FixedUpdateIntervals.SIXTY_SECONDS, FixedUpdateIntervals.ONE_MINUTE,
FixedUpdateIntervals.EIGHTY_SECONDS, FixedUpdateIntervals.EIGHTY_SECONDS,
FixedUpdateIntervals.TWO_MINUTES, FixedUpdateIntervals.TWO_MINUTES,
FixedUpdateIntervals.FIVE_MINUTES, FixedUpdateIntervals.FIVE_MINUTES,