Refactor proximity message handling, introduce "Payload" that splits the data in public and private part.

app-common/src/main/java/eu/darken/capod/monitor/core/PodMonitor.kt

@@ -19,7 +19,6 @@ import eu.darken.capod.main.core.GeneralSettings
 import eu.darken.capod.main.core.PermissionTool
 import eu.darken.capod.pods.core.PodDevice
 import eu.darken.capod.pods.core.PodFactory
-import eu.darken.capod.monitor.core.RPAChecker
 import eu.darken.capod.pods.core.apple.protocol.ProximityPairing
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.delay
@@ -202,7 +201,7 @@ class PodMonitor @Inject constructor(
     private fun determineMainDevice(pods: List<PodDevice>): PodDevice? {
         generalSettings.mainDeviceIdentityKey.value
             .also { log(TAG) { "Identity-Resolving-Key (IRK): ${it?.toByteString()}" } }
-            ?.let { irkKey -> pods.firstOrNull { pod -> rpaChecker.verify(pod, irkKey) } }
+            ?.let { irkKey -> pods.firstOrNull { pod -> rpaChecker.verify(pod.address, irkKey) } }
             ?.let {
                 log(TAG) { "Main device determined via IRK: $it" }
                 return it

app-common/src/main/java/eu/darken/capod/monitor/core/RPAChecker.kt

@@ -5,7 +5,6 @@ import eu.darken.capod.common.debug.logging.Logging.Priority.ERROR
 import eu.darken.capod.common.debug.logging.asLog
 import eu.darken.capod.common.debug.logging.log
 import eu.darken.capod.common.debug.logging.logTag
-import eu.darken.capod.pods.core.PodDevice
 import okio.ByteString.Companion.toByteString
 import javax.crypto.Cipher
 import javax.crypto.spec.SecretKeySpec
@@ -14,14 +13,14 @@ import javax.inject.Inject
 class RPAChecker @Inject constructor() {
 
     // Resolvable-Private-Address
-    fun verify(dev: PodDevice, irk: ByteArray): Boolean = try {
-        val rpa = dev.address.split(":").map { it.toInt(16).toByte() }.reversed().toByteArray()
+    fun verify(address: String, irk: ByteArray): Boolean = try {
+        val rpa = address.split(":").map { it.toInt(16).toByte() }.reversed().toByteArray()
         val prand = rpa.copyOfRange(3, 6)
         val hash = rpa.copyOfRange(0, 3)
         val computedHash = ah(irk, prand)
         hash.contentEquals(computedHash)
     } catch (e: Exception) {
-        log(TAG, ERROR) { "Failed to verify RPA\nPod=${dev}\nIRK=${irk.toByteString()}\n${e.asLog()}" }
+        log(TAG, ERROR) { "Failed to verify RPA\naddress=${address}\nIRK=${irk.toByteString()}\n${e.asLog()}" }
         false
     }
 

app-common/src/main/java/eu/darken/capod/pods/core/apple/AppleFactory.kt

@@ -6,11 +6,13 @@ import eu.darken.capod.common.debug.logging.asLog
 import eu.darken.capod.common.debug.logging.log
 import eu.darken.capod.common.debug.logging.logTag
 import eu.darken.capod.main.core.GeneralSettings
+import eu.darken.capod.monitor.core.RPAChecker
 import eu.darken.capod.pods.core.PodDevice
 import eu.darken.capod.pods.core.apple.misc.UnknownAppleDevice
 import eu.darken.capod.pods.core.apple.protocol.ContinuityProtocol
-import eu.darken.capod.pods.core.apple.protocol.MessageDecrypter
+import eu.darken.capod.pods.core.apple.protocol.ProximityMessage
 import eu.darken.capod.pods.core.apple.protocol.ProximityPairing
+import eu.darken.capod.pods.core.apple.protocol.ProximityPayload
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import javax.inject.Inject
@@ -20,15 +22,16 @@ import javax.inject.Singleton
 class AppleFactory @Inject constructor(
     private val continuityProtocolDecoder: ContinuityProtocol.Decoder,
     private val proximityPairingDecoder: ProximityPairing.Decoder,
+    private val proximityMessageDecrypter: ProximityMessage.Decrypter,
     private val podFactories: @JvmSuppressWildcards Set<ApplePodsFactory<out ApplePods>>,
     private val unknownAppleFactory: UnknownAppleDevice.Factory,
     private val generalSettings: GeneralSettings,
-    private val messageDecrypter: MessageDecrypter,
+    private val rpaChecker: RPAChecker,
 ) {
 
     private val lock = Mutex()
 
-    private fun getMessage(scanResult: BleScanResult): ProximityPairing.Message? {
+    private fun getMessage(scanResult: BleScanResult): ProximityMessage? {
         val messages = try {
             continuityProtocolDecoder.decode(scanResult)
         } catch (e: Exception) {
@@ -54,20 +57,40 @@ class AppleFactory @Inject constructor(
     }
 
     suspend fun create(scanResult: BleScanResult): PodDevice? = lock.withLock {
-        val pm = getMessage(scanResult) ?: return@withLock null
+        val proximityMessage = getMessage(scanResult) ?: return@withLock null
 
-        val factory = podFactories.firstOrNull { it.isResponsible(pm) }
+        val factory = podFactories.firstOrNull { it.isResponsible(proximityMessage) }
 
-        val decryptedData = generalSettings.mainDeviceEncryptionKey.value
-            ?.let { messageDecrypter.decrypt(pm, it) }
+        val payload = getPayload(scanResult, proximityMessage)
 
         return@withLock (factory ?: unknownAppleFactory).create(
             scanResult = scanResult,
-            message = pm,
-            decrypted = decryptedData,
+            payload = payload,
         )
     }
 
+    private fun getPayload(
+        scanResult: BleScanResult,
+        proximityMessage: ProximityMessage
+    ) = ProximityPayload(
+        public = ProximityPayload.Public(
+            proximityMessage.data.take(16).toUByteArray()
+        ),
+        private = run {
+            val irkKey = generalSettings.mainDeviceIdentityKey.value
+            if (irkKey == null) return@run null
+            val encKey = generalSettings.mainDeviceEncryptionKey.value
+            if (encKey == null) return@run null
+
+            if (!rpaChecker.verify(scanResult.address, irkKey)) return@run null
+
+            val encrypted = proximityMessage.data.takeLast(16).toUByteArray().toByteArray()
+            proximityMessageDecrypter.decrypt(encrypted, encKey)?.let {
+                ProximityPayload.Private(data = it)
+            }
+        },
+    )
+
     companion object {
         private val TAG = logTag("Pod", "Apple", "Factory")
     }

app-common/src/main/java/eu/darken/capod/pods/core/apple/ApplePods.kt

@@ -1,51 +1,39 @@
 package eu.darken.capod.pods.core.apple
 
 import eu.darken.capod.common.lowerNibble
-import eu.darken.capod.common.toHex
 import eu.darken.capod.common.upperNibble
 import eu.darken.capod.pods.core.PodDevice
-import eu.darken.capod.pods.core.apple.protocol.ProximityPairing
+import eu.darken.capod.pods.core.apple.protocol.ProximityPayload
 
 interface ApplePods : PodDevice {
 
-    val proximityMessage: ProximityPairing.Message
-
-    val decryptedPayload: UByteArray?
-        get() = null
+    val payload: ProximityPayload
 
     // We start counting at the airpods prefix byte
-    val rawPrefix: UByte
-        get() = proximityMessage.data[0]
+    val pubPrefix: UByte
+        get() = payload.public.data[0]
 
-    val rawDeviceModel: UShort
-        get() = (((proximityMessage.data[1].toInt() and 255) shl 8) or (proximityMessage.data[2].toInt() and 255)).toUShort()
+    val pubDeviceModel: UShort
+        get() = (((payload.public.data[1].toInt() and 255) shl 8) or (payload.public.data[2].toInt() and 255)).toUShort()
 
-    val rawStatus: UByte
-        get() = proximityMessage.data[3]
+    val pubStatus: UByte
+        get() = payload.public.data[3]
 
-    val rawStatusHex: String
-        get() = rawStatus.toHex()
+    val pubPodsBattery: UByte
+        get() = payload.public.data[4]
 
-    val rawPodsBattery: UByte
-        get() = proximityMessage.data[4]
+    val pubFlags: UShort
+        get() = payload.public.data[5].upperNibble
 
-    val rawPodsBatteryHex: String
-        get() = rawPodsBattery.toHex()
+    val pubCaseBattery: UShort
+        get() = payload.public.data[5].lowerNibble
 
-    val rawFlags: UShort
-        get() = proximityMessage.data[5].upperNibble
-
-    val rawCaseBattery: UShort
-        get() = proximityMessage.data[5].lowerNibble
-
-    val rawCaseLidState: UByte
-        get() = proximityMessage.data[6]
-
-    val rawDeviceColor: UByte
-        get() = proximityMessage.data[7]
-
-    val rawSuffix: UByte
-        get() = proximityMessage.data[8]
+    val pubCaseLidState: UByte
+        get() = payload.public.data[6]
 
+    val pubDeviceColor: UByte
+        get() = payload.public.data[7]
 
+    val pubSuffix: UByte
+        get() = payload.public.data[8]
 }

app-common/src/main/java/eu/darken/capod/pods/core/apple/ApplePodsFactory.kt

@@ -1,5 +1,6 @@
 package eu.darken.capod.pods.core.apple
 
+import android.R.id.message
 import eu.darken.capod.common.bluetooth.BleScanResult
 import eu.darken.capod.common.collections.median
 import eu.darken.capod.common.debug.logging.Logging.Priority.VERBOSE
@@ -9,30 +10,27 @@ import eu.darken.capod.common.lowerNibble
 import eu.darken.capod.common.upperNibble
 import eu.darken.capod.pods.core.HasCase
 import eu.darken.capod.pods.core.PodDevice
-import eu.darken.capod.pods.core.apple.protocol.ProximityPairing
+import eu.darken.capod.pods.core.apple.protocol.ProximityMessage
+import eu.darken.capod.pods.core.apple.protocol.ProximityPayload
 import java.time.Duration
 import java.time.Instant
 import kotlin.math.max
 
 abstract class ApplePodsFactory<PodType : ApplePods>(private val tag: String) {
 
-    data class Markings(
-        val vendor: UByte,
-        val length: UByte,
+    data class Identifier(
         val device: UShort,
         val podBatteryData: Set<UShort>,
         val caseBatteryData: UShort,
         val deviceColor: UByte,
     )
 
-    private fun ProximityPairing.Message.getApplePodsMarkings(): Markings = Markings(
-        vendor = ProximityPairing.CONTINUITY_PROTOCOL_MESSAGE_TYPE_PROXIMITY_PAIRING,
-        length = ProximityPairing.PAIRING_MESSAGE_LENGTH.toUByte(),
-        device = (((data[1].toInt() and 255) shl 8) or (data[2].toInt() and 255)).toUShort(),
+    private fun ProximityPayload.getFuzzyIdentifier(): Identifier = Identifier(
+        device = (((public.data[1].toInt() and 255) shl 8) or (public.data[2].toInt() and 255)).toUShort(),
         // Make comparison order independent
-        podBatteryData = setOf(data[4].upperNibble, data[4].lowerNibble),
-        caseBatteryData = data[5].lowerNibble,
-        deviceColor = data[7]
+        podBatteryData = setOf(public.data[4].upperNibble, public.data[4].lowerNibble),
+        caseBatteryData = public.data[5].lowerNibble,
+        deviceColor = public.data[7]
     )
 
     data class KnownDevice(
@@ -42,8 +40,8 @@ abstract class ApplePodsFactory<PodType : ApplePods>(private val tag: String) {
         val history: List<ApplePods>,
         val lastCaseBattery: Float?,
     ) {
-        val lastMessage: ProximityPairing.Message
-            get() = history.last().proximityMessage
+        val lastPayload: ProximityPayload
+            get() = history.last().payload
 
         val lastAddress: String
             get() = history.last().address
@@ -127,7 +125,7 @@ abstract class ApplePodsFactory<PodType : ApplePods>(private val tag: String) {
 
     internal open fun searchHistory(current: PodType): KnownDevice? {
         val scanResult = current.scanResult
-        val message = current.proximityMessage
+        val payload = current.payload
 
         knownDevices.values.toList().forEach { knownDevice ->
             if (knownDevice.isOlderThan(Duration.ofSeconds(30))) {
@@ -148,9 +146,9 @@ abstract class ApplePodsFactory<PodType : ApplePods>(private val tag: String) {
             ?.also { log(tag, VERBOSE) { "searchHistory1: Recovered previous ID via address: $it" } }
 
         if (recognizedDevice == null) {
-            val currentMarkers = message.getApplePodsMarkings()
+            val currentMarkers = payload.getFuzzyIdentifier()
             recognizedDevice = knownDevices.values
-                .firstOrNull { it.lastMessage.getApplePodsMarkings() == currentMarkers }
+                .firstOrNull { it.lastPayload.getFuzzyIdentifier() == currentMarkers }
                 ?.also { log(tag) { "searchHistory1: Close match based on similarity: $currentMarkers" } }
         }
 
@@ -173,6 +171,7 @@ abstract class ApplePodsFactory<PodType : ApplePods>(private val tag: String) {
                     lastCaseBattery = history.determineLatestCaseBattery() ?: existing.lastCaseBattery
                 )
             }
+
             else -> {
                 log(tag) { "searchHistory1: Creating new history for $device" }
                 val history = listOf(device)
@@ -192,16 +191,15 @@ abstract class ApplePodsFactory<PodType : ApplePods>(private val tag: String) {
         val dirty: UByte,
     )
 
-    fun ProximityPairing.Message.getModelInfo(): ModelInfo = ModelInfo(
+    fun ProximityMessage.getModelInfo(): ModelInfo = ModelInfo(
         full = (((data[1].toInt() and 255) shl 8) or (data[2].toInt() and 255)).toUShort(),
         dirty = data[1]
     )
 
-    abstract fun isResponsible(message: ProximityPairing.Message): Boolean
+    abstract fun isResponsible(message: ProximityMessage): Boolean
 
     abstract fun create(
         scanResult: BleScanResult,
-        message: ProximityPairing.Message,
-        decrypted: UByteArray?,
+        payload: ProximityPayload,
     ): ApplePods
 }

app-common/src/main/java/eu/darken/capod/pods/core/apple/DualApplePods.kt

@@ -15,7 +15,7 @@ interface DualApplePods : ApplePods, HasChargeDetectionDual, DualPodDevice, HasE
     HasDualMicrophone, HasAppleColor {
 
     val primaryPod: Pod
-        get() = when (rawStatus.isBitSet(5)) {
+        get() = when (pubStatus.isBitSet(5)) {
             true -> Pod.LEFT
             false -> Pod.RIGHT
         }
@@ -25,17 +25,17 @@ interface DualApplePods : ApplePods, HasChargeDetectionDual, DualPodDevice, HasE
      * If the right pod is the primary, the values are flipped.
      */
     val areValuesFlipped: Boolean
-        get() = !rawStatus.isBitSet(5)
+        get() = !pubStatus.isBitSet(5)
 
     override val batteryLeftPodPercent: Float?
         get() {
-            decryptedPayload?.get(if (areValuesFlipped) 2 else 1)?.let { raw ->
+            payload.private?.data?.get(if (areValuesFlipped) 2 else 1)?.let { raw ->
                 val level = (raw and 0x7Fu).toInt() / 100f
                 if (level <= 1.0f) return level
             }
             val value = when (areValuesFlipped) {
-                true -> rawPodsBattery.upperNibble.toInt()
-                false -> rawPodsBattery.lowerNibble.toInt()
+                true -> pubPodsBattery.upperNibble.toInt()
+                false -> pubPodsBattery.lowerNibble.toInt()
             }
             return when (value) {
                 15 -> null
@@ -50,13 +50,13 @@ interface DualApplePods : ApplePods, HasChargeDetectionDual, DualPodDevice, HasE
 
     override val batteryRightPodPercent: Float?
         get() {
-            decryptedPayload?.get(if (areValuesFlipped) 1 else 2)?.let { raw ->
+            payload.private?.data?.get(if (areValuesFlipped) 1 else 2)?.let { raw ->
                 val level = (raw and 0x7Fu).toInt() / 100f
                 if (level <= 1.0f) return level
             }
             val value = when (areValuesFlipped) {
-                true -> rawPodsBattery.lowerNibble.toInt()
-                false -> rawPodsBattery.upperNibble.toInt()
+                true -> pubPodsBattery.lowerNibble.toInt()
+                false -> pubPodsBattery.upperNibble.toInt()
             }
             return when (value) {
                 15 -> null
@@ -70,24 +70,24 @@ interface DualApplePods : ApplePods, HasChargeDetectionDual, DualPodDevice, HasE
         }
 
     val isThisPodInThecase: Boolean
-        get() = rawStatus.isBitSet(6)
+        get() = pubStatus.isBitSet(6)
 
     val isOnePodInCase: Boolean
-        get() = rawStatus.isBitSet(4)
+        get() = pubStatus.isBitSet(4)
 
     val areBothPodsInCase: Boolean
-        get() = rawStatus.isBitSet(2)
+        get() = pubStatus.isBitSet(2)
 
     override val isLeftPodInEar: Boolean
         get() = when (areValuesFlipped xor isThisPodInThecase) {
-            true -> rawStatus.isBitSet(3)
-            false -> rawStatus.isBitSet(1)
+            true -> pubStatus.isBitSet(3)
+            false -> pubStatus.isBitSet(1)
         }
 
     override val isRightPodInEar: Boolean
         get() = when (areValuesFlipped xor isThisPodInThecase) {
-            true -> rawStatus.isBitSet(1)
-            false -> rawStatus.isBitSet(3)
+            true -> pubStatus.isBitSet(1)
+            false -> pubStatus.isBitSet(3)
         }
 
     /**
@@ -95,46 +95,46 @@ interface DualApplePods : ApplePods, HasChargeDetectionDual, DualPodDevice, HasE
      * For the pod that is in the case, this is flipped again though.
      */
     override val isLeftPodMicrophone: Boolean
-        get() = rawStatus.isBitSet(5) xor isThisPodInThecase
+        get() = pubStatus.isBitSet(5) xor isThisPodInThecase
 
     /**
      * The data flip bit is UNset if the right pod is primary.
      * For the pod that is in the case, this is flipped again though.
      */
     override val isRightPodMicrophone: Boolean
-        get() = !rawStatus.isBitSet(5) xor isThisPodInThecase
+        get() = !pubStatus.isBitSet(5) xor isThisPodInThecase
 
     override val isLeftPodCharging: Boolean
         get() {
-            decryptedPayload?.get(if (areValuesFlipped) 2 else 1)?.let { raw ->
+            payload.private?.data?.get(if (areValuesFlipped) 2 else 1)?.let { raw ->
                 val isCharging = (raw and 0x80u).toInt() != 0
                 return isCharging
             }
             return when (areValuesFlipped) {
-                false -> rawFlags.isBitSet(0)
-                true -> rawFlags.isBitSet(1)
+                false -> pubFlags.isBitSet(0)
+                true -> pubFlags.isBitSet(1)
             }
         }
 
     override val isRightPodCharging: Boolean
         get() {
-            decryptedPayload?.get(if (areValuesFlipped) 1 else 2)?.let { raw ->
+            payload.private?.data?.get(if (areValuesFlipped) 1 else 2)?.let { raw ->
                 val isCharging = (raw and 0x80u).toInt() != 0
                 return isCharging
             }
             return when (areValuesFlipped) {
-                false -> rawFlags.isBitSet(1)
-                true -> rawFlags.isBitSet(0)
+                false -> pubFlags.isBitSet(1)
+                true -> pubFlags.isBitSet(0)
             }
         }
 
     override val batteryCasePercent: Float?
         get() {
-            decryptedPayload?.get(3)?.let { raw ->
+            payload.private?.data?.get(3)?.let { raw ->
                 val level = (raw and 0x7Fu).toInt() / 100f
                 if (level <= 1.0f) return level
             }
-            return when (val value = rawCaseBattery.toInt()) {
+            return when (val value = pubCaseBattery.toInt()) {
                 15 -> null
                 else -> if (value > 10) {
                     log { "Case: Above 100% battery: $value" }
@@ -147,18 +147,18 @@ interface DualApplePods : ApplePods, HasChargeDetectionDual, DualPodDevice, HasE
 
     override val isCaseCharging: Boolean
         get() {
-            decryptedPayload?.get(3)?.let { raw ->
+            payload.private?.data?.get(3)?.let { raw ->
                 val isCharging = (raw and 0x80u).toInt() != 0
                 if (batteryCasePercent != null) return isCharging
             }
 
-            return rawFlags.isBitSet(2)
+            return pubFlags.isBitSet(2)
         }
 
     val caseLidState: LidState
         get() {
-            val rawstate = rawCaseLidState
-            return LidState.values().firstOrNull { it.rawRange.contains(rawstate.toInt()) } ?: LidState.UNKNOWN
+            val rawstate = pubCaseLidState
+            return LidState.entries.firstOrNull { it.rawRange.contains(rawstate.toInt()) } ?: LidState.UNKNOWN
         }
 
     /**

app-common/src/main/java/eu/darken/capod/pods/core/apple/DualApplePodsFactory.kt

@@ -13,7 +13,7 @@ abstract class DualApplePodsFactory(private val tag: String) : ApplePodsFactory<
         microPhoneRight = isRightPodMicrophone,
         chargingLeft = isLeftPodCharging,
         chargingRight = isRightPodCharging,
-        color = rawDeviceColor,
+        color = pubDeviceColor,
         model = model
     )
 

app-common/src/main/java/eu/darken/capod/pods/core/apple/HasAppleColor.kt

@@ -6,8 +6,8 @@ import eu.darken.capod.pods.core.HasPodStyle
 interface HasAppleColor : ApplePods, HasPodStyle {
 
     override val podStyle: HasPodStyle.PodStyle
-        get() = DeviceColor.values()
-            .firstOrNull { it.raw == rawDeviceColor }
+        get() = DeviceColor.entries
+            .firstOrNull { it.raw == pubDeviceColor }
             ?: DeviceColor.UNKNOWN
 
     enum class DeviceColor(val raw: UByte?) : HasPodStyle.PodStyle {

app-common/src/main/java/eu/darken/capod/pods/core/apple/SingleApplePods.kt

@@ -10,7 +10,7 @@ import eu.darken.capod.pods.core.SinglePodDevice
 interface SingleApplePods : ApplePods, SinglePodDevice, HasAppleColor {
 
     override val batteryHeadsetPercent: Float?
-        get() = when (val value = rawPodsBattery.lowerNibble.toInt()) {
+        get() = when (val value = pubPodsBattery.lowerNibble.toInt()) {
             15 -> null
             else -> if (value > 10) {
                 log { "Headset above 100% battery: $value" }

app-common/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen1.kt

@@ -6,17 +6,19 @@ import eu.darken.capod.pods.core.PodDevice
 import eu.darken.capod.pods.core.apple.ApplePods
 import eu.darken.capod.pods.core.apple.DualApplePods
 import eu.darken.capod.pods.core.apple.DualApplePodsFactory
+import eu.darken.capod.pods.core.apple.protocol.ProximityMessage
 import eu.darken.capod.pods.core.apple.protocol.ProximityPairing
+import eu.darken.capod.pods.core.apple.protocol.ProximityPayload
 import java.time.Instant
 import javax.inject.Inject
 
-data class AirPodsGen1 constructor(
+data class AirPodsGen1(
     override val identifier: PodDevice.Id = PodDevice.Id(),
     override val seenLastAt: Instant = Instant.now(),
     override val seenFirstAt: Instant = Instant.now(),
     override val seenCounter: Int = 1,
     override val scanResult: BleScanResult,
-    override val proximityMessage: ProximityPairing.Message,
+    override val payload: ProximityPayload,
     override val reliability: Float = PodDevice.BASE_CONFIDENCE,
     private val rssiAverage: Int? = null,
     private val cachedBatteryPercentage: Float? = null,
@@ -36,17 +38,16 @@ data class AirPodsGen1 constructor(
 
     class Factory @Inject constructor() : DualApplePodsFactory(TAG) {
 
-        override fun isResponsible(message: ProximityPairing.Message): Boolean = message.run {
+        override fun isResponsible(message: ProximityMessage): Boolean = message.run {
             getModelInfo().full == DEVICE_CODE && length == ProximityPairing.PAIRING_MESSAGE_LENGTH
         }
 
 
         override fun create(
             scanResult: BleScanResult,
-            message: ProximityPairing.Message,
-            decrypted: UByteArray?
+            payload: ProximityPayload
         ): ApplePods {
-            var basic = AirPodsGen1(scanResult = scanResult, proximityMessage = message)
+            var basic = AirPodsGen1(scanResult = scanResult, payload = payload)
             val result = searchHistory(basic)
 
             if (result != null) basic = basic.copy(identifier = result.id)

app-common/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen2.kt

@@ -6,17 +6,19 @@ import eu.darken.capod.pods.core.PodDevice
 import eu.darken.capod.pods.core.apple.ApplePods
 import eu.darken.capod.pods.core.apple.DualApplePods
 import eu.darken.capod.pods.core.apple.DualApplePodsFactory
+import eu.darken.capod.pods.core.apple.protocol.ProximityMessage
 import eu.darken.capod.pods.core.apple.protocol.ProximityPairing
+import eu.darken.capod.pods.core.apple.protocol.ProximityPayload
 import java.time.Instant
 import javax.inject.Inject
 
-data class AirPodsGen2 constructor(
+data class AirPodsGen2(
     override val identifier: PodDevice.Id = PodDevice.Id(),
     override val seenLastAt: Instant = Instant.now(),
     override val seenFirstAt: Instant = Instant.now(),
     override val seenCounter: Int = 1,
     override val scanResult: BleScanResult,
-    override val proximityMessage: ProximityPairing.Message,
+    override val payload: ProximityPayload,
     override val reliability: Float = PodDevice.BASE_CONFIDENCE,
     private val rssiAverage: Int? = null,
     private val cachedBatteryPercentage: Float? = null,
@@ -36,16 +38,15 @@ data class AirPodsGen2 constructor(
 
     class Factory @Inject constructor() : DualApplePodsFactory(TAG) {
 
-        override fun isResponsible(message: ProximityPairing.Message): Boolean = message.run {
+        override fun isResponsible(message: ProximityMessage): Boolean = message.run {
             getModelInfo().full == DEVICE_CODE && length == ProximityPairing.PAIRING_MESSAGE_LENGTH
         }
 
         override fun create(
             scanResult: BleScanResult,
-            message: ProximityPairing.Message,
-            decrypted: UByteArray?
+            payload: ProximityPayload
         ): ApplePods {
-            var basic = AirPodsGen2(scanResult = scanResult, proximityMessage = message)
+            var basic = AirPodsGen2(scanResult = scanResult, payload = payload)
             val result = searchHistory(basic)
 
             if (result != null) basic = basic.copy(identifier = result.id)

app-common/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen3.kt

@@ -6,17 +6,19 @@ import eu.darken.capod.pods.core.PodDevice
 import eu.darken.capod.pods.core.apple.ApplePods
 import eu.darken.capod.pods.core.apple.DualApplePods
 import eu.darken.capod.pods.core.apple.DualApplePodsFactory
+import eu.darken.capod.pods.core.apple.protocol.ProximityMessage
 import eu.darken.capod.pods.core.apple.protocol.ProximityPairing
+import eu.darken.capod.pods.core.apple.protocol.ProximityPayload
 import java.time.Instant
 import javax.inject.Inject
 
-data class AirPodsGen3 constructor(
+data class AirPodsGen3(
     override val identifier: PodDevice.Id = PodDevice.Id(),
     override val seenLastAt: Instant = Instant.now(),
     override val seenFirstAt: Instant = Instant.now(),
     override val seenCounter: Int = 1,
     override val scanResult: BleScanResult,
-    override val proximityMessage: ProximityPairing.Message,
+    override val payload: ProximityPayload,
     override val reliability: Float = PodDevice.BASE_CONFIDENCE,
     private val rssiAverage: Int? = null,
     private val cachedBatteryPercentage: Float? = null,
@@ -36,16 +38,15 @@ data class AirPodsGen3 constructor(
 
     class Factory @Inject constructor() : DualApplePodsFactory(TAG) {
 
-        override fun isResponsible(message: ProximityPairing.Message): Boolean = message.run {
+        override fun isResponsible(message: ProximityMessage): Boolean = message.run {
             getModelInfo().full == DEVICE_CODE && length == ProximityPairing.PAIRING_MESSAGE_LENGTH
         }
 
         override fun create(
             scanResult: BleScanResult,
-            message: ProximityPairing.Message,
-            decrypted: UByteArray?
+            payload: ProximityPayload
         ): ApplePods {
-            var basic = AirPodsGen3(scanResult = scanResult, proximityMessage = message)
+            var basic = AirPodsGen3(scanResult = scanResult, payload = payload)
             val result = searchHistory(basic)
 
             if (result != null) basic = basic.copy(identifier = result.id)

app-common/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen4.kt

@@ -6,7 +6,9 @@ import eu.darken.capod.pods.core.PodDevice
 import eu.darken.capod.pods.core.apple.ApplePods
 import eu.darken.capod.pods.core.apple.DualApplePods
 import eu.darken.capod.pods.core.apple.DualApplePodsFactory
+import eu.darken.capod.pods.core.apple.protocol.ProximityMessage
 import eu.darken.capod.pods.core.apple.protocol.ProximityPairing
+import eu.darken.capod.pods.core.apple.protocol.ProximityPayload
 import java.time.Instant
 import javax.inject.Inject
 
@@ -16,7 +18,7 @@ data class AirPodsGen4(
     override val seenFirstAt: Instant = Instant.now(),
     override val seenCounter: Int = 1,
     override val scanResult: BleScanResult,
-    override val proximityMessage: ProximityPairing.Message,
+    override val payload: ProximityPayload,
     override val reliability: Float = PodDevice.BASE_CONFIDENCE,
     private val rssiAverage: Int? = null,
     private val cachedBatteryPercentage: Float? = null,
@@ -36,16 +38,15 @@ data class AirPodsGen4(
 
     class Factory @Inject constructor() : DualApplePodsFactory(TAG) {
 
-        override fun isResponsible(message: ProximityPairing.Message): Boolean = message.run {
+        override fun isResponsible(message: ProximityMessage): Boolean = message.run {
             getModelInfo().full == DEVICE_CODE && length == ProximityPairing.PAIRING_MESSAGE_LENGTH
         }
 
         override fun create(
             scanResult: BleScanResult,
-            message: ProximityPairing.Message,
-            decrypted: UByteArray?
+            payload: ProximityPayload
         ): ApplePods {
-            var basic = AirPodsGen4(scanResult = scanResult, proximityMessage = message)
+            var basic = AirPodsGen4(scanResult = scanResult, payload = payload)
             val result = searchHistory(basic)
 
             if (result != null) basic = basic.copy(identifier = result.id)

app-common/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen4Anc.kt

@@ -6,7 +6,9 @@ import eu.darken.capod.pods.core.PodDevice
 import eu.darken.capod.pods.core.apple.ApplePods
 import eu.darken.capod.pods.core.apple.DualApplePods
 import eu.darken.capod.pods.core.apple.DualApplePodsFactory
+import eu.darken.capod.pods.core.apple.protocol.ProximityMessage
 import eu.darken.capod.pods.core.apple.protocol.ProximityPairing
+import eu.darken.capod.pods.core.apple.protocol.ProximityPayload
 import java.time.Instant
 import javax.inject.Inject
 
@@ -16,7 +18,7 @@ data class AirPodsGen4Anc(
     override val seenFirstAt: Instant = Instant.now(),
     override val seenCounter: Int = 1,
     override val scanResult: BleScanResult,
-    override val proximityMessage: ProximityPairing.Message,
+    override val payload: ProximityPayload,
     override val reliability: Float = PodDevice.BASE_CONFIDENCE,
     private val rssiAverage: Int? = null,
     private val cachedBatteryPercentage: Float? = null,
@@ -36,16 +38,15 @@ data class AirPodsGen4Anc(
 
     class Factory @Inject constructor() : DualApplePodsFactory(TAG) {
 
-        override fun isResponsible(message: ProximityPairing.Message): Boolean = message.run {
+        override fun isResponsible(message: ProximityMessage): Boolean = message.run {
             getModelInfo().full == DEVICE_CODE && length == ProximityPairing.PAIRING_MESSAGE_LENGTH
         }
 
         override fun create(
             scanResult: BleScanResult,
-            message: ProximityPairing.Message,
-            decrypted: UByteArray?
+            payload: ProximityPayload
         ): ApplePods {
-            var basic = AirPodsGen4Anc(scanResult = scanResult, proximityMessage = message)
+            var basic = AirPodsGen4Anc(scanResult = scanResult, payload = payload)
             val result = searchHistory(basic)
 
             if (result != null) basic = basic.copy(identifier = result.id)

app-common/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsMax.kt

@@ -10,7 +10,9 @@ import eu.darken.capod.pods.core.apple.ApplePods
 import eu.darken.capod.pods.core.apple.HasAppleColor
 import eu.darken.capod.pods.core.apple.SingleApplePods
 import eu.darken.capod.pods.core.apple.SingleApplePodsFactory
+import eu.darken.capod.pods.core.apple.protocol.ProximityMessage
 import eu.darken.capod.pods.core.apple.protocol.ProximityPairing
+import eu.darken.capod.pods.core.apple.protocol.ProximityPayload
 import java.time.Instant
 import javax.inject.Inject
 
@@ -20,7 +22,7 @@ data class AirPodsMax(
     override val seenFirstAt: Instant = Instant.now(),
     override val seenCounter: Int = 1,
     override val scanResult: BleScanResult,
-    override val proximityMessage: ProximityPairing.Message,
+    override val payload: ProximityPayload,
     override val reliability: Float = PodDevice.BASE_CONFIDENCE,
     private val rssiAverage: Int? = null,
 ) : SingleApplePods, HasEarDetection, HasChargeDetection, HasAppleColor {
@@ -31,23 +33,22 @@ data class AirPodsMax(
         get() = rssiAverage ?: super<SingleApplePods>.rssi
 
     override val isHeadsetBeingCharged: Boolean
-        get() = rawFlags.isBitSet(0)
+        get() = pubFlags.isBitSet(0)
 
     override val isBeingWorn: Boolean
-        get() = rawStatus.isBitSet(5)
+        get() = pubStatus.isBitSet(5)
 
     class Factory @Inject constructor() : SingleApplePodsFactory(TAG) {
 
-        override fun isResponsible(message: ProximityPairing.Message): Boolean = message.run {
+        override fun isResponsible(message: ProximityMessage): Boolean = message.run {
             getModelInfo().full == DEVICE_CODE && length == ProximityPairing.PAIRING_MESSAGE_LENGTH
         }
 
         override fun create(
             scanResult: BleScanResult,
-            message: ProximityPairing.Message,
-            decrypted: UByteArray?
+            payload: ProximityPayload
         ): ApplePods {
-            var basic = AirPodsMax(scanResult = scanResult, proximityMessage = message)
+            var basic = AirPodsMax(scanResult = scanResult, payload = payload)
             val result = searchHistory(basic)
 
             if (result != null) basic = basic.copy(identifier = result.id)

app-common/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsMaxUsbc.kt

@@ -10,7 +10,9 @@ import eu.darken.capod.pods.core.apple.ApplePods
 import eu.darken.capod.pods.core.apple.HasAppleColor
 import eu.darken.capod.pods.core.apple.SingleApplePods
 import eu.darken.capod.pods.core.apple.SingleApplePodsFactory
+import eu.darken.capod.pods.core.apple.protocol.ProximityMessage
 import eu.darken.capod.pods.core.apple.protocol.ProximityPairing
+import eu.darken.capod.pods.core.apple.protocol.ProximityPayload
 import java.time.Instant
 import javax.inject.Inject
 
@@ -20,7 +22,7 @@ data class AirPodsMaxUsbc(
     override val seenFirstAt: Instant = Instant.now(),
     override val seenCounter: Int = 1,
     override val scanResult: BleScanResult,
-    override val proximityMessage: ProximityPairing.Message,
+    override val payload: ProximityPayload,
     override val reliability: Float = PodDevice.BASE_CONFIDENCE,
     private val rssiAverage: Int? = null,
 ) : SingleApplePods, HasEarDetection, HasChargeDetection, HasAppleColor {
@@ -31,23 +33,22 @@ data class AirPodsMaxUsbc(
         get() = rssiAverage ?: super<SingleApplePods>.rssi
 
     override val isHeadsetBeingCharged: Boolean
-        get() = rawFlags.isBitSet(0)
+        get() = pubFlags.isBitSet(0)
 
     override val isBeingWorn: Boolean
-        get() = rawStatus.isBitSet(5)
+        get() = pubStatus.isBitSet(5)
 
     class Factory @Inject constructor() : SingleApplePodsFactory(TAG) {
 
-        override fun isResponsible(message: ProximityPairing.Message): Boolean = message.run {
+        override fun isResponsible(message: ProximityMessage): Boolean = message.run {
             getModelInfo().full == DEVICE_CODE && length == ProximityPairing.PAIRING_MESSAGE_LENGTH
         }
 
         override fun create(
             scanResult: BleScanResult,
-            message: ProximityPairing.Message,
-            decrypted: UByteArray?
+            payload: ProximityPayload
         ): ApplePods {
-            var basic = AirPodsMaxUsbc(scanResult = scanResult, proximityMessage = message)
+            var basic = AirPodsMaxUsbc(scanResult = scanResult, payload = payload)
             val result = searchHistory(basic)
 
             if (result != null) basic = basic.copy(identifier = result.id)

app-common/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro.kt

@@ -9,7 +9,9 @@ import eu.darken.capod.pods.core.apple.ApplePods
 import eu.darken.capod.pods.core.apple.DualApplePods
 import eu.darken.capod.pods.core.apple.DualApplePods.LidState
 import eu.darken.capod.pods.core.apple.DualApplePodsFactory
+import eu.darken.capod.pods.core.apple.protocol.ProximityMessage
 import eu.darken.capod.pods.core.apple.protocol.ProximityPairing
+import eu.darken.capod.pods.core.apple.protocol.ProximityPayload
 import java.time.Instant
 import javax.inject.Inject
 
@@ -19,8 +21,7 @@ data class AirPodsPro(
     override val seenFirstAt: Instant = Instant.now(),
     override val seenCounter: Int = 1,
     override val scanResult: BleScanResult,
-    override val proximityMessage: ProximityPairing.Message,
-    override val decryptedPayload: UByteArray?,
+    override val payload: ProximityPayload,
     override val reliability: Float = PodDevice.BASE_CONFIDENCE,
     private val rssiAverage: Int? = null,
     private val cachedBatteryPercentage: Float? = null,
@@ -56,19 +57,17 @@ data class AirPodsPro(
 
     class Factory @Inject constructor() : DualApplePodsFactory(TAG) {
 
-        override fun isResponsible(message: ProximityPairing.Message): Boolean = message.run {
+        override fun isResponsible(message: ProximityMessage): Boolean = message.run {
             getModelInfo().full == DEVICE_CODE && length == ProximityPairing.PAIRING_MESSAGE_LENGTH
         }
 
         override fun create(
             scanResult: BleScanResult,
-            message: ProximityPairing.Message,
-            decrypted: UByteArray?
+            payload: ProximityPayload
         ): ApplePods {
             var basic = AirPodsPro(
                 scanResult = scanResult,
-                proximityMessage = message,
-                decryptedPayload = decrypted
+                payload = payload,
             )
             val result = searchHistory(basic)
 

app-common/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro2.kt

@@ -9,7 +9,9 @@ import eu.darken.capod.pods.core.apple.ApplePods
 import eu.darken.capod.pods.core.apple.DualApplePods
 import eu.darken.capod.pods.core.apple.DualApplePods.LidState
 import eu.darken.capod.pods.core.apple.DualApplePodsFactory
+import eu.darken.capod.pods.core.apple.protocol.ProximityMessage
 import eu.darken.capod.pods.core.apple.protocol.ProximityPairing
+import eu.darken.capod.pods.core.apple.protocol.ProximityPayload
 import java.time.Instant
 import javax.inject.Inject
 
@@ -19,7 +21,7 @@ data class AirPodsPro2(
     override val seenFirstAt: Instant = Instant.now(),
     override val seenCounter: Int = 1,
     override val scanResult: BleScanResult,
-    override val proximityMessage: ProximityPairing.Message,
+    override val payload: ProximityPayload,
     override val reliability: Float = PodDevice.BASE_CONFIDENCE,
     private val rssiAverage: Int? = null,
     private val cachedBatteryPercentage: Float? = null,
@@ -55,16 +57,15 @@ data class AirPodsPro2(
 
     class Factory @Inject constructor() : DualApplePodsFactory(TAG) {
 
-        override fun isResponsible(message: ProximityPairing.Message): Boolean = message.run {
+        override fun isResponsible(message: ProximityMessage): Boolean = message.run {
             getModelInfo().full == DEVICE_CODE && length == ProximityPairing.PAIRING_MESSAGE_LENGTH
         }
 
         override fun create(
             scanResult: BleScanResult,
-            message: ProximityPairing.Message,
-            decrypted: UByteArray?
+            payload: ProximityPayload
         ): ApplePods {
-            var basic = AirPodsPro2(scanResult = scanResult, proximityMessage = message)
+            var basic = AirPodsPro2(scanResult = scanResult, payload = payload)
             val result = searchHistory(basic)
 
             if (result != null) basic = basic.copy(identifier = result.id)

app-common/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro2Usbc.kt

@@ -9,7 +9,9 @@ import eu.darken.capod.pods.core.apple.ApplePods
 import eu.darken.capod.pods.core.apple.DualApplePods
 import eu.darken.capod.pods.core.apple.DualApplePods.LidState
 import eu.darken.capod.pods.core.apple.DualApplePodsFactory
+import eu.darken.capod.pods.core.apple.protocol.ProximityMessage
 import eu.darken.capod.pods.core.apple.protocol.ProximityPairing
+import eu.darken.capod.pods.core.apple.protocol.ProximityPayload
 import java.time.Instant
 import javax.inject.Inject
 
@@ -19,7 +21,7 @@ data class AirPodsPro2Usbc(
     override val seenFirstAt: Instant = Instant.now(),
     override val seenCounter: Int = 1,
     override val scanResult: BleScanResult,
-    override val proximityMessage: ProximityPairing.Message,
+    override val payload: ProximityPayload,
     override val reliability: Float = PodDevice.BASE_CONFIDENCE,
     private val rssiAverage: Int? = null,
     private val cachedBatteryPercentage: Float? = null,
@@ -55,16 +57,15 @@ data class AirPodsPro2Usbc(
 
     class Factory @Inject constructor() : DualApplePodsFactory(TAG) {
 
-        override fun isResponsible(message: ProximityPairing.Message): Boolean = message.run {
+        override fun isResponsible(message: ProximityMessage): Boolean = message.run {
             getModelInfo().full == DEVICE_CODE && length == ProximityPairing.PAIRING_MESSAGE_LENGTH
         }
 
         override fun create(
             scanResult: BleScanResult,
-            message: ProximityPairing.Message,
-            decrypted: UByteArray?
+            payload: ProximityPayload
         ): ApplePods {
-            var basic = AirPodsPro2Usbc(scanResult = scanResult, proximityMessage = message)
+            var basic = AirPodsPro2Usbc(scanResult = scanResult, payload = payload)
             val result = searchHistory(basic)
 
             if (result != null) basic = basic.copy(identifier = result.id)

app-common/src/main/java/eu/darken/capod/pods/core/apple/airpods/HasStateDetectionAirPods.kt

@@ -9,7 +9,7 @@ import eu.darken.capod.pods.core.apple.ApplePods
 interface HasStateDetectionAirPods : HasStateDetection, ApplePods {
 
     override val state: ConnectionState
-        get() = ConnectionState.values().firstOrNull { rawSuffix == it.raw } ?: ConnectionState.UNKNOWN
+        get() = ConnectionState.entries.firstOrNull { pubSuffix == it.raw } ?: ConnectionState.UNKNOWN
 
     enum class ConnectionState(val raw: UByte?, @StringRes val labelRes: Int) : HasStateDetection.State {
         DISCONNECTED(0x00, R.string.pods_connection_state_disconnected_label),

app-common/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsFitPro.kt

@@ -6,7 +6,9 @@ import eu.darken.capod.pods.core.PodDevice
 import eu.darken.capod.pods.core.apple.ApplePods
 import eu.darken.capod.pods.core.apple.DualApplePods
 import eu.darken.capod.pods.core.apple.DualApplePodsFactory
+import eu.darken.capod.pods.core.apple.protocol.ProximityMessage
 import eu.darken.capod.pods.core.apple.protocol.ProximityPairing
+import eu.darken.capod.pods.core.apple.protocol.ProximityPayload
 import java.time.Instant
 import javax.inject.Inject
 
@@ -16,7 +18,7 @@ data class BeatsFitPro(
     override val seenFirstAt: Instant = Instant.now(),
     override val seenCounter: Int = 1,
     override val scanResult: BleScanResult,
-    override val proximityMessage: ProximityPairing.Message,
+    override val payload: ProximityPayload,
     override val reliability: Float = PodDevice.BASE_CONFIDENCE,
     private val rssiAverage: Int? = null,
     private val cachedBatteryPercentage: Float? = null,
@@ -36,16 +38,15 @@ data class BeatsFitPro(
 
     class Factory @Inject constructor() : DualApplePodsFactory(TAG) {
 
-        override fun isResponsible(message: ProximityPairing.Message): Boolean = message.run {
+        override fun isResponsible(message: ProximityMessage): Boolean = message.run {
             getModelInfo().full == DEVICE_CODE && length == ProximityPairing.PAIRING_MESSAGE_LENGTH
         }
 
         override fun create(
             scanResult: BleScanResult,
-            message: ProximityPairing.Message,
-            decrypted: UByteArray?
+            payload: ProximityPayload
         ): ApplePods {
-            var basic = BeatsFitPro(scanResult = scanResult, proximityMessage = message)
+            var basic = BeatsFitPro(scanResult = scanResult, payload = payload)
             val result = searchHistory(basic)
 
             if (result != null) basic = basic.copy(identifier = result.id)

app-common/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsFlex.kt

@@ -6,7 +6,9 @@ import eu.darken.capod.pods.core.PodDevice
 import eu.darken.capod.pods.core.apple.ApplePods
 import eu.darken.capod.pods.core.apple.SingleApplePods
 import eu.darken.capod.pods.core.apple.SingleApplePodsFactory
+import eu.darken.capod.pods.core.apple.protocol.ProximityMessage
 import eu.darken.capod.pods.core.apple.protocol.ProximityPairing
+import eu.darken.capod.pods.core.apple.protocol.ProximityPayload
 import java.time.Instant
 import javax.inject.Inject
 
@@ -16,7 +18,7 @@ data class BeatsFlex(
     override val seenFirstAt: Instant = Instant.now(),
     override val seenCounter: Int = 1,
     override val scanResult: BleScanResult,
-    override val proximityMessage: ProximityPairing.Message,
+    override val payload: ProximityPayload,
     override val reliability: Float = PodDevice.BASE_CONFIDENCE,
     private val rssiAverage: Int? = null,
 ) : SingleApplePods {
@@ -28,16 +30,15 @@ data class BeatsFlex(
 
     class Factory @Inject constructor() : SingleApplePodsFactory(TAG) {
 
-        override fun isResponsible(message: ProximityPairing.Message): Boolean = message.run {
+        override fun isResponsible(message: ProximityMessage): Boolean = message.run {
             getModelInfo().full == DEVICE_CODE && length == ProximityPairing.PAIRING_MESSAGE_LENGTH
         }
 
         override fun create(
             scanResult: BleScanResult,
-            message: ProximityPairing.Message,
-            decrypted: UByteArray?
+            payload: ProximityPayload
         ): ApplePods {
-            var basic = BeatsFlex(scanResult = scanResult, proximityMessage = message)
+            var basic = BeatsFlex(scanResult = scanResult, payload = payload)
             val result = searchHistory(basic)
 
             if (result != null) basic = basic.copy(identifier = result.id)

app-common/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsSolo3.kt

@@ -6,7 +6,9 @@ import eu.darken.capod.pods.core.PodDevice
 import eu.darken.capod.pods.core.apple.ApplePods
 import eu.darken.capod.pods.core.apple.SingleApplePods
 import eu.darken.capod.pods.core.apple.SingleApplePodsFactory
+import eu.darken.capod.pods.core.apple.protocol.ProximityMessage
 import eu.darken.capod.pods.core.apple.protocol.ProximityPairing
+import eu.darken.capod.pods.core.apple.protocol.ProximityPayload
 import java.time.Instant
 import javax.inject.Inject
 
@@ -16,7 +18,7 @@ data class BeatsSolo3(
     override val seenFirstAt: Instant = Instant.now(),
     override val seenCounter: Int = 1,
     override val scanResult: BleScanResult,
-    override val proximityMessage: ProximityPairing.Message,
+    override val payload: ProximityPayload,
     override val reliability: Float = PodDevice.BASE_CONFIDENCE,
     private val rssiAverage: Int? = null,
 ) : SingleApplePods {
@@ -27,16 +29,15 @@ data class BeatsSolo3(
 
     class Factory @Inject constructor() : SingleApplePodsFactory(TAG) {
 
-        override fun isResponsible(message: ProximityPairing.Message): Boolean = message.run {
+        override fun isResponsible(message: ProximityMessage): Boolean = message.run {
             getModelInfo().full == DEVICE_CODE && length == ProximityPairing.PAIRING_MESSAGE_LENGTH
         }
 
         override fun create(
             scanResult: BleScanResult,
-            message: ProximityPairing.Message,
-            decrypted: UByteArray?
+            payload: ProximityPayload
         ): ApplePods {
-            var basic = BeatsSolo3(scanResult = scanResult, proximityMessage = message)
+            var basic = BeatsSolo3(scanResult = scanResult, payload = payload)
             val result = searchHistory(basic)
 
             if (result != null) basic = basic.copy(identifier = result.id)

app-common/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsStudio3.kt

@@ -6,7 +6,9 @@ import eu.darken.capod.pods.core.PodDevice
 import eu.darken.capod.pods.core.apple.ApplePods
 import eu.darken.capod.pods.core.apple.SingleApplePods
 import eu.darken.capod.pods.core.apple.SingleApplePodsFactory
+import eu.darken.capod.pods.core.apple.protocol.ProximityMessage
 import eu.darken.capod.pods.core.apple.protocol.ProximityPairing
+import eu.darken.capod.pods.core.apple.protocol.ProximityPayload
 import java.time.Instant
 import javax.inject.Inject
 
@@ -16,7 +18,7 @@ data class BeatsStudio3(
     override val seenFirstAt: Instant = Instant.now(),
     override val seenCounter: Int = 1,
     override val scanResult: BleScanResult,
-    override val proximityMessage: ProximityPairing.Message,
+    override val payload: ProximityPayload,
     override val reliability: Float = PodDevice.BASE_CONFIDENCE,
     private val rssiAverage: Int? = null,
 ) : SingleApplePods {
@@ -25,16 +27,15 @@ data class BeatsStudio3(
 
     class Factory @Inject constructor() : SingleApplePodsFactory(TAG) {
 
-        override fun isResponsible(message: ProximityPairing.Message): Boolean = message.run {
+        override fun isResponsible(message: ProximityMessage): Boolean = message.run {
             getModelInfo().dirty == DEVICE_CODE_DIRTY && length == ProximityPairing.PAIRING_MESSAGE_LENGTH
         }
 
         override fun create(
             scanResult: BleScanResult,
-            message: ProximityPairing.Message,
-            decrypted: UByteArray?
+            payload: ProximityPayload
         ): ApplePods {
-            var basic = BeatsStudio3(scanResult = scanResult, proximityMessage = message)
+            var basic = BeatsStudio3(scanResult = scanResult, payload = payload)
             val result = searchHistory(basic)
 
             if (result != null) basic = basic.copy(identifier = result.id)

app-common/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsX.kt

@@ -6,7 +6,9 @@ import eu.darken.capod.pods.core.PodDevice
 import eu.darken.capod.pods.core.apple.ApplePods
 import eu.darken.capod.pods.core.apple.SingleApplePods
 import eu.darken.capod.pods.core.apple.SingleApplePodsFactory
+import eu.darken.capod.pods.core.apple.protocol.ProximityMessage
 import eu.darken.capod.pods.core.apple.protocol.ProximityPairing
+import eu.darken.capod.pods.core.apple.protocol.ProximityPayload
 import java.time.Instant
 import javax.inject.Inject
 
@@ -16,7 +18,7 @@ data class BeatsX(
     override val seenFirstAt: Instant = Instant.now(),
     override val seenCounter: Int = 1,
     override val scanResult: BleScanResult,
-    override val proximityMessage: ProximityPairing.Message,
+    override val payload: ProximityPayload,
     override val reliability: Float = PodDevice.BASE_CONFIDENCE,
     private val rssiAverage: Int? = null,
 ) : SingleApplePods {
@@ -28,16 +30,15 @@ data class BeatsX(
 
     class Factory @Inject constructor() : SingleApplePodsFactory(TAG) {
 
-        override fun isResponsible(message: ProximityPairing.Message): Boolean = message.run {
+        override fun isResponsible(message: ProximityMessage): Boolean = message.run {
             getModelInfo().full == DEVICE_CODE && length == ProximityPairing.PAIRING_MESSAGE_LENGTH
         }
 
         override fun create(
             scanResult: BleScanResult,
-            message: ProximityPairing.Message,
-            decrypted: UByteArray?
+            payload: ProximityPayload
         ): ApplePods {
-            var basic = BeatsX(scanResult = scanResult, proximityMessage = message)
+            var basic = BeatsX(scanResult = scanResult, payload = payload)
             val result = searchHistory(basic)
 
             if (result != null) basic = basic.copy(identifier = result.id)

app-common/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeats3.kt

@@ -6,7 +6,9 @@ import eu.darken.capod.pods.core.PodDevice
 import eu.darken.capod.pods.core.apple.ApplePods
 import eu.darken.capod.pods.core.apple.SingleApplePods
 import eu.darken.capod.pods.core.apple.SingleApplePodsFactory
+import eu.darken.capod.pods.core.apple.protocol.ProximityMessage
 import eu.darken.capod.pods.core.apple.protocol.ProximityPairing
+import eu.darken.capod.pods.core.apple.protocol.ProximityPayload
 import java.time.Instant
 import javax.inject.Inject
 
@@ -16,7 +18,7 @@ data class PowerBeats3(
     override val seenFirstAt: Instant = Instant.now(),
     override val seenCounter: Int = 1,
     override val scanResult: BleScanResult,
-    override val proximityMessage: ProximityPairing.Message,
+    override val payload: ProximityPayload,
     override val reliability: Float = PodDevice.BASE_CONFIDENCE,
     private val rssiAverage: Int? = null,
 ) : SingleApplePods {
@@ -28,16 +30,15 @@ data class PowerBeats3(
 
     class Factory @Inject constructor() : SingleApplePodsFactory(TAG) {
 
-        override fun isResponsible(message: ProximityPairing.Message): Boolean = message.run {
+        override fun isResponsible(message: ProximityMessage): Boolean = message.run {
             getModelInfo().full == DEVICE_CODE && length == ProximityPairing.PAIRING_MESSAGE_LENGTH
         }
 
         override fun create(
             scanResult: BleScanResult,
-            message: ProximityPairing.Message,
-            decrypted: UByteArray?
+            payload: ProximityPayload
         ): ApplePods {
-            var basic = PowerBeats3(scanResult = scanResult, proximityMessage = message)
+            var basic = PowerBeats3(scanResult = scanResult, payload = payload)
             val result = searchHistory(basic)
 
             if (result != null) basic = basic.copy(identifier = result.id)

app-common/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeats4.kt

@@ -7,7 +7,9 @@ import eu.darken.capod.pods.core.apple.ApplePods
 import eu.darken.capod.pods.core.apple.SingleApplePods
 import eu.darken.capod.pods.core.apple.SingleApplePodsFactory
 import eu.darken.capod.pods.core.apple.airpods.HasStateDetectionAirPods
+import eu.darken.capod.pods.core.apple.protocol.ProximityMessage
 import eu.darken.capod.pods.core.apple.protocol.ProximityPairing
+import eu.darken.capod.pods.core.apple.protocol.ProximityPayload
 import java.time.Instant
 import javax.inject.Inject
 
@@ -17,7 +19,7 @@ data class PowerBeats4(
     override val seenFirstAt: Instant = Instant.now(),
     override val seenCounter: Int = 1,
     override val scanResult: BleScanResult,
-    override val proximityMessage: ProximityPairing.Message,
+    override val payload: ProximityPayload,
     override val reliability: Float = PodDevice.BASE_CONFIDENCE,
     private val rssiAverage: Int? = null,
 ) : SingleApplePods, HasStateDetectionAirPods {
@@ -29,16 +31,15 @@ data class PowerBeats4(
 
     class Factory @Inject constructor() : SingleApplePodsFactory(TAG) {
 
-        override fun isResponsible(message: ProximityPairing.Message): Boolean = message.run {
+        override fun isResponsible(message: ProximityMessage): Boolean = message.run {
             getModelInfo().full == DEVICE_CODE && length == ProximityPairing.PAIRING_MESSAGE_LENGTH
         }
 
         override fun create(
             scanResult: BleScanResult,
-            message: ProximityPairing.Message,
-            decrypted: UByteArray?
+            payload: ProximityPayload
         ): ApplePods {
-            var basic = PowerBeats4(scanResult = scanResult, proximityMessage = message)
+            var basic = PowerBeats4(scanResult = scanResult, payload = payload)
             val result = searchHistory(basic)
 
             if (result != null) basic = basic.copy(identifier = result.id)

app-common/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsPro.kt

@@ -6,7 +6,9 @@ import eu.darken.capod.pods.core.PodDevice
 import eu.darken.capod.pods.core.apple.ApplePods
 import eu.darken.capod.pods.core.apple.DualApplePods
 import eu.darken.capod.pods.core.apple.DualApplePodsFactory
+import eu.darken.capod.pods.core.apple.protocol.ProximityMessage
 import eu.darken.capod.pods.core.apple.protocol.ProximityPairing
+import eu.darken.capod.pods.core.apple.protocol.ProximityPayload
 import java.time.Instant
 import javax.inject.Inject
 
@@ -16,7 +18,7 @@ data class PowerBeatsPro(
     override val seenFirstAt: Instant = Instant.now(),
     override val seenCounter: Int = 1,
     override val scanResult: BleScanResult,
-    override val proximityMessage: ProximityPairing.Message,
+    override val payload: ProximityPayload,
     override val reliability: Float = PodDevice.BASE_CONFIDENCE,
     private val rssiAverage: Int? = null,
     private val cachedBatteryPercentage: Float? = null,
@@ -36,16 +38,15 @@ data class PowerBeatsPro(
 
     class Factory @Inject constructor() : DualApplePodsFactory(TAG) {
 
-        override fun isResponsible(message: ProximityPairing.Message): Boolean = message.run {
+        override fun isResponsible(message: ProximityMessage): Boolean = message.run {
             getModelInfo().dirty == DEVICE_CODE_DIRTY && length == ProximityPairing.PAIRING_MESSAGE_LENGTH
         }
 
         override fun create(
             scanResult: BleScanResult,
-            message: ProximityPairing.Message,
-            decrypted: UByteArray?
+            payload: ProximityPayload
         ): ApplePods {
-            var basic = PowerBeatsPro(scanResult = scanResult, proximityMessage = message)
+            var basic = PowerBeatsPro(scanResult = scanResult, payload = payload)
             val result = searchHistory(basic)
 
             if (result != null) basic = basic.copy(identifier = result.id)

app-common/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsGen1.kt

@@ -1,15 +1,16 @@
 package eu.darken.capod.pods.core.apple.misc
 
 import eu.darken.capod.common.bluetooth.BleScanResult
-import eu.darken.capod.common.debug.logging.log
 import eu.darken.capod.common.debug.logging.logTag
-import eu.darken.capod.common.isBitSet
-import eu.darken.capod.common.lowerNibble
-import eu.darken.capod.common.upperNibble
-import eu.darken.capod.pods.core.*
+import eu.darken.capod.pods.core.HasCase
+import eu.darken.capod.pods.core.HasChargeDetectionDual
+import eu.darken.capod.pods.core.HasEarDetectionDual
+import eu.darken.capod.pods.core.PodDevice
 import eu.darken.capod.pods.core.apple.ApplePods
 import eu.darken.capod.pods.core.apple.ApplePodsFactory
-import eu.darken.capod.pods.core.apple.protocol.ProximityPairing
+import eu.darken.capod.pods.core.apple.DualApplePods
+import eu.darken.capod.pods.core.apple.protocol.ProximityMessage
+import eu.darken.capod.pods.core.apple.protocol.ProximityPayload
 import java.time.Instant
 import javax.inject.Inject
 
@@ -18,118 +19,38 @@ import javax.inject.Inject
  * Similar data structure but a lot of placeholder values or hardcoded values
  * Marketed as TWS i99999
  */
-data class FakeAirPodsGen1 constructor(
+data class FakeAirPodsGen1(
     override val identifier: PodDevice.Id = PodDevice.Id(),
     override val seenLastAt: Instant = Instant.now(),
     override val seenFirstAt: Instant = Instant.now(),
     override val seenCounter: Int = 1,
     override val scanResult: BleScanResult,
-    override val proximityMessage: ProximityPairing.Message,
+    override val payload: ProximityPayload,
     override val reliability: Float = PodDevice.BASE_CONFIDENCE,
     private val rssiAverage: Int? = null,
     private val cachedBatteryPercentage: Float? = null,
-) : ApplePods, DualPodDevice, HasEarDetectionDual, HasChargeDetectionDual, HasCase {
+) : DualApplePods, HasEarDetectionDual, HasChargeDetectionDual, HasCase {
 
     override val model: PodDevice.Model = PodDevice.Model.FAKE_AIRPODS_GEN1
 
-    override val rssi: Int
-        get() = rssiAverage ?: super<ApplePods>.rssi
-
-    /**
-     * Normally values for the left pod are in the lower nibbles, if the left pod is primary (microphone)
-     * If the right pod is the primary, the values are flipped.
-     */
-    val areValuesFlipped: Boolean
-        get() = !rawStatus.isBitSet(5)
-
-    override val batteryLeftPodPercent: Float?
-        get() {
-            val value = when (areValuesFlipped) {
-                true -> rawPodsBattery.upperNibble.toInt()
-                false -> rawPodsBattery.lowerNibble.toInt()
-            }
-            return when (value) {
-                15 -> null
-                else -> if (value > 10) {
-                    log { "Left pod: Above 100% battery: $value" }
-                    1.0f
-                } else {
-                    (value / 10f)
-                }
-            }
-        }
-
-    override val batteryRightPodPercent: Float?
-        get() {
-            val value = when (areValuesFlipped) {
-                true -> rawPodsBattery.lowerNibble.toInt()
-                false -> rawPodsBattery.upperNibble.toInt()
-            }
-            return when (value) {
-                15 -> null
-                else -> if (value > 10) {
-                    log { "Right pod: Above 100% battery: $value" }
-                    1.0f
-                } else {
-                    value / 10f
-                }
-            }
-        }
-
-    private val isThisPodInThecase: Boolean
-        get() = rawStatus.isBitSet(6)
-
-    override val isLeftPodInEar: Boolean
-        get() = when (areValuesFlipped xor isThisPodInThecase) {
-            true -> rawStatus.isBitSet(3)
-            false -> rawStatus.isBitSet(1)
-        }
-
-    override val isRightPodInEar: Boolean
-        get() = when (areValuesFlipped xor isThisPodInThecase) {
-            true -> rawStatus.isBitSet(1)
-            false -> rawStatus.isBitSet(3)
-        }
-
-    override val isLeftPodCharging: Boolean
-        get() = when (areValuesFlipped) {
-            false -> rawFlags.isBitSet(0)
-            true -> rawFlags.isBitSet(1)
-        }
-
-    override val isRightPodCharging: Boolean
-        get() = when (areValuesFlipped) {
-            false -> rawFlags.isBitSet(1)
-            true -> rawFlags.isBitSet(0)
-        }
-
     override val batteryCasePercent: Float?
-        get() = when (val value = rawCaseBattery.toInt()) {
-            15 -> cachedBatteryPercentage
-            else -> if (value > 10) {
-                log { "Case: Above 100% battery: $value" }
-                1.0f
-            } else {
-                value / 10f
-            }
-        }
+        get() = super.batteryCasePercent ?: cachedBatteryPercentage
 
-    override val isCaseCharging: Boolean
-        get() = rawFlags.isBitSet(2)
+    override val rssi: Int
+        get() = rssiAverage ?: super<DualApplePods>.rssi
 
     class Factory @Inject constructor() : ApplePodsFactory<FakeAirPodsGen1>(TAG) {
 
-        override fun isResponsible(message: ProximityPairing.Message): Boolean = message.run {
+        override fun isResponsible(message: ProximityMessage): Boolean = message.run {
             // Official message length is 19HEX, i.e. binary 25, did they copy this wrong?
             getModelInfo().full == DEVICE_CODE && length == 19
         }
 
         override fun create(
             scanResult: BleScanResult,
-            message: ProximityPairing.Message,
-            decrypted: UByteArray?
+            payload: ProximityPayload
         ): ApplePods {
-            var basic = FakeAirPodsGen1(scanResult = scanResult, proximityMessage = message)
+            var basic = FakeAirPodsGen1(scanResult = scanResult, payload = payload)
             val result = searchHistory(basic)
 
             if (result != null) basic = basic.copy(identifier = result.id)

app-common/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsGen2.kt

@@ -1,133 +1,54 @@
 package eu.darken.capod.pods.core.apple.misc
 
 import eu.darken.capod.common.bluetooth.BleScanResult
-import eu.darken.capod.common.debug.logging.log
 import eu.darken.capod.common.debug.logging.logTag
-import eu.darken.capod.common.isBitSet
-import eu.darken.capod.common.lowerNibble
-import eu.darken.capod.common.upperNibble
-import eu.darken.capod.pods.core.*
+import eu.darken.capod.pods.core.HasCase
+import eu.darken.capod.pods.core.HasChargeDetectionDual
+import eu.darken.capod.pods.core.HasEarDetectionDual
+import eu.darken.capod.pods.core.PodDevice
 import eu.darken.capod.pods.core.apple.ApplePods
 import eu.darken.capod.pods.core.apple.ApplePodsFactory
-import eu.darken.capod.pods.core.apple.protocol.ProximityPairing
+import eu.darken.capod.pods.core.apple.DualApplePods
+import eu.darken.capod.pods.core.apple.protocol.ProximityMessage
+import eu.darken.capod.pods.core.apple.protocol.ProximityPayload
 import java.time.Instant
 import javax.inject.Inject
 
 /**
  * Similar data structure but a lot of placeholder values or hardcoded values
  */
-data class FakeAirPodsGen2 constructor(
+data class FakeAirPodsGen2(
     override val identifier: PodDevice.Id = PodDevice.Id(),
     override val seenLastAt: Instant = Instant.now(),
     override val seenFirstAt: Instant = Instant.now(),
     override val seenCounter: Int = 1,
     override val scanResult: BleScanResult,
-    override val proximityMessage: ProximityPairing.Message,
+    override val payload: ProximityPayload,
     override val reliability: Float = PodDevice.BASE_CONFIDENCE,
     private val rssiAverage: Int? = null,
     private val cachedBatteryPercentage: Float? = null,
-) : ApplePods, DualPodDevice, HasEarDetectionDual, HasChargeDetectionDual, HasCase {
+) : DualApplePods, HasEarDetectionDual, HasChargeDetectionDual, HasCase {
 
     override val model: PodDevice.Model = PodDevice.Model.FAKE_AIRPODS_GEN2
 
     override val rssi: Int
-        get() = rssiAverage ?: super<ApplePods>.rssi
-
-    /**
-     * Normally values for the left pod are in the lower nibbles, if the left pod is primary (microphone)
-     * If the right pod is the primary, the values are flipped.
-     */
-    val areValuesFlipped: Boolean
-        get() = !rawStatus.isBitSet(5)
-
-    override val batteryLeftPodPercent: Float?
-        get() {
-            val value = when (areValuesFlipped) {
-                true -> rawPodsBattery.upperNibble.toInt()
-                false -> rawPodsBattery.lowerNibble.toInt()
-            }
-            return when (value) {
-                15 -> null
-                else -> if (value > 10) {
-                    log { "Left pod: Above 100% battery: $value" }
-                    1.0f
-                } else {
-                    (value / 10f)
-                }
-            }
-        }
-
-    override val batteryRightPodPercent: Float?
-        get() {
-            val value = when (areValuesFlipped) {
-                true -> rawPodsBattery.lowerNibble.toInt()
-                false -> rawPodsBattery.upperNibble.toInt()
-            }
-            return when (value) {
-                15 -> null
-                else -> if (value > 10) {
-                    log { "Right pod: Above 100% battery: $value" }
-                    1.0f
-                } else {
-                    value / 10f
-                }
-            }
-        }
-
-    private val isThisPodInThecase: Boolean
-        get() = rawStatus.isBitSet(6)
-
-    override val isLeftPodInEar: Boolean
-        get() = when (areValuesFlipped xor isThisPodInThecase) {
-            true -> rawStatus.isBitSet(3)
-            false -> rawStatus.isBitSet(1)
-        }
-
-    override val isRightPodInEar: Boolean
-        get() = when (areValuesFlipped xor isThisPodInThecase) {
-            true -> rawStatus.isBitSet(1)
-            false -> rawStatus.isBitSet(3)
-        }
-
-    override val isLeftPodCharging: Boolean
-        get() = when (areValuesFlipped) {
-            false -> rawFlags.isBitSet(0)
-            true -> rawFlags.isBitSet(1)
-        }
-
-    override val isRightPodCharging: Boolean
-        get() = when (areValuesFlipped) {
-            false -> rawFlags.isBitSet(1)
-            true -> rawFlags.isBitSet(0)
-        }
+        get() = rssiAverage ?: super<DualApplePods>.rssi
 
     override val batteryCasePercent: Float?
-        get() = when (val value = rawCaseBattery.toInt()) {
-            15 -> cachedBatteryPercentage
-            else -> if (value > 10) {
-                log { "Case: Above 100% battery: $value" }
-                1.0f
-            } else {
-                value / 10f
-            }
-        }
-
-    override val isCaseCharging: Boolean
-        get() = rawFlags.isBitSet(2)
+        get() = super.batteryCasePercent ?: cachedBatteryPercentage
 
     class Factory @Inject constructor() : ApplePodsFactory<FakeAirPodsGen2>(TAG) {
 
-        override fun isResponsible(message: ProximityPairing.Message): Boolean = message.run {
+        override fun isResponsible(message: ProximityMessage): Boolean = message.run {
             // Official message length is 19HEX, i.e. binary 25, did they copy this wrong?
             getModelInfo().full == DEVICE_CODE && length == 19
         }
 
         override fun create(
             scanResult: BleScanResult,
-            message: ProximityPairing.Message,
-            decrypted: UByteArray?
+            payload: ProximityPayload
         ): ApplePods {
-            var basic = FakeAirPodsGen2(scanResult = scanResult, proximityMessage = message)
+            var basic = FakeAirPodsGen2(scanResult = scanResult, payload = payload)
             val result = searchHistory(basic)
 
             if (result != null) basic = basic.copy(identifier = result.id)

app-common/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsGen3.kt

@@ -1,15 +1,16 @@
 package eu.darken.capod.pods.core.apple.misc
 
 import eu.darken.capod.common.bluetooth.BleScanResult
-import eu.darken.capod.common.debug.logging.log
 import eu.darken.capod.common.debug.logging.logTag
-import eu.darken.capod.common.isBitSet
-import eu.darken.capod.common.lowerNibble
-import eu.darken.capod.common.upperNibble
-import eu.darken.capod.pods.core.*
+import eu.darken.capod.pods.core.HasCase
+import eu.darken.capod.pods.core.HasChargeDetectionDual
+import eu.darken.capod.pods.core.HasEarDetectionDual
+import eu.darken.capod.pods.core.PodDevice
 import eu.darken.capod.pods.core.apple.ApplePods
 import eu.darken.capod.pods.core.apple.ApplePodsFactory
-import eu.darken.capod.pods.core.apple.protocol.ProximityPairing
+import eu.darken.capod.pods.core.apple.DualApplePods
+import eu.darken.capod.pods.core.apple.protocol.ProximityMessage
+import eu.darken.capod.pods.core.apple.protocol.ProximityPayload
 import java.time.Instant
 import javax.inject.Inject
 
@@ -18,118 +19,38 @@ import javax.inject.Inject
  * Shorter data structure.
  * https://discord.com/channels/548521543039189022/927235844127993866/1054404630118924308
  */
-data class FakeAirPodsGen3 constructor(
+data class FakeAirPodsGen3(
     override val identifier: PodDevice.Id = PodDevice.Id(),
     override val seenLastAt: Instant = Instant.now(),
     override val seenFirstAt: Instant = Instant.now(),
     override val seenCounter: Int = 1,
     override val scanResult: BleScanResult,
-    override val proximityMessage: ProximityPairing.Message,
+    override val payload: ProximityPayload,
     override val reliability: Float = PodDevice.BASE_CONFIDENCE,
     private val rssiAverage: Int? = null,
     private val cachedBatteryPercentage: Float? = null,
-) : ApplePods, DualPodDevice, HasEarDetectionDual, HasChargeDetectionDual, HasCase {
+) : DualApplePods, HasEarDetectionDual, HasChargeDetectionDual, HasCase {
 
     override val model: PodDevice.Model = PodDevice.Model.FAKE_AIRPODS_GEN3
 
     override val rssi: Int
-        get() = rssiAverage ?: super<ApplePods>.rssi
-
-    /**
-     * Normally values for the left pod are in the lower nibbles, if the left pod is primary (microphone)
-     * If the right pod is the primary, the values are flipped.
-     */
-    val areValuesFlipped: Boolean
-        get() = !rawStatus.isBitSet(5)
-
-    override val batteryLeftPodPercent: Float?
-        get() {
-            val value = when (areValuesFlipped) {
-                true -> rawPodsBattery.upperNibble.toInt()
-                false -> rawPodsBattery.lowerNibble.toInt()
-            }
-            return when (value) {
-                15 -> null
-                else -> if (value > 10) {
-                    log { "Left pod: Above 100% battery: $value" }
-                    1.0f
-                } else {
-                    (value / 10f)
-                }
-            }
-        }
-
-    override val batteryRightPodPercent: Float?
-        get() {
-            val value = when (areValuesFlipped) {
-                true -> rawPodsBattery.lowerNibble.toInt()
-                false -> rawPodsBattery.upperNibble.toInt()
-            }
-            return when (value) {
-                15 -> null
-                else -> if (value > 10) {
-                    log { "Right pod: Above 100% battery: $value" }
-                    1.0f
-                } else {
-                    value / 10f
-                }
-            }
-        }
-
-    override val isLeftPodCharging: Boolean
-        get() = when (areValuesFlipped) {
-            false -> rawFlags.isBitSet(0)
-            true -> rawFlags.isBitSet(1)
-        }
-
-    override val isRightPodCharging: Boolean
-        get() = when (areValuesFlipped) {
-            false -> rawFlags.isBitSet(1)
-            true -> rawFlags.isBitSet(0)
-        }
-
-    private val isThisPodInThecase: Boolean
-        get() = rawStatus.isBitSet(6)
-
-    override val isLeftPodInEar: Boolean
-        get() = when (areValuesFlipped xor isThisPodInThecase) {
-            true -> rawStatus.isBitSet(3)
-            false -> rawStatus.isBitSet(1)
-        }
-
-    override val isRightPodInEar: Boolean
-        get() = when (areValuesFlipped xor isThisPodInThecase) {
-            true -> rawStatus.isBitSet(1)
-            false -> rawStatus.isBitSet(3)
-        }
+        get() = rssiAverage ?: super<DualApplePods>.rssi
 
     override val batteryCasePercent: Float?
-        get() = when (val value = rawCaseBattery.toInt()) {
-            15 -> cachedBatteryPercentage
-            else -> if (value > 10) {
-                log { "Case: Above 100% battery: $value" }
-                1.0f
-            } else {
-                value / 10f
-            }
-        }
-
-    override val isCaseCharging: Boolean
-        get() = rawFlags.isBitSet(2)
+        get() = super.batteryCasePercent ?: cachedBatteryPercentage
 
     class Factory @Inject constructor() : ApplePodsFactory<FakeAirPodsGen3>(TAG) {
 
-        override fun isResponsible(message: ProximityPairing.Message): Boolean = message.run {
+        override fun isResponsible(message: ProximityMessage): Boolean = message.run {
             // Official message length is 19HEX, i.e. binary 25, did they copy this wrong?
             getModelInfo().full == DEVICE_CODE && length == 19
         }
 
         override fun create(
             scanResult: BleScanResult,
-            message: ProximityPairing.Message,
-            decrypted: UByteArray?
+            payload: ProximityPayload
         ): ApplePods {
-            var basic = FakeAirPodsGen3(scanResult = scanResult, proximityMessage = message)
+            var basic = FakeAirPodsGen3(scanResult = scanResult, payload = payload)
             val result = searchHistory(basic)
 
             if (result != null) basic = basic.copy(identifier = result.id)

app-common/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsPro.kt

@@ -3,15 +3,16 @@ package eu.darken.capod.pods.core.apple.misc
 import androidx.annotation.DrawableRes
 import eu.darken.capod.common.R
 import eu.darken.capod.common.bluetooth.BleScanResult
-import eu.darken.capod.common.debug.logging.log
 import eu.darken.capod.common.debug.logging.logTag
-import eu.darken.capod.common.isBitSet
-import eu.darken.capod.common.lowerNibble
-import eu.darken.capod.common.upperNibble
-import eu.darken.capod.pods.core.*
+import eu.darken.capod.pods.core.HasCase
+import eu.darken.capod.pods.core.HasChargeDetectionDual
+import eu.darken.capod.pods.core.HasEarDetectionDual
+import eu.darken.capod.pods.core.PodDevice
 import eu.darken.capod.pods.core.apple.ApplePods
 import eu.darken.capod.pods.core.apple.ApplePodsFactory
-import eu.darken.capod.pods.core.apple.protocol.ProximityPairing
+import eu.darken.capod.pods.core.apple.DualApplePods
+import eu.darken.capod.pods.core.apple.protocol.ProximityMessage
+import eu.darken.capod.pods.core.apple.protocol.ProximityPayload
 import java.time.Instant
 import javax.inject.Inject
 
@@ -20,17 +21,17 @@ import javax.inject.Inject
  * Shorter data structure.
  * https://discord.com/channels/548521543039189022/927235844127993866/962068944196358234
  */
-data class FakeAirPodsPro constructor(
+data class FakeAirPodsPro(
     override val identifier: PodDevice.Id = PodDevice.Id(),
     override val seenLastAt: Instant = Instant.now(),
     override val seenFirstAt: Instant = Instant.now(),
     override val seenCounter: Int = 1,
     override val scanResult: BleScanResult,
-    override val proximityMessage: ProximityPairing.Message,
+    override val payload: ProximityPayload,
     override val reliability: Float = PodDevice.BASE_CONFIDENCE,
     private val rssiAverage: Int? = null,
     private val cachedBatteryPercentage: Float? = null,
-) : ApplePods, DualPodDevice, HasChargeDetectionDual, HasEarDetectionDual, HasCase {
+) : DualApplePods, HasChargeDetectionDual, HasEarDetectionDual, HasCase {
 
     override val model: PodDevice.Model = PodDevice.Model.FAKE_AIRPODS_PRO
 
@@ -51,103 +52,23 @@ data class FakeAirPodsPro constructor(
         get() = R.drawable.devic_airpods_pro2_right
 
     override val rssi: Int
-        get() = rssiAverage ?: super<ApplePods>.rssi
-
-    /**
-     * Normally values for the left pod are in the lower nibbles, if the left pod is primary (microphone)
-     * If the right pod is the primary, the values are flipped.
-     */
-    val areValuesFlipped: Boolean
-        get() = !rawStatus.isBitSet(5)
-
-    override val batteryLeftPodPercent: Float?
-        get() {
-            val value = when (areValuesFlipped) {
-                true -> rawPodsBattery.upperNibble.toInt()
-                false -> rawPodsBattery.lowerNibble.toInt()
-            }
-            return when (value) {
-                15 -> null
-                else -> if (value > 10) {
-                    log { "Left pod: Above 100% battery: $value" }
-                    1.0f
-                } else {
-                    (value / 10f)
-                }
-            }
-        }
-
-    override val batteryRightPodPercent: Float?
-        get() {
-            val value = when (areValuesFlipped) {
-                true -> rawPodsBattery.lowerNibble.toInt()
-                false -> rawPodsBattery.upperNibble.toInt()
-            }
-            return when (value) {
-                15 -> null
-                else -> if (value > 10) {
-                    log { "Right pod: Above 100% battery: $value" }
-                    1.0f
-                } else {
-                    value / 10f
-                }
-            }
-        }
-
-    override val isLeftPodCharging: Boolean
-        get() = when (areValuesFlipped) {
-            false -> rawFlags.isBitSet(0)
-            true -> rawFlags.isBitSet(1)
-        }
-
-    override val isRightPodCharging: Boolean
-        get() = when (areValuesFlipped) {
-            false -> rawFlags.isBitSet(1)
-            true -> rawFlags.isBitSet(0)
-        }
-
-    private val isThisPodInThecase: Boolean
-        get() = rawStatus.isBitSet(6)
-
-    override val isLeftPodInEar: Boolean
-        get() = when (areValuesFlipped xor isThisPodInThecase) {
-            true -> rawStatus.isBitSet(3)
-            false -> rawStatus.isBitSet(1)
-        }
-
-    override val isRightPodInEar: Boolean
-        get() = when (areValuesFlipped xor isThisPodInThecase) {
-            true -> rawStatus.isBitSet(1)
-            false -> rawStatus.isBitSet(3)
-        }
+        get() = rssiAverage ?: super<DualApplePods>.rssi
 
     override val batteryCasePercent: Float?
-        get() = when (val value = rawCaseBattery.toInt()) {
-            15 -> cachedBatteryPercentage
-            else -> if (value > 10) {
-                log { "Case: Above 100% battery: $value" }
-                1.0f
-            } else {
-                value / 10f
-            }
-        }
-
-    override val isCaseCharging: Boolean
-        get() = rawFlags.isBitSet(2)
+        get() = super.batteryCasePercent ?: cachedBatteryPercentage
 
     class Factory @Inject constructor() : ApplePodsFactory<FakeAirPodsPro>(TAG) {
 
-        override fun isResponsible(message: ProximityPairing.Message): Boolean = message.run {
+        override fun isResponsible(message: ProximityMessage): Boolean = message.run {
             // Official message length is 19HEX, i.e. binary 25, did they copy this wrong?
             getModelInfo().full == DEVICE_CODE && length == 19
         }
 
         override fun create(
             scanResult: BleScanResult,
-            message: ProximityPairing.Message,
-            decrypted: UByteArray?
+            payload: ProximityPayload
         ): ApplePods {
-            var basic = FakeAirPodsPro(scanResult = scanResult, proximityMessage = message)
+            var basic = FakeAirPodsPro(scanResult = scanResult, payload = payload)
             val result = searchHistory(basic)
 
             if (result != null) basic = basic.copy(identifier = result.id)

app-common/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsPro2.kt

@@ -3,16 +3,18 @@ package eu.darken.capod.pods.core.apple.misc
 import androidx.annotation.DrawableRes
 import eu.darken.capod.common.R
 import eu.darken.capod.common.bluetooth.BleScanResult
-import eu.darken.capod.common.debug.logging.log
 import eu.darken.capod.common.debug.logging.logTag
-import eu.darken.capod.common.isBitSet
-import eu.darken.capod.common.lowerNibble
-import eu.darken.capod.common.upperNibble
-import eu.darken.capod.pods.core.*
+import eu.darken.capod.pods.core.DualPodDevice
+import eu.darken.capod.pods.core.HasCase
+import eu.darken.capod.pods.core.HasChargeDetectionDual
+import eu.darken.capod.pods.core.HasEarDetectionDual
+import eu.darken.capod.pods.core.PodDevice
 import eu.darken.capod.pods.core.apple.ApplePods
 import eu.darken.capod.pods.core.apple.ApplePodsFactory
 import eu.darken.capod.pods.core.apple.DualApplePods
-import eu.darken.capod.pods.core.apple.protocol.ProximityPairing
+import eu.darken.capod.pods.core.apple.DualApplePods.LidState
+import eu.darken.capod.pods.core.apple.protocol.ProximityMessage
+import eu.darken.capod.pods.core.apple.protocol.ProximityPayload
 import java.time.Instant
 import javax.inject.Inject
 
@@ -20,18 +22,18 @@ import javax.inject.Inject
  * AirPods Pro2 clone
  * https://discord.com/channels/548521543039189022/927235844127993866/1060911213539774504
  */
-data class FakeAirPodsPro2 constructor(
+data class FakeAirPodsPro2(
     override val identifier: PodDevice.Id = PodDevice.Id(),
     override val seenLastAt: Instant = Instant.now(),
     override val seenFirstAt: Instant = Instant.now(),
     override val seenCounter: Int = 1,
     override val scanResult: BleScanResult,
-    override val proximityMessage: ProximityPairing.Message,
+    override val payload: ProximityPayload,
     override val reliability: Float = PodDevice.BASE_CONFIDENCE,
     private val rssiAverage: Int? = null,
     private val cachedBatteryPercentage: Float? = null,
-    private val cachedCaseState: DualApplePods.LidState? = null,
-) : ApplePods, HasChargeDetectionDual, DualPodDevice, HasEarDetectionDual, HasCase {
+    private val cachedCaseState: LidState? = null,
+) : DualApplePods, HasChargeDetectionDual, DualPodDevice, HasEarDetectionDual, HasCase {
 
     override val model: PodDevice.Model = PodDevice.Model.FAKE_AIRPODS_PRO2
 
@@ -52,99 +54,25 @@ data class FakeAirPodsPro2 constructor(
         get() = R.drawable.devic_airpods_pro2_right
 
     override val rssi: Int
-        get() = rssiAverage ?: scanResult.rssi
-
-    private val areValuesFlipped: Boolean
-        get() = !rawStatus.isBitSet(5)
-
-    override val batteryLeftPodPercent: Float?
-        get() {
-            val value = when (areValuesFlipped) {
-                true -> rawPodsBattery.upperNibble.toInt()
-                false -> rawPodsBattery.lowerNibble.toInt()
-            }
-            return when (value) {
-                15 -> null
-                else -> if (value > 10) {
-                    log { "Left pod: Above 100% battery: $value" }
-                    1.0f
-                } else {
-                    (value / 10f)
-                }
-            }
-        }
-
-    override val batteryRightPodPercent: Float?
-        get() {
-            val value = when (areValuesFlipped) {
-                true -> rawPodsBattery.lowerNibble.toInt()
-                false -> rawPodsBattery.upperNibble.toInt()
-            }
-            return when (value) {
-                15 -> null
-                else -> if (value > 10) {
-                    log { "Right pod: Above 100% battery: $value" }
-                    1.0f
-                } else {
-                    value / 10f
-                }
-            }
-        }
-
-    private val isThisPodInThecase: Boolean
-        get() = rawStatus.isBitSet(6)
-
-    override val isLeftPodInEar: Boolean
-        get() = when (areValuesFlipped xor isThisPodInThecase) {
-            true -> rawStatus.isBitSet(3)
-            false -> rawStatus.isBitSet(1)
-        }
-
-    override val isRightPodInEar: Boolean
-        get() = when (areValuesFlipped xor isThisPodInThecase) {
-            true -> rawStatus.isBitSet(1)
-            false -> rawStatus.isBitSet(3)
-        }
-
-    override val isLeftPodCharging: Boolean
-        get() = when (areValuesFlipped) {
-            false -> rawFlags.isBitSet(0)
-            true -> rawFlags.isBitSet(1)
-        }
-
-    override val isRightPodCharging: Boolean
-        get() = when (areValuesFlipped) {
-            false -> rawFlags.isBitSet(1)
-            true -> rawFlags.isBitSet(0)
-        }
+        get() = rssiAverage ?: super<DualApplePods>.rssi
+    override val caseLidState: LidState
+        get() = cachedCaseState ?: super.caseLidState
 
     override val batteryCasePercent: Float?
-        get() = when (val value = rawCaseBattery.toInt()) {
-            15 -> cachedBatteryPercentage
-            else -> if (value > 10) {
-                log { "Case: Above 100% battery: $value" }
-                1.0f
-            } else {
-                value / 10f
-            }
-        }
-
-    override val isCaseCharging: Boolean
-        get() = rawFlags.isBitSet(2)
+        get() = super.batteryCasePercent ?: cachedBatteryPercentage
 
     class Factory @Inject constructor() : ApplePodsFactory<FakeAirPodsPro2>(TAG) {
 
-        override fun isResponsible(message: ProximityPairing.Message): Boolean = message.run {
+        override fun isResponsible(message: ProximityMessage): Boolean = message.run {
             // Official message length is 19HEX, i.e. binary 25, did they copy this wrong?
             getModelInfo().full == DEVICE_CODE && length == 19
         }
 
         override fun create(
             scanResult: BleScanResult,
-            message: ProximityPairing.Message,
-            decrypted: UByteArray?
+            payload: ProximityPayload
         ): ApplePods {
-            var basic = FakeAirPodsPro2(scanResult = scanResult, proximityMessage = message)
+            var basic = FakeAirPodsPro2(scanResult = scanResult, payload = payload)
             val result = searchHistory(basic)
 
             if (result != null) basic = basic.copy(identifier = result.id)

app-common/src/main/java/eu/darken/capod/pods/core/apple/misc/UnknownAppleDevice.kt

@@ -7,7 +7,8 @@ import eu.darken.capod.common.debug.logging.logTag
 import eu.darken.capod.pods.core.PodDevice
 import eu.darken.capod.pods.core.apple.ApplePods
 import eu.darken.capod.pods.core.apple.ApplePodsFactory
-import eu.darken.capod.pods.core.apple.protocol.ProximityPairing
+import eu.darken.capod.pods.core.apple.protocol.ProximityMessage
+import eu.darken.capod.pods.core.apple.protocol.ProximityPayload
 import java.time.Instant
 import javax.inject.Inject
 
@@ -17,7 +18,7 @@ data class UnknownAppleDevice(
     override val seenFirstAt: Instant = Instant.now(),
     override val seenCounter: Int = 1,
     override val scanResult: BleScanResult,
-    override val proximityMessage: ProximityPairing.Message,
+    override val payload: ProximityPayload,
     override val reliability: Float = 0f,
     private val rssiAverage: Int? = null,
 ) : ApplePods {
@@ -30,14 +31,13 @@ data class UnknownAppleDevice(
         get() = rssiAverage ?: super.rssi
 
     class Factory @Inject constructor() : ApplePodsFactory<ApplePods>(TAG) {
-        override fun isResponsible(message: ProximityPairing.Message): Boolean = true
+        override fun isResponsible(message: ProximityMessage): Boolean = true
 
         override fun create(
             scanResult: BleScanResult,
-            message: ProximityPairing.Message,
-            decrypted: UByteArray?,
+            payload: ProximityPayload,
         ): ApplePods {
-            var basic = UnknownAppleDevice(scanResult = scanResult, proximityMessage = message)
+            var basic = UnknownAppleDevice(scanResult = scanResult, payload = payload)
             val result = searchHistory(basic)
 
             if (result != null) basic = basic.copy(identifier = result.id)

app-common/src/main/java/eu/darken/capod/pods/core/apple/protocol/MessageDecrypter.kt

@@ -1,44 +0,0 @@
-package eu.darken.capod.pods.core.apple.protocol
-
-import android.annotation.SuppressLint
-import eu.darken.capod.common.debug.logging.Logging
-import eu.darken.capod.common.debug.logging.asLog
-import eu.darken.capod.common.debug.logging.log
-import eu.darken.capod.common.debug.logging.logTag
-import okio.ByteString.Companion.toByteString
-import javax.crypto.Cipher
-import javax.crypto.spec.SecretKeySpec
-import javax.inject.Inject
-
-class MessageDecrypter @Inject constructor() {
-
-    @SuppressLint("GetInstance")
-    fun decrypt(message: ProximityPairing.Message, key: ByteArray): UByteArray? {
-        val data = message.data.toByteArray()
-        if (data.size < 16) return null
-
-        val decryptedData = try {
-            val cipher = Cipher.getInstance("AES/ECB/NoPadding").apply {
-                val secretKey = SecretKeySpec(key, "AES")
-                init(Cipher.DECRYPT_MODE, secretKey)
-            }
-            cipher.doFinal(data.copyOfRange(data.size - 16, data.size))
-        } catch (e: Exception) {
-            log(TAG, Logging.Priority.ERROR) { "Failed to decrypt $message with ${key.toByteString()}\n${e.asLog()}" }
-            null
-        }
-
-        log(
-            TAG,
-            Logging.Priority.VERBOSE
-        ) { "Decrypted $message with ${key.toByteString()} to ${decryptedData?.toByteString()}" }
-
-        if (decryptedData == null || decryptedData.size != 16) return null
-
-        return decryptedData.toUByteArray()
-    }
-
-    companion object {
-        private val TAG = logTag("Pod", "Factory", "Decrypter")
-    }
-}

app-common/src/main/java/eu/darken/capod/pods/core/apple/protocol/ProximityMessage.kt

@@ -0,0 +1,58 @@
+package eu.darken.capod.pods.core.apple.protocol
+
+import android.R.id.message
+import android.annotation.SuppressLint
+import dagger.Reusable
+import eu.darken.capod.common.debug.logging.Logging
+import eu.darken.capod.common.debug.logging.asLog
+import eu.darken.capod.common.debug.logging.log
+import eu.darken.capod.common.debug.logging.logTag
+import okio.ByteString.Companion.toByteString
+import javax.crypto.Cipher
+import javax.crypto.spec.SecretKeySpec
+import javax.inject.Inject
+
+data class ProximityMessage(
+    val type: UByte,
+    val length: Int,
+    val data: UByteArray
+) {
+
+    override fun toString(): String {
+        val dataHex = data.joinToString(separator = " ") { String.format("%02X", it.toByte()) }
+        return "ProximityPairing.Message(type=$type, length=$length, data=$dataHex)"
+    }
+
+    @Reusable
+    class Decrypter @Inject constructor() {
+        @SuppressLint("GetInstance")
+        fun decrypt(data: ByteArray, key: ByteArray): UByteArray? {
+            val decryptedData = try {
+                val cipher = Cipher.getInstance("AES/ECB/NoPadding").apply {
+                    val secretKey = SecretKeySpec(key, "AES")
+                    init(Cipher.DECRYPT_MODE, secretKey)
+                }
+                cipher.doFinal(data.copyOfRange(data.size - 16, data.size))
+            } catch (e: Exception) {
+                log(
+                    TAG,
+                    Logging.Priority.ERROR
+                ) { "Failed to decrypt $message with ${key.toByteString()}\n${e.asLog()}" }
+                null
+            }
+
+            log(
+                TAG,
+                Logging.Priority.VERBOSE
+            ) { "Decrypted $message with ${key.toByteString()} to ${decryptedData?.toByteString()}" }
+
+            if (decryptedData == null || decryptedData.size != 16) return null
+
+            return decryptedData.toUByteArray()
+        }
+
+        companion object {
+            private val TAG = logTag("Pod", "Factory", "Decrypter")
+        }
+    }
+}

app-common/src/main/java/eu/darken/capod/pods/core/apple/protocol/ProximityPairing.kt

@@ -8,27 +8,15 @@ import javax.inject.Inject
 
 object ProximityPairing {
 
-    data class Message(
-        val type: UByte,
-        val length: Int,
-        val data: UByteArray
-    ) {
-
-        override fun toString(): String {
-            val dataHex = data.joinToString(separator = " ") { String.format("%02X", it.toByte()) }
-            return "ProximityPairing.Message(type=$type, length=$length, data=$dataHex)"
-        }
-    }
-
     @Reusable
     class Decoder @Inject constructor() {
-        fun decode(message: ContinuityProtocol.Message): Message? {
+        fun decode(message: ContinuityProtocol.Message): ProximityMessage? {
             if (message.type != CONTINUITY_PROTOCOL_MESSAGE_TYPE_PROXIMITY_PAIRING) {
                 log { "Not a proximity pairing message: $this" }
                 return null
             }
 
-            return Message(
+            return ProximityMessage(
                 type = message.type,
                 length = message.length,
                 data = message.data

app-common/src/main/java/eu/darken/capod/pods/core/apple/protocol/ProximityPayload.kt

@@ -0,0 +1,15 @@
+package eu.darken.capod.pods.core.apple.protocol
+
+data class ProximityPayload(
+    val public: Public,
+    val private: Private?,
+) {
+
+    data class Public(
+        val data: UByteArray,
+    )
+
+    data class Private(
+        val data: UByteArray,
+    )
+}

app-common/src/main/java/eu/darken/capod/reaction/core/popup/PopUpReaction.kt

@@ -51,8 +51,8 @@ class PopUpReaction @Inject constructor(
                 return@mapNotNull null
             }
             log(TAG, VERBOSE) {
-                val prev = previous?.rawCaseLidState?.let { String.format("%02X", it.toByte()) }
-                val cur = current.rawCaseLidState.let { String.format("%02X", it.toByte()) }
+                val prev = previous?.pubCaseLidState?.let { String.format("%02X", it.toByte()) }
+                val cur = current.pubCaseLidState.let { String.format("%02X", it.toByte()) }
                 "previous=$prev (${previous?.caseLidState}), current=$cur (${current.caseLidState})"
             }
             log(TAG, VERBOSE) { "previous-id=${previous?.identifier}, current-id=${current.identifier}" }