From ddacfa684105329aa7539999fc2d0c5ff134d7de Mon Sep 17 00:00:00 2001 From: darken Date: Mon, 24 Jan 2022 15:36:10 +0100 Subject: [PATCH] Don't report fake device data. --- .../eu/darken/capod/pods/core/apple/AppleFactory.kt | 12 +++++++----- .../pods/core/apple/protocol/ProximityPairing.kt | 10 ++++++++++ 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/AppleFactory.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/AppleFactory.kt index 1641dfd6..0bb0e08c 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/AppleFactory.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/AppleFactory.kt @@ -60,11 +60,13 @@ class AppleFactory @Inject constructor( var factory = podFactories.firstOrNull { it.isResponsible(pm) } if (factory == null) { - Bugs.report( - tag = TAG, - message = "Unknown proximity message type", - exception = IllegalArgumentException("Unknown ProximityMessage: $pm") - ) + if (scanResult.address != "6E:9E:D1:49:D2:6D") { + Bugs.report( + tag = TAG, + message = "Unknown proximity message type", + exception = IllegalArgumentException("Unknown ProximityMessage: $pm") + ) + } factory = unknownAppleFactory } diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/protocol/ProximityPairing.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/protocol/ProximityPairing.kt index 118d07f1..bdac5a94 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/protocol/ProximityPairing.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/protocol/ProximityPairing.kt @@ -31,6 +31,16 @@ object ProximityPairing { batteryData = setOf(data[4].upperNibble, data[4].lowerNibble), deviceColor = data[7] ) + + override fun toString(): String = + "ProximityPairing.Message(type=$type, length=$length, data=${ + data.joinToString(separator = " ") { + String.format( + "%02X", + it + ) + } + }" } @Reusable