diff --git a/app/src/main/java/eu/darken/capod/common/compose/preview/MockPodDataProvider.kt b/app/src/main/java/eu/darken/capod/common/compose/preview/MockPodDataProvider.kt index 591d4413..311c89d2 100644 --- a/app/src/main/java/eu/darken/capod/common/compose/preview/MockPodDataProvider.kt +++ b/app/src/main/java/eu/darken/capod/common/compose/preview/MockPodDataProvider.kt @@ -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 diff --git a/app/src/main/java/eu/darken/capod/main/core/GeneralSettings.kt b/app/src/main/java/eu/darken/capod/main/core/GeneralSettings.kt index cb989b5b..db8ea766 100644 --- a/app/src/main/java/eu/darken/capod/main/core/GeneralSettings.kt +++ b/app/src/main/java/eu/darken/capod/main/core/GeneralSettings.kt @@ -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 diff --git a/app/src/main/java/eu/darken/capod/monitor/core/BlePodMonitor.kt b/app/src/main/java/eu/darken/capod/monitor/core/BlePodMonitor.kt index 26be9e6d..bf6be1b7 100644 --- a/app/src/main/java/eu/darken/capod/monitor/core/BlePodMonitor.kt +++ b/app/src/main/java/eu/darken/capod/monitor/core/BlePodMonitor.kt @@ -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 diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/AppleFactory.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/AppleFactory.kt index 4df537c6..96ae4169 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/AppleFactory.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/AppleFactory.kt @@ -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 diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/ApplePods.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/ApplePods.kt index c07bea2e..b30d7086 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/ApplePods.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/ApplePods.kt @@ -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 { diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/ApplePodsFactory.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/ApplePodsFactory.kt index d0d82713..997ea072 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/ApplePodsFactory.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/ApplePodsFactory.kt @@ -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 diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen1.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen1.kt index 48da8ca4..21270446 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen1.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen1.kt @@ -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 diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen2.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen2.kt index c7ebd194..02209024 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen2.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen2.kt @@ -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 diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen3.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen3.kt index 91fc0897..56a6d4a2 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen3.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen3.kt @@ -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 diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen4.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen4.kt index 363a7e4c..148cfc16 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen4.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen4.kt @@ -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 diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen4Anc.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen4Anc.kt index 4bcd6ce9..02a89823 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen4Anc.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen4Anc.kt @@ -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 diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsMax.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsMax.kt index f411f275..7d768e18 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsMax.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsMax.kt @@ -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 diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsMaxUsbc.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsMaxUsbc.kt index d0ad3b9e..dae6a032 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsMaxUsbc.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsMaxUsbc.kt @@ -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 diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro.kt index 0733bb18..86c3bb1e 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro.kt @@ -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 diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro2.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro2.kt index 0d41974b..b9bdc2e9 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro2.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro2.kt @@ -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 diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro2Usbc.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro2Usbc.kt index b8987f3c..6ebcfd68 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro2Usbc.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro2Usbc.kt @@ -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 diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro3.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro3.kt index cb857cf0..82419463 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro3.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro3.kt @@ -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 diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsFitPro.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsFitPro.kt index 825476ae..6e7fde37 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsFitPro.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsFitPro.kt @@ -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 diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsFlex.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsFlex.kt index 13f32374..fcd632b0 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsFlex.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsFlex.kt @@ -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 diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsSolo3.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsSolo3.kt index 0ca015a6..47d1af57 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsSolo3.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsSolo3.kt @@ -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 diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsStudio3.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsStudio3.kt index 5368ed5d..76b03b27 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsStudio3.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsStudio3.kt @@ -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 diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsX.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsX.kt index 10152d91..1ea82f64 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsX.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsX.kt @@ -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 diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeats3.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeats3.kt index a5b6f9a2..c2d71d30 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeats3.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeats3.kt @@ -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 diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeats4.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeats4.kt index a9192df0..6e469ebb 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeats4.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeats4.kt @@ -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 diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsPro.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsPro.kt index 14a83c01..f090fbb4 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsPro.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsPro.kt @@ -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 diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsPro2.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsPro2.kt index 1b9acd38..2c3e4935 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsPro2.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsPro2.kt @@ -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 diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/history/KnownDevice.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/history/KnownDevice.kt index d22fb494..abc2278e 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/history/KnownDevice.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/history/KnownDevice.kt @@ -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 diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/history/PodHistoryRepo.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/history/PodHistoryRepo.kt index fd5004f9..2edbe5af 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/history/PodHistoryRepo.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/history/PodHistoryRepo.kt @@ -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 diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsGen1.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsGen1.kt index e9c51278..443a7003 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsGen1.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsGen1.kt @@ -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 diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsGen2.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsGen2.kt index dadc3a4c..3929c8d2 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsGen2.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsGen2.kt @@ -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 diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsGen3.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsGen3.kt index fbbb3c0e..7c6fe37c 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsGen3.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsGen3.kt @@ -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 diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsPro.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsPro.kt index 58f72366..f0b1ab41 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsPro.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsPro.kt @@ -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 diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsPro2.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsPro2.kt index e1d2763a..a209e022 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsPro2.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsPro2.kt @@ -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 diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/misc/UnknownAppleSnapshotBle.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/misc/UnknownAppleSnapshotBle.kt index 203c4323..f77d9fba 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/misc/UnknownAppleSnapshotBle.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/misc/UnknownAppleSnapshotBle.kt @@ -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 diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/protocol/ProximityEncryptionKey.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/protocol/ProximityEncryptionKey.kt deleted file mode 100644 index 4ffdaaa2..00000000 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/protocol/ProximityEncryptionKey.kt +++ /dev/null @@ -1,3 +0,0 @@ -package eu.darken.capod.pods.core.apple.protocol - -typealias ProximityEncryptionKey = ByteArray \ No newline at end of file diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/protocol/ble/ProximityEncryptionKey.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/protocol/ble/ProximityEncryptionKey.kt new file mode 100644 index 00000000..b03f184d --- /dev/null +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/protocol/ble/ProximityEncryptionKey.kt @@ -0,0 +1,3 @@ +package eu.darken.capod.pods.core.apple.protocol.ble + +typealias ProximityEncryptionKey = ByteArray \ No newline at end of file diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/protocol/ProximityMessage.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/protocol/ble/ProximityMessage.kt similarity index 96% rename from app/src/main/java/eu/darken/capod/pods/core/apple/protocol/ProximityMessage.kt rename to app/src/main/java/eu/darken/capod/pods/core/apple/protocol/ble/ProximityMessage.kt index 7ef369f6..c08cb7aa 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/protocol/ProximityMessage.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/protocol/ble/ProximityMessage.kt @@ -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, diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/protocol/ProximityPairing.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/protocol/ble/ProximityPairing.kt similarity index 93% rename from app/src/main/java/eu/darken/capod/pods/core/apple/protocol/ProximityPairing.kt rename to app/src/main/java/eu/darken/capod/pods/core/apple/protocol/ble/ProximityPairing.kt index 758d808f..88126f4a 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/protocol/ProximityPairing.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/protocol/ble/ProximityPairing.kt @@ -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 diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/protocol/ProximityPayload.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/protocol/ble/ProximityPayload.kt similarity index 79% rename from app/src/main/java/eu/darken/capod/pods/core/apple/protocol/ProximityPayload.kt rename to app/src/main/java/eu/darken/capod/pods/core/apple/protocol/ble/ProximityPayload.kt index 54c2f824..c14fb9ae 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/protocol/ProximityPayload.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/protocol/ble/ProximityPayload.kt @@ -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, diff --git a/app/src/main/java/eu/darken/capod/profiles/core/AppleDeviceProfile.kt b/app/src/main/java/eu/darken/capod/profiles/core/AppleDeviceProfile.kt index aa2b6267..75140433 100644 --- a/app/src/main/java/eu/darken/capod/profiles/core/AppleDeviceProfile.kt +++ b/app/src/main/java/eu/darken/capod/profiles/core/AppleDeviceProfile.kt @@ -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 diff --git a/app/src/main/java/eu/darken/capod/profiles/ui/creation/DeviceProfileCreationViewModel.kt b/app/src/main/java/eu/darken/capod/profiles/ui/creation/DeviceProfileCreationViewModel.kt index 7e8c064d..05ae8dbe 100644 --- a/app/src/main/java/eu/darken/capod/profiles/ui/creation/DeviceProfileCreationViewModel.kt +++ b/app/src/main/java/eu/darken/capod/profiles/ui/creation/DeviceProfileCreationViewModel.kt @@ -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