refactor: Move Proximity* classes into protocol.ble package

This commit is contained in:
darken
2026-03-31 19:17:09 +02:00
committed by Matthias Urhahn
parent 4808e04146
commit 94e28fb0b5
41 changed files with 92 additions and 92 deletions
@@ -16,7 +16,7 @@ import eu.darken.capod.pods.core.HasEarDetectionDual
import eu.darken.capod.pods.core.PodModel
import eu.darken.capod.pods.core.SingleBlePodSnapshot
import eu.darken.capod.pods.core.apple.ApplePods
import eu.darken.capod.pods.core.apple.protocol.ProximityPayload
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPayload
import eu.darken.capod.pods.core.unknown.UnknownSnapshotBle
import eu.darken.capod.profiles.core.AppleDeviceProfile
import eu.darken.capod.profiles.core.DeviceProfile
@@ -18,7 +18,7 @@ import eu.darken.capod.common.theming.ThemeMode
import eu.darken.capod.common.theming.ThemeStyle
import eu.darken.capod.pods.core.PodModel
import eu.darken.capod.pods.core.apple.protocol.IdentityResolvingKey
import eu.darken.capod.pods.core.apple.protocol.ProximityEncryptionKey
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityEncryptionKey
import kotlinx.serialization.builtins.nullable
import kotlinx.serialization.json.Json
import javax.inject.Inject
@@ -18,7 +18,7 @@ import eu.darken.capod.main.core.GeneralSettings
import eu.darken.capod.main.core.PermissionTool
import eu.darken.capod.pods.core.BlePodSnapshot
import eu.darken.capod.pods.core.PodFactory
import eu.darken.capod.pods.core.apple.protocol.ProximityPairing
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPairing
import eu.darken.capod.profiles.core.DeviceProfilesRepo
import eu.darken.capod.profiles.core.currentProfiles
import kotlinx.coroutines.CoroutineScope
@@ -10,9 +10,9 @@ import eu.darken.capod.pods.core.BlePodSnapshot
import eu.darken.capod.pods.core.PodModel
import eu.darken.capod.pods.core.apple.misc.UnknownAppleSnapshotBle
import eu.darken.capod.pods.core.apple.protocol.ContinuityProtocol
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 eu.darken.capod.pods.core.apple.protocol.ble.ProximityMessage
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPairing
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPayload
import eu.darken.capod.pods.core.apple.protocol.RPAChecker
import eu.darken.capod.profiles.core.AppleDeviceProfile
import eu.darken.capod.profiles.core.DeviceProfilesRepo
@@ -3,7 +3,7 @@ package eu.darken.capod.pods.core.apple
import eu.darken.capod.common.lowerNibble
import eu.darken.capod.common.upperNibble
import eu.darken.capod.pods.core.BlePodSnapshot
import eu.darken.capod.pods.core.apple.protocol.ProximityPayload
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPayload
import eu.darken.capod.profiles.core.AppleDeviceProfile
interface ApplePods : BlePodSnapshot {
@@ -2,8 +2,8 @@ package eu.darken.capod.pods.core.apple
import eu.darken.capod.common.bluetooth.BleScanResult
import eu.darken.capod.pods.core.apple.history.KnownDevice
import eu.darken.capod.pods.core.apple.protocol.ProximityMessage
import eu.darken.capod.pods.core.apple.protocol.ProximityPayload
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityMessage
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPayload
interface ApplePodsFactory {
fun isResponsible(message: ProximityMessage): Boolean
@@ -8,9 +8,9 @@ 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.history.PodHistoryRepo
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 eu.darken.capod.pods.core.apple.protocol.ble.ProximityMessage
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPairing
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPayload
import java.time.Instant
import javax.inject.Inject
@@ -8,9 +8,9 @@ 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.history.PodHistoryRepo
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 eu.darken.capod.pods.core.apple.protocol.ble.ProximityMessage
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPairing
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPayload
import java.time.Instant
import javax.inject.Inject
@@ -10,9 +10,9 @@ 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.history.PodHistoryRepo
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 eu.darken.capod.pods.core.apple.protocol.ble.ProximityMessage
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPairing
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPayload
import java.time.Instant
import javax.inject.Inject
@@ -10,9 +10,9 @@ 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.history.PodHistoryRepo
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 eu.darken.capod.pods.core.apple.protocol.ble.ProximityMessage
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPairing
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPayload
import java.time.Instant
import javax.inject.Inject
@@ -10,9 +10,9 @@ 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.history.PodHistoryRepo
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 eu.darken.capod.pods.core.apple.protocol.ble.ProximityMessage
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPairing
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPayload
import java.time.Instant
import javax.inject.Inject
@@ -12,9 +12,9 @@ import eu.darken.capod.pods.core.apple.ApplePodsFactory
import eu.darken.capod.pods.core.apple.HasAppleColor
import eu.darken.capod.pods.core.apple.SingleApplePods
import eu.darken.capod.pods.core.apple.history.PodHistoryRepo
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 eu.darken.capod.pods.core.apple.protocol.ble.ProximityMessage
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPairing
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPayload
import java.time.Instant
import javax.inject.Inject
@@ -12,9 +12,9 @@ import eu.darken.capod.pods.core.apple.ApplePodsFactory
import eu.darken.capod.pods.core.apple.HasAppleColor
import eu.darken.capod.pods.core.apple.SingleApplePods
import eu.darken.capod.pods.core.apple.history.PodHistoryRepo
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 eu.darken.capod.pods.core.apple.protocol.ble.ProximityMessage
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPairing
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPayload
import java.time.Instant
import javax.inject.Inject
@@ -11,9 +11,9 @@ import eu.darken.capod.pods.core.apple.ApplePodsFactory
import eu.darken.capod.pods.core.apple.DualApplePods
import eu.darken.capod.pods.core.apple.DualApplePods.LidState
import eu.darken.capod.pods.core.apple.history.PodHistoryRepo
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 eu.darken.capod.pods.core.apple.protocol.ble.ProximityMessage
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPairing
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPayload
import java.time.Instant
import javax.inject.Inject
@@ -11,9 +11,9 @@ import eu.darken.capod.pods.core.apple.ApplePodsFactory
import eu.darken.capod.pods.core.apple.DualApplePods
import eu.darken.capod.pods.core.apple.DualApplePods.LidState
import eu.darken.capod.pods.core.apple.history.PodHistoryRepo
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 eu.darken.capod.pods.core.apple.protocol.ble.ProximityMessage
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPairing
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPayload
import java.time.Instant
import javax.inject.Inject
@@ -11,9 +11,9 @@ import eu.darken.capod.pods.core.apple.ApplePodsFactory
import eu.darken.capod.pods.core.apple.DualApplePods
import eu.darken.capod.pods.core.apple.DualApplePods.LidState
import eu.darken.capod.pods.core.apple.history.PodHistoryRepo
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 eu.darken.capod.pods.core.apple.protocol.ble.ProximityMessage
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPairing
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPayload
import java.time.Instant
import javax.inject.Inject
@@ -11,9 +11,9 @@ import eu.darken.capod.pods.core.apple.ApplePodsFactory
import eu.darken.capod.pods.core.apple.DualApplePods
import eu.darken.capod.pods.core.apple.DualApplePods.LidState
import eu.darken.capod.pods.core.apple.history.PodHistoryRepo
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 eu.darken.capod.pods.core.apple.protocol.ble.ProximityMessage
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPairing
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPayload
import java.time.Instant
import javax.inject.Inject
@@ -10,9 +10,9 @@ 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.history.PodHistoryRepo
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 eu.darken.capod.pods.core.apple.protocol.ble.ProximityMessage
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPairing
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPayload
import java.time.Instant
import javax.inject.Inject
@@ -8,9 +8,9 @@ import eu.darken.capod.pods.core.apple.ApplePods
import eu.darken.capod.pods.core.apple.ApplePodsFactory
import eu.darken.capod.pods.core.apple.SingleApplePods
import eu.darken.capod.pods.core.apple.history.PodHistoryRepo
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 eu.darken.capod.pods.core.apple.protocol.ble.ProximityMessage
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPairing
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPayload
import java.time.Instant
import javax.inject.Inject
@@ -8,9 +8,9 @@ import eu.darken.capod.pods.core.apple.ApplePods
import eu.darken.capod.pods.core.apple.ApplePodsFactory
import eu.darken.capod.pods.core.apple.SingleApplePods
import eu.darken.capod.pods.core.apple.history.PodHistoryRepo
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 eu.darken.capod.pods.core.apple.protocol.ble.ProximityMessage
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPairing
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPayload
import java.time.Instant
import javax.inject.Inject
@@ -8,9 +8,9 @@ import eu.darken.capod.pods.core.apple.ApplePods
import eu.darken.capod.pods.core.apple.ApplePodsFactory
import eu.darken.capod.pods.core.apple.SingleApplePods
import eu.darken.capod.pods.core.apple.history.PodHistoryRepo
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 eu.darken.capod.pods.core.apple.protocol.ble.ProximityMessage
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPairing
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPayload
import java.time.Instant
import javax.inject.Inject
@@ -8,9 +8,9 @@ import eu.darken.capod.pods.core.apple.ApplePods
import eu.darken.capod.pods.core.apple.ApplePodsFactory
import eu.darken.capod.pods.core.apple.SingleApplePods
import eu.darken.capod.pods.core.apple.history.PodHistoryRepo
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 eu.darken.capod.pods.core.apple.protocol.ble.ProximityMessage
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPairing
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPayload
import java.time.Instant
import javax.inject.Inject
@@ -8,9 +8,9 @@ import eu.darken.capod.pods.core.apple.ApplePods
import eu.darken.capod.pods.core.apple.ApplePodsFactory
import eu.darken.capod.pods.core.apple.SingleApplePods
import eu.darken.capod.pods.core.apple.history.PodHistoryRepo
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 eu.darken.capod.pods.core.apple.protocol.ble.ProximityMessage
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPairing
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPayload
import java.time.Instant
import javax.inject.Inject
@@ -9,9 +9,9 @@ import eu.darken.capod.pods.core.apple.ApplePodsFactory
import eu.darken.capod.pods.core.apple.SingleApplePods
import eu.darken.capod.pods.core.apple.airpods.HasStateDetectionAirPods
import eu.darken.capod.pods.core.apple.history.PodHistoryRepo
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 eu.darken.capod.pods.core.apple.protocol.ble.ProximityMessage
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPairing
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPayload
import java.time.Instant
import javax.inject.Inject
@@ -10,9 +10,9 @@ 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.history.PodHistoryRepo
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 eu.darken.capod.pods.core.apple.protocol.ble.ProximityMessage
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPairing
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPayload
import java.time.Instant
import javax.inject.Inject
@@ -10,9 +10,9 @@ 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.history.PodHistoryRepo
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 eu.darken.capod.pods.core.apple.protocol.ble.ProximityMessage
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPairing
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPayload
import java.time.Instant
import javax.inject.Inject
@@ -4,7 +4,7 @@ import eu.darken.capod.common.bluetooth.BluetoothAddress
import eu.darken.capod.common.collections.median
import eu.darken.capod.pods.core.BlePodSnapshot
import eu.darken.capod.pods.core.apple.ApplePods
import eu.darken.capod.pods.core.apple.protocol.ProximityPayload
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPayload
import java.time.Duration
import java.time.Instant
import kotlin.math.max
@@ -12,7 +12,7 @@ import eu.darken.capod.pods.core.HasCase
import eu.darken.capod.pods.core.PodModel
import eu.darken.capod.pods.core.apple.ApplePods
import eu.darken.capod.pods.core.apple.DualApplePods
import eu.darken.capod.pods.core.apple.protocol.ProximityPayload
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPayload
import eu.darken.capod.pods.core.apple.protocol.RPAChecker
import eu.darken.capod.profiles.core.AppleDeviceProfile
import eu.darken.capod.profiles.core.DeviceProfilesRepo
@@ -11,8 +11,8 @@ 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.history.PodHistoryRepo
import eu.darken.capod.pods.core.apple.protocol.ProximityMessage
import eu.darken.capod.pods.core.apple.protocol.ProximityPayload
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityMessage
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPayload
import java.time.Instant
import javax.inject.Inject
@@ -11,8 +11,8 @@ 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.history.PodHistoryRepo
import eu.darken.capod.pods.core.apple.protocol.ProximityMessage
import eu.darken.capod.pods.core.apple.protocol.ProximityPayload
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityMessage
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPayload
import java.time.Instant
import javax.inject.Inject
@@ -13,8 +13,8 @@ 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.history.PodHistoryRepo
import eu.darken.capod.pods.core.apple.protocol.ProximityMessage
import eu.darken.capod.pods.core.apple.protocol.ProximityPayload
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityMessage
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPayload
import java.time.Instant
import javax.inject.Inject
@@ -13,8 +13,8 @@ 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.history.PodHistoryRepo
import eu.darken.capod.pods.core.apple.protocol.ProximityMessage
import eu.darken.capod.pods.core.apple.protocol.ProximityPayload
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityMessage
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPayload
import java.time.Instant
import javax.inject.Inject
@@ -15,8 +15,8 @@ import eu.darken.capod.pods.core.apple.ApplePodsFactory
import eu.darken.capod.pods.core.apple.DualApplePods
import eu.darken.capod.pods.core.apple.DualApplePods.LidState
import eu.darken.capod.pods.core.apple.history.PodHistoryRepo
import eu.darken.capod.pods.core.apple.protocol.ProximityMessage
import eu.darken.capod.pods.core.apple.protocol.ProximityPayload
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityMessage
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPayload
import java.time.Instant
import javax.inject.Inject
@@ -9,8 +9,8 @@ import eu.darken.capod.pods.core.PodModel
import eu.darken.capod.pods.core.apple.ApplePods
import eu.darken.capod.pods.core.apple.ApplePodsFactory
import eu.darken.capod.pods.core.apple.history.PodHistoryRepo
import eu.darken.capod.pods.core.apple.protocol.ProximityMessage
import eu.darken.capod.pods.core.apple.protocol.ProximityPayload
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityMessage
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPayload
import java.time.Instant
import javax.inject.Inject
@@ -1,3 +0,0 @@
package eu.darken.capod.pods.core.apple.protocol
typealias ProximityEncryptionKey = ByteArray
@@ -0,0 +1,3 @@
package eu.darken.capod.pods.core.apple.protocol.ble
typealias ProximityEncryptionKey = ByteArray
@@ -1,4 +1,4 @@
package eu.darken.capod.pods.core.apple.protocol
package eu.darken.capod.pods.core.apple.protocol.ble
import android.R.id.message
import android.annotation.SuppressLint
@@ -11,7 +11,6 @@ import okio.ByteString.Companion.toByteString
import javax.crypto.Cipher
import javax.crypto.spec.SecretKeySpec
import javax.inject.Inject
import eu.darken.capod.R
data class ProximityMessage(
val type: UByte,
@@ -1,8 +1,9 @@
package eu.darken.capod.pods.core.apple.protocol
package eu.darken.capod.pods.core.apple.protocol.ble
import android.bluetooth.le.ScanFilter
import dagger.Reusable
import eu.darken.capod.common.debug.logging.log
import eu.darken.capod.pods.core.apple.protocol.ContinuityProtocol
import javax.inject.Inject
@@ -1,4 +1,4 @@
package eu.darken.capod.pods.core.apple.protocol
package eu.darken.capod.pods.core.apple.protocol.ble
data class ProximityPayload(
val public: Public,
@@ -3,7 +3,7 @@ package eu.darken.capod.profiles.core
import eu.darken.capod.common.serialization.ByteArrayBase64Serializer
import eu.darken.capod.pods.core.PodModel
import eu.darken.capod.pods.core.apple.protocol.IdentityResolvingKey
import eu.darken.capod.pods.core.apple.protocol.ProximityEncryptionKey
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityEncryptionKey
import kotlinx.parcelize.Parcelize
import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
@@ -16,7 +16,7 @@ import eu.darken.capod.common.toHex
import eu.darken.capod.common.uix.ViewModel4
import eu.darken.capod.pods.core.PodModel
import eu.darken.capod.pods.core.apple.protocol.IdentityResolvingKey
import eu.darken.capod.pods.core.apple.protocol.ProximityEncryptionKey
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityEncryptionKey
import eu.darken.capod.profiles.core.AppleDeviceProfile
import eu.darken.capod.profiles.core.DeviceProfile
import eu.darken.capod.profiles.core.DeviceProfilesRepo