From 7e61c54c974a5e19036257150a7669b915656276 Mon Sep 17 00:00:00 2001 From: Andries Smit Date: Wed, 13 Jul 2022 22:39:31 +0200 Subject: [PATCH] chore: add WearException EventData equal and hash --- .../nightscout/shared/weardata/EventData.kt | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/shared/src/main/java/info/nightscout/shared/weardata/EventData.kt b/shared/src/main/java/info/nightscout/shared/weardata/EventData.kt index 6d78a1cd3e..ec450b91a8 100644 --- a/shared/src/main/java/info/nightscout/shared/weardata/EventData.kt +++ b/shared/src/main/java/info/nightscout/shared/weardata/EventData.kt @@ -35,7 +35,18 @@ sealed class EventData : Event() { val model: String, val manufacturer: String, val product: String - ) : EventData() + ) : EventData() { + + override fun equals(other: Any?): Boolean = + when (other) { + !is WearException -> false + else -> timeStamp == other.timeStamp && fingerprint == other.fingerprint + } + + override fun hashCode(): Int { + return Objects.hash(timeStamp, fingerprint) + } + } @Serializable data class Error(val timeStamp: Long) : EventData() // ignored @@ -146,9 +157,9 @@ sealed class EventData : Event() { override fun equals(other: Any?): Boolean = when { - other !is SingleBg -> false + other !is SingleBg -> false color != other.color -> false - else -> timeStamp == other.timeStamp + else -> timeStamp == other.timeStamp } override fun hashCode(): Int {