TySS-Dev/capod
1
0
Fork 0
mirror of https://github.com/d4rken-org/capod.git synced 2026-09-14 18:26:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Reorganize pods package into ble/ and aap/ domains

Browse Source 
Move BLE-specific code (snapshots, devices, factories, protocol) under apple/ble/. Move AAP code under apple/aap/ with protocol/ subdirectory. PodModel stays in apple/ as the only shared type.
This commit is contained in:
darken
2026-03-31 19:17:09 +02:00
committed by Matthias Urhahn
parent 94e28fb0b5
commit a8593eecd3
149 changed files with 808 additions and 771 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/debug/java/eu/darken/capod/screenshots/ScreenshotContent.kt
+1 -1
View File
@@ -27,7 +27,7 @@ import eu.darken.capod.main.ui.widget.WidgetConfigurationScreen
import eu.darken.capod.main.ui.widget.WidgetConfigurationViewModel
import eu.darken.capod.main.ui.widget.WidgetRenderState
import eu.darken.capod.main.ui.widget.WidgetTheme
import eu.darken.capod.pods.core.PodModel
import eu.darken.capod.pods.core.apple.PodModel
import eu.darken.capod.profiles.ui.DeviceManagerScreen
import eu.darken.capod.profiles.ui.DeviceManagerViewModel
import eu.darken.capod.profiles.ui.creation.DeviceProfileCreationScreen
app/src/main/java/eu/darken/capod/common/bluetooth/BluetoothManager2.kt
+1 -1
View File
@@ -22,7 +22,7 @@ import eu.darken.capod.common.debug.logging.Logging.Priority.WARN
import eu.darken.capod.common.debug.logging.log
import eu.darken.capod.common.debug.logging.logTag
import eu.darken.capod.common.flow.setupCommonEventHandlers
import eu.darken.capod.pods.core.apple.protocol.ContinuityProtocol
import eu.darken.capod.pods.core.apple.ble.protocol.ContinuityProtocol
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.channels.awaitClose
import kotlinx.coroutines.delay
app/src/main/java/eu/darken/capod/common/compose/preview/MockPodDataProvider.kt
+12 -12
View File
@@ -5,18 +5,18 @@ import eu.darken.capod.R
import eu.darken.capod.common.bluetooth.BleScanResult
import eu.darken.capod.common.upgrade.UpgradeRepo
import eu.darken.capod.monitor.core.PodDevice
import eu.darken.capod.pods.core.BlePodSnapshot
import eu.darken.capod.pods.core.DualBlePodSnapshot
import eu.darken.capod.pods.core.HasCase
import eu.darken.capod.pods.core.HasChargeDetection
import eu.darken.capod.pods.core.HasChargeDetectionDual
import eu.darken.capod.pods.core.HasDualMicrophone
import eu.darken.capod.pods.core.HasEarDetection
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.ble.ProximityPayload
import eu.darken.capod.pods.core.apple.ble.BlePodSnapshot
import eu.darken.capod.pods.core.apple.ble.DualBlePodSnapshot
import eu.darken.capod.pods.core.apple.ble.devices.HasCase
import eu.darken.capod.pods.core.apple.ble.devices.HasChargeDetection
import eu.darken.capod.pods.core.apple.ble.devices.HasChargeDetectionDual
import eu.darken.capod.pods.core.apple.ble.devices.HasDualMicrophone
import eu.darken.capod.pods.core.apple.ble.devices.HasEarDetection
import eu.darken.capod.pods.core.apple.ble.devices.HasEarDetectionDual
import eu.darken.capod.pods.core.apple.PodModel
import eu.darken.capod.pods.core.apple.ble.SingleBlePodSnapshot
import eu.darken.capod.pods.core.apple.ble.devices.ApplePods
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityPayload
import eu.darken.capod.pods.core.unknown.UnknownSnapshotBle
import eu.darken.capod.profiles.core.AppleDeviceProfile
import eu.darken.capod.profiles.core.DeviceProfile
app/src/main/java/eu/darken/capod/main/core/GeneralSettings.kt
+3 -3
View File
@@ -16,9 +16,9 @@ import eu.darken.capod.common.serialization.SerializationCapod
import eu.darken.capod.common.theming.ThemeColor
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.ble.ProximityEncryptionKey
import eu.darken.capod.pods.core.apple.PodModel
import eu.darken.capod.pods.core.apple.ble.protocol.IdentityResolvingKey
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityEncryptionKey
import kotlinx.serialization.builtins.nullable
import kotlinx.serialization.json.Json
import javax.inject.Inject
app/src/main/java/eu/darken/capod/main/ui/overview/OverviewScreen.kt
+2 -2
View File
@@ -54,8 +54,8 @@ import eu.darken.capod.main.ui.overview.cards.SinglePodsCard
import eu.darken.capod.main.ui.overview.cards.UnknownPodDeviceCard
import eu.darken.capod.main.ui.overview.cards.UnmatchedDevicesCard
import eu.darken.capod.monitor.core.PodDevice
import eu.darken.capod.pods.core.PodModel
import eu.darken.capod.pods.core.apple.protocol.aap.AapSetting
import eu.darken.capod.pods.core.apple.PodModel
import eu.darken.capod.pods.core.apple.aap.protocol.AapSetting
import java.time.Instant
@Composable
app/src/main/java/eu/darken/capod/main/ui/overview/OverviewViewModel.kt
+3 -3
View File
@@ -20,9 +20,9 @@ import eu.darken.capod.main.core.PermissionTool
import eu.darken.capod.monitor.core.DeviceMonitor
import eu.darken.capod.monitor.core.PodDevice
import eu.darken.capod.monitor.core.worker.MonitorControl
import eu.darken.capod.pods.core.apple.protocol.aap.AapCommand
import eu.darken.capod.pods.core.apple.protocol.aap.AapConnectionManager
import eu.darken.capod.pods.core.apple.protocol.aap.AapSetting
import eu.darken.capod.pods.core.apple.aap.protocol.AapCommand
import eu.darken.capod.pods.core.apple.aap.AapConnectionManager
import eu.darken.capod.pods.core.apple.aap.protocol.AapSetting
import eu.darken.capod.profiles.core.DeviceProfile
import eu.darken.capod.profiles.core.DeviceProfilesRepo
import kotlinx.coroutines.delay
app/src/main/java/eu/darken/capod/main/ui/overview/cards/DualPodsCard.kt
+9 -9
View File
@@ -48,15 +48,15 @@ import eu.darken.capod.monitor.core.PodDevice
import eu.darken.capod.monitor.core.firstSeenFormatted
import eu.darken.capod.monitor.core.getSignalQuality
import eu.darken.capod.monitor.core.lastSeenFormatted
import eu.darken.capod.pods.core.HasPodStyle
import eu.darken.capod.pods.core.HasStateDetection
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.protocol.aap.AapSetting
import eu.darken.capod.pods.core.formatBatteryPercent
import eu.darken.capod.pods.core.toBatteryFloat
import eu.darken.capod.pods.core.toBatteryOrNull
import eu.darken.capod.pods.core.apple.ble.devices.HasPodStyle
import eu.darken.capod.pods.core.apple.ble.devices.HasStateDetection
import eu.darken.capod.pods.core.apple.ble.devices.ApplePods
import eu.darken.capod.pods.core.apple.ble.devices.DualApplePods
import eu.darken.capod.pods.core.apple.ble.devices.DualApplePods.LidState
import eu.darken.capod.pods.core.apple.aap.protocol.AapSetting
import eu.darken.capod.pods.core.apple.ble.formatBatteryPercent
import eu.darken.capod.pods.core.apple.ble.toBatteryFloat
import eu.darken.capod.pods.core.apple.ble.toBatteryOrNull
import java.time.Duration
import java.time.Instant
app/src/main/java/eu/darken/capod/main/ui/overview/cards/PodCardComponents.kt
+1 -1
View File
@@ -42,7 +42,7 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import eu.darken.capod.R
import eu.darken.capod.pods.core.apple.protocol.aap.AapSetting
import eu.darken.capod.pods.core.apple.aap.protocol.AapSetting
private val CapsuleShape = RoundedCornerShape(6.dp)
app/src/main/java/eu/darken/capod/main/ui/overview/cards/SinglePodsCard.kt
+3 -3
View File
@@ -48,9 +48,9 @@ import eu.darken.capod.monitor.core.PodDevice
import eu.darken.capod.monitor.core.firstSeenFormatted
import eu.darken.capod.monitor.core.getSignalQuality
import eu.darken.capod.monitor.core.lastSeenFormatted
import eu.darken.capod.pods.core.apple.ApplePods
import eu.darken.capod.pods.core.apple.protocol.aap.AapSetting
import eu.darken.capod.pods.core.formatBatteryPercent
import eu.darken.capod.pods.core.apple.ble.devices.ApplePods
import eu.darken.capod.pods.core.apple.aap.protocol.AapSetting
import eu.darken.capod.pods.core.apple.ble.formatBatteryPercent
import java.time.Duration
import java.time.Instant
app/src/main/java/eu/darken/capod/main/ui/overview/cards/UnknownPodDeviceCard.kt
+1 -1
View File
@@ -27,7 +27,7 @@ import eu.darken.capod.common.compose.preview.MockPodDataProvider
import eu.darken.capod.monitor.core.PodDevice
import eu.darken.capod.monitor.core.getSignalQuality
import eu.darken.capod.monitor.core.lastSeenFormatted
import eu.darken.capod.pods.core.apple.ApplePods
import eu.darken.capod.pods.core.apple.ble.devices.ApplePods
import java.time.Instant
@Composable
app/src/main/java/eu/darken/capod/main/ui/widget/ComposeWidgetPreview.kt
+1 -1
View File
@@ -30,7 +30,7 @@ import androidx.compose.ui.unit.sp
import eu.darken.capod.R
import eu.darken.capod.common.compose.Preview2
import eu.darken.capod.common.compose.PreviewWrapper
import eu.darken.capod.pods.core.toBatteryOrNull
import eu.darken.capod.pods.core.apple.ble.toBatteryOrNull
import kotlin.math.roundToInt
@Composable
app/src/main/java/eu/darken/capod/main/ui/widget/GlanceWidgetContent.kt
+1 -1
View File
@@ -26,7 +26,7 @@ import androidx.glance.text.TextAlign
import androidx.glance.text.TextStyle
import eu.darken.capod.R
import eu.darken.capod.main.ui.MainActivity
import eu.darken.capod.pods.core.toBatteryOrNull
import eu.darken.capod.pods.core.apple.ble.toBatteryOrNull
import kotlin.math.roundToInt
@Composable
app/src/main/java/eu/darken/capod/main/ui/widget/WidgetConfigurationScreen.kt
+1 -1
View File
@@ -77,7 +77,7 @@ import eu.darken.capod.R
import eu.darken.capod.common.compose.Preview2
import eu.darken.capod.common.compose.PreviewWrapper
import eu.darken.capod.common.compose.preview.MockPodDataProvider
import eu.darken.capod.pods.core.PodModel
import eu.darken.capod.pods.core.apple.PodModel
import eu.darken.capod.profiles.core.DeviceProfile
@OptIn(ExperimentalLayoutApi::class)
app/src/main/java/eu/darken/capod/main/ui/widget/WidgetRenderStateMapper.kt
+3 -3
View File
@@ -5,9 +5,9 @@ import androidx.annotation.ColorInt
import androidx.appcompat.view.ContextThemeWrapper
import eu.darken.capod.R
import eu.darken.capod.monitor.core.PodDevice
import eu.darken.capod.pods.core.PodModel
import eu.darken.capod.pods.core.getBatteryDrawable
import eu.darken.capod.pods.core.toBatteryFloat
import eu.darken.capod.pods.core.apple.PodModel
import eu.darken.capod.pods.core.apple.ble.getBatteryDrawable
import eu.darken.capod.pods.core.apple.ble.toBatteryFloat
object WidgetRenderStateMapper {
app/src/main/java/eu/darken/capod/monitor/core/BlePodMonitor.kt
+3 -3
View File
@@ -16,9 +16,9 @@ import eu.darken.capod.common.flow.replayingShare
import eu.darken.capod.common.flow.throttleLatest
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.ble.ProximityPairing
import eu.darken.capod.pods.core.apple.ble.BlePodSnapshot
import eu.darken.capod.pods.core.apple.ble.PodFactory
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityPairing
import eu.darken.capod.profiles.core.DeviceProfilesRepo
import eu.darken.capod.profiles.core.currentProfiles
import kotlinx.coroutines.CoroutineScope
app/src/main/java/eu/darken/capod/monitor/core/DeviceMonitor.kt
+1 -1
View File
@@ -2,7 +2,7 @@ package eu.darken.capod.monitor.core
import eu.darken.capod.common.debug.logging.log
import eu.darken.capod.common.debug.logging.logTag
import eu.darken.capod.pods.core.apple.protocol.aap.AapConnectionManager
import eu.darken.capod.pods.core.apple.aap.AapConnectionManager
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.firstOrNull
app/src/main/java/eu/darken/capod/monitor/core/PodDevice.kt
+13 -13
View File
@@ -2,19 +2,19 @@ package eu.darken.capod.monitor.core
import android.content.Context
import eu.darken.capod.common.bluetooth.BluetoothAddress
import eu.darken.capod.pods.core.BlePodSnapshot
import eu.darken.capod.pods.core.DualBlePodSnapshot
import eu.darken.capod.pods.core.HasCase
import eu.darken.capod.pods.core.HasChargeDetection
import eu.darken.capod.pods.core.HasChargeDetectionDual
import eu.darken.capod.pods.core.HasDualMicrophone
import eu.darken.capod.pods.core.HasEarDetection
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.DualApplePods
import eu.darken.capod.pods.core.apple.protocol.aap.AapPodState
import eu.darken.capod.pods.core.apple.protocol.aap.AapSetting
import eu.darken.capod.pods.core.apple.ble.BlePodSnapshot
import eu.darken.capod.pods.core.apple.ble.DualBlePodSnapshot
import eu.darken.capod.pods.core.apple.ble.devices.HasCase
import eu.darken.capod.pods.core.apple.ble.devices.HasChargeDetection
import eu.darken.capod.pods.core.apple.ble.devices.HasChargeDetectionDual
import eu.darken.capod.pods.core.apple.ble.devices.HasDualMicrophone
import eu.darken.capod.pods.core.apple.ble.devices.HasEarDetection
import eu.darken.capod.pods.core.apple.ble.devices.HasEarDetectionDual
import eu.darken.capod.pods.core.apple.PodModel
import eu.darken.capod.pods.core.apple.ble.SingleBlePodSnapshot
import eu.darken.capod.pods.core.apple.ble.devices.DualApplePods
import eu.darken.capod.pods.core.apple.aap.AapPodState
import eu.darken.capod.pods.core.apple.aap.protocol.AapSetting
import java.time.Instant
/**
app/src/main/java/eu/darken/capod/monitor/core/PodMonitorExtensions.kt
+1 -1
View File
@@ -1,6 +1,6 @@
package eu.darken.capod.monitor.core
import eu.darken.capod.pods.core.BlePodSnapshot
import eu.darken.capod.pods.core.apple.ble.BlePodSnapshot
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.map
app/src/main/java/eu/darken/capod/monitor/core/receiver/BluetoothEventReceiver.kt
+1 -1
View File
@@ -12,7 +12,7 @@ import eu.darken.capod.common.debug.logging.Logging.Priority.WARN
import eu.darken.capod.common.debug.logging.log
import eu.darken.capod.common.debug.logging.logTag
import eu.darken.capod.monitor.core.worker.MonitorControl
import eu.darken.capod.pods.core.apple.protocol.ContinuityProtocol
import eu.darken.capod.pods.core.apple.ble.protocol.ContinuityProtocol
import javax.inject.Inject
@AndroidEntryPoint
app/src/main/java/eu/darken/capod/monitor/ui/MonitorNotificationViewFactory.kt
+3 -3
View File
@@ -6,9 +6,9 @@ import android.widget.RemoteViews
import dagger.hilt.android.qualifiers.ApplicationContext
import eu.darken.capod.R
import eu.darken.capod.monitor.core.PodDevice
import eu.darken.capod.pods.core.PodModel
import eu.darken.capod.pods.core.formatBatteryPercent
import eu.darken.capod.pods.core.getBatteryDrawable
import eu.darken.capod.pods.core.apple.PodModel
import eu.darken.capod.pods.core.apple.ble.formatBatteryPercent
import eu.darken.capod.pods.core.apple.ble.getBatteryDrawable
import javax.inject.Inject
import kotlin.math.roundToInt
app/src/main/java/eu/darken/capod/monitor/ui/MonitorNotifications.kt
+2 -2
View File
@@ -16,8 +16,8 @@ import eu.darken.capod.common.debug.logging.logTag
import eu.darken.capod.common.notifications.PendingIntentCompat
import eu.darken.capod.main.ui.MainActivity
import eu.darken.capod.monitor.core.PodDevice
import eu.darken.capod.pods.core.PodModel
import eu.darken.capod.pods.core.formatBatteryPercent
import eu.darken.capod.pods.core.apple.PodModel
import eu.darken.capod.pods.core.apple.ble.formatBatteryPercent
import javax.inject.Inject
app/src/main/java/eu/darken/capod/pods/core/PodModel.kt → app/src/main/java/eu/darken/capod/pods/core/apple/PodModel.kt
+2 -2
View File
@@ -1,4 +1,4 @@
package eu.darken.capod.pods.core
package eu.darken.capod.pods.core.apple
import androidx.annotation.DrawableRes
import eu.darken.capod.R
@@ -377,4 +377,4 @@ enum class PodModel(
// Protocol
val needsInitExt: Boolean = false,
)
}
}
app/src/main/java/eu/darken/capod/pods/core/apple/protocol/aap/AapConnection.kt → app/src/main/java/eu/darken/capod/pods/core/apple/aap/AapConnection.kt
+7 -3
View File
@@ -1,4 +1,4 @@
package eu.darken.capod.pods.core.apple.protocol.aap
package eu.darken.capod.pods.core.apple.aap
import android.annotation.SuppressLint
import android.bluetooth.BluetoothDevice
@@ -6,9 +6,13 @@ import android.bluetooth.BluetoothSocket
import eu.darken.capod.common.bluetooth.l2cap.L2capSocketFactory
import eu.darken.capod.common.debug.logging.Logging.Priority.ERROR
import eu.darken.capod.common.debug.logging.Logging.Priority.VERBOSE
import eu.darken.capod.common.debug.logging.Logging.Priority.WARN
import eu.darken.capod.common.debug.logging.log
import eu.darken.capod.common.debug.logging.logTag
import eu.darken.capod.pods.core.apple.aap.protocol.AapCommand
import eu.darken.capod.pods.core.apple.aap.protocol.AapDeviceProfile
import eu.darken.capod.pods.core.apple.aap.protocol.AapFramer
import eu.darken.capod.pods.core.apple.aap.protocol.AapMessage
import eu.darken.capod.pods.core.apple.aap.protocol.KeyExchangeResult
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Job
@@ -147,7 +151,7 @@ internal class AapConnection(
// L2CAP SEQPACKET: each read() returns exactly one complete message
val raw = buf.copyOfRange(0, len)
val message = AapMessage.parse(raw)
val message = AapMessage.Companion.parse(raw)
if (message != null) {
processMessage(message)
if (!handshakeResponseReceived && message.commandType != 0x0009) {
app/src/main/java/eu/darken/capod/pods/core/apple/protocol/aap/AapConnectionManager.kt → app/src/main/java/eu/darken/capod/pods/core/apple/aap/AapConnectionManager.kt
+6 -3
View File
@@ -1,4 +1,4 @@
package eu.darken.capod.pods.core.apple.protocol.aap
package eu.darken.capod.pods.core.apple.aap
import android.bluetooth.BluetoothDevice
import eu.darken.capod.common.bluetooth.BluetoothAddress
@@ -6,7 +6,10 @@ import eu.darken.capod.common.debug.logging.log
import eu.darken.capod.common.debug.logging.logTag
import eu.darken.capod.common.bluetooth.l2cap.L2capSocketFactory
import eu.darken.capod.common.coroutine.AppScope
import eu.darken.capod.pods.core.PodModel
import eu.darken.capod.pods.core.apple.PodModel
import eu.darken.capod.pods.core.apple.aap.protocol.AapCommand
import eu.darken.capod.pods.core.apple.aap.protocol.AapDeviceProfile
import eu.darken.capod.pods.core.apple.aap.protocol.KeyExchangeResult
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Job
import kotlinx.coroutines.cancel
@@ -68,7 +71,7 @@ class AapConnectionManager @Inject constructor(
// Clear stale intentional-disconnect flag from previous connection lifecycle
intentionalDisconnects.remove(address)
val profile = AapDeviceProfile.forModel(model)
val profile = AapDeviceProfile.Companion.forModel(model)
val connection = AapConnection(device, profile, socketFactory)
connections[address] = connection
app/src/main/java/eu/darken/capod/pods/core/apple/protocol/aap/AapPodState.kt → app/src/main/java/eu/darken/capod/pods/core/apple/aap/AapPodState.kt
+3 -1
View File
@@ -1,5 +1,7 @@
package eu.darken.capod.pods.core.apple.protocol.aap
package eu.darken.capod.pods.core.apple.aap
import eu.darken.capod.pods.core.apple.aap.protocol.AapDeviceInfo
import eu.darken.capod.pods.core.apple.aap.protocol.AapSetting
import kotlin.reflect.KClass
/**
app/src/main/java/eu/darken/capod/pods/core/apple/protocol/aap/AapCommand.kt → app/src/main/java/eu/darken/capod/pods/core/apple/aap/protocol/AapCommand.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package eu.darken.capod.pods.core.apple.protocol.aap
package eu.darken.capod.pods.core.apple.aap.protocol
/**
* Outbound commands to change device settings. Pure domain — no wire protocol bytes.
app/src/main/java/eu/darken/capod/pods/core/apple/protocol/aap/AapDeviceInfo.kt → app/src/main/java/eu/darken/capod/pods/core/apple/aap/protocol/AapDeviceInfo.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package eu.darken.capod.pods.core.apple.protocol.aap
package eu.darken.capod.pods.core.apple.aap.protocol
/**
* Device identity parsed from the AAP handshake response (message type 0x1D).
app/src/main/java/eu/darken/capod/pods/core/apple/protocol/aap/AapDeviceProfile.kt → app/src/main/java/eu/darken/capod/pods/core/apple/aap/protocol/AapDeviceProfile.kt
+3 -2
View File
@@ -1,6 +1,7 @@
package eu.darken.capod.pods.core.apple.protocol.aap
package eu.darken.capod.pods.core.apple.aap.protocol
import eu.darken.capod.pods.core.PodModel
import eu.darken.capod.pods.core.apple.PodModel
import eu.darken.capod.pods.core.apple.aap.AapPodState
import kotlin.reflect.KClass
/**
app/src/main/java/eu/darken/capod/pods/core/apple/protocol/aap/AapMessage.kt → app/src/main/java/eu/darken/capod/pods/core/apple/aap/protocol/AapMessage.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package eu.darken.capod.pods.core.apple.protocol.aap
package eu.darken.capod.pods.core.apple.aap.protocol
/**
* A parsed AAP protocol message.
app/src/main/java/eu/darken/capod/pods/core/apple/protocol/aap/AapSetting.kt → app/src/main/java/eu/darken/capod/pods/core/apple/aap/protocol/AapSetting.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package eu.darken.capod.pods.core.apple.protocol.aap
package eu.darken.capod.pods.core.apple.aap.protocol
/**
* Device-reported settings. Pure domain — no wire protocol bytes.
app/src/main/java/eu/darken/capod/pods/core/apple/protocol/aap/DefaultAapDeviceProfile.kt → app/src/main/java/eu/darken/capod/pods/core/apple/aap/protocol/DefaultAapDeviceProfile.kt
+3 -2
View File
@@ -1,6 +1,7 @@
package eu.darken.capod.pods.core.apple.protocol.aap
package eu.darken.capod.pods.core.apple.aap.protocol
import eu.darken.capod.pods.core.PodModel
import eu.darken.capod.pods.core.apple.PodModel
import eu.darken.capod.pods.core.apple.aap.AapPodState
import kotlin.reflect.KClass
/**
app/src/main/java/eu/darken/capod/pods/core/apple/protocol/aap/KeyExchangeResult.kt → app/src/main/java/eu/darken/capod/pods/core/apple/aap/protocol/KeyExchangeResult.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package eu.darken.capod.pods.core.apple.protocol.aap
package eu.darken.capod.pods.core.apple.aap.protocol
/**
* Result of parsing an AAP private key response (command 0x31).
app/src/main/java/eu/darken/capod/pods/core/apple/AppleFactory.kt → app/src/main/java/eu/darken/capod/pods/core/apple/ble/AppleFactory.kt
+10 -9
View File
@@ -1,4 +1,4 @@
package eu.darken.capod.pods.core.apple
package eu.darken.capod.pods.core.apple.ble
import eu.darken.capod.common.bluetooth.BleScanResult
import eu.darken.capod.common.debug.logging.Logging.Priority.VERBOSE
@@ -6,14 +6,15 @@ import eu.darken.capod.common.debug.logging.Logging.Priority.WARN
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.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.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.pods.core.apple.ble.devices.ApplePods
import eu.darken.capod.pods.core.apple.ble.devices.ApplePodsFactory
import eu.darken.capod.pods.core.apple.PodModel
import eu.darken.capod.pods.core.apple.ble.devices.misc.UnknownAppleSnapshotBle
import eu.darken.capod.pods.core.apple.ble.protocol.ContinuityProtocol
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityMessage
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityPairing
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityPayload
import eu.darken.capod.pods.core.apple.ble.protocol.RPAChecker
import eu.darken.capod.profiles.core.AppleDeviceProfile
import eu.darken.capod.profiles.core.DeviceProfilesRepo
import eu.darken.capod.profiles.core.currentProfiles
app/src/main/java/eu/darken/capod/pods/core/apple/AppleFactoryModule.kt → app/src/main/java/eu/darken/capod/pods/core/apple/ble/AppleFactoryModule.kt
+27 -26
View File
@@ -1,35 +1,36 @@
package eu.darken.capod.pods.core.apple
package eu.darken.capod.pods.core.apple.ble
import dagger.Binds
import dagger.Module
import dagger.hilt.InstallIn
import dagger.hilt.components.SingletonComponent
import dagger.multibindings.IntoSet
import eu.darken.capod.pods.core.apple.airpods.AirPodsGen1
import eu.darken.capod.pods.core.apple.airpods.AirPodsGen2
import eu.darken.capod.pods.core.apple.airpods.AirPodsGen3
import eu.darken.capod.pods.core.apple.airpods.AirPodsGen4
import eu.darken.capod.pods.core.apple.airpods.AirPodsGen4Anc
import eu.darken.capod.pods.core.apple.airpods.AirPodsMax
import eu.darken.capod.pods.core.apple.airpods.AirPodsMaxUsbc
import eu.darken.capod.pods.core.apple.airpods.AirPodsPro
import eu.darken.capod.pods.core.apple.airpods.AirPodsPro2
import eu.darken.capod.pods.core.apple.airpods.AirPodsPro2Usbc
import eu.darken.capod.pods.core.apple.airpods.AirPodsPro3
import eu.darken.capod.pods.core.apple.beats.BeatsFitPro
import eu.darken.capod.pods.core.apple.beats.BeatsFlex
import eu.darken.capod.pods.core.apple.beats.BeatsSolo3
import eu.darken.capod.pods.core.apple.beats.BeatsStudio3
import eu.darken.capod.pods.core.apple.beats.BeatsX
import eu.darken.capod.pods.core.apple.beats.PowerBeats3
import eu.darken.capod.pods.core.apple.beats.PowerBeats4
import eu.darken.capod.pods.core.apple.beats.PowerBeatsPro
import eu.darken.capod.pods.core.apple.beats.PowerBeatsPro2
import eu.darken.capod.pods.core.apple.misc.FakeAirPodsGen1
import eu.darken.capod.pods.core.apple.misc.FakeAirPodsGen2
import eu.darken.capod.pods.core.apple.misc.FakeAirPodsGen3
import eu.darken.capod.pods.core.apple.misc.FakeAirPodsPro
import eu.darken.capod.pods.core.apple.misc.FakeAirPodsPro2
import eu.darken.capod.pods.core.apple.ble.devices.ApplePodsFactory
import eu.darken.capod.pods.core.apple.ble.devices.airpods.AirPodsGen1
import eu.darken.capod.pods.core.apple.ble.devices.airpods.AirPodsGen2
import eu.darken.capod.pods.core.apple.ble.devices.airpods.AirPodsGen3
import eu.darken.capod.pods.core.apple.ble.devices.airpods.AirPodsGen4
import eu.darken.capod.pods.core.apple.ble.devices.airpods.AirPodsGen4Anc
import eu.darken.capod.pods.core.apple.ble.devices.airpods.AirPodsMax
import eu.darken.capod.pods.core.apple.ble.devices.airpods.AirPodsMaxUsbc
import eu.darken.capod.pods.core.apple.ble.devices.airpods.AirPodsPro
import eu.darken.capod.pods.core.apple.ble.devices.airpods.AirPodsPro2
import eu.darken.capod.pods.core.apple.ble.devices.airpods.AirPodsPro2Usbc
import eu.darken.capod.pods.core.apple.ble.devices.airpods.AirPodsPro3
import eu.darken.capod.pods.core.apple.ble.devices.beats.BeatsFitPro
import eu.darken.capod.pods.core.apple.ble.devices.beats.BeatsFlex
import eu.darken.capod.pods.core.apple.ble.devices.beats.BeatsSolo3
import eu.darken.capod.pods.core.apple.ble.devices.beats.BeatsStudio3
import eu.darken.capod.pods.core.apple.ble.devices.beats.BeatsX
import eu.darken.capod.pods.core.apple.ble.devices.beats.PowerBeats3
import eu.darken.capod.pods.core.apple.ble.devices.beats.PowerBeats4
import eu.darken.capod.pods.core.apple.ble.devices.beats.PowerBeatsPro
import eu.darken.capod.pods.core.apple.ble.devices.beats.PowerBeatsPro2
import eu.darken.capod.pods.core.apple.ble.devices.misc.FakeAirPodsGen1
import eu.darken.capod.pods.core.apple.ble.devices.misc.FakeAirPodsGen2
import eu.darken.capod.pods.core.apple.ble.devices.misc.FakeAirPodsGen3
import eu.darken.capod.pods.core.apple.ble.devices.misc.FakeAirPodsPro
import eu.darken.capod.pods.core.apple.ble.devices.misc.FakeAirPodsPro2
@InstallIn(SingletonComponent::class)
@Module
app/src/main/java/eu/darken/capod/pods/core/BlePodSnapshot.kt → app/src/main/java/eu/darken/capod/pods/core/apple/ble/BlePodSnapshot.kt
+2 -1
View File
@@ -1,4 +1,4 @@
package eu.darken.capod.pods.core
package eu.darken.capod.pods.core.apple.ble
import android.content.Context
import androidx.annotation.DrawableRes
@@ -6,6 +6,7 @@ import eu.darken.capod.common.bluetooth.BleScanResult
import eu.darken.capod.common.bluetooth.BluetoothAddress
import eu.darken.capod.common.debug.logging.Logging.Priority.VERBOSE
import eu.darken.capod.common.debug.logging.log
import eu.darken.capod.pods.core.apple.PodModel
import eu.darken.capod.profiles.core.DeviceProfile
import java.time.Duration
import java.time.Instant
app/src/main/java/eu/darken/capod/pods/core/DualBlePodSnapshot.kt → app/src/main/java/eu/darken/capod/pods/core/apple/ble/DualBlePodSnapshot.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package eu.darken.capod.pods.core
package eu.darken.capod.pods.core.apple.ble
import androidx.annotation.DrawableRes
import eu.darken.capod.R
app/src/main/java/eu/darken/capod/pods/core/PodDeviceExtensions.kt → app/src/main/java/eu/darken/capod/pods/core/apple/ble/PodDeviceExtensions.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package eu.darken.capod.pods.core
package eu.darken.capod.pods.core.apple.ble
import android.content.Context
import android.icu.text.RelativeDateTimeFormatter
app/src/main/java/eu/darken/capod/pods/core/PodFactory.kt → app/src/main/java/eu/darken/capod/pods/core/apple/ble/PodFactory.kt
+1 -2
View File
@@ -1,4 +1,4 @@
package eu.darken.capod.pods.core
package eu.darken.capod.pods.core.apple.ble
import dagger.Reusable
import eu.darken.capod.common.bluetooth.BleScanResult
@@ -6,7 +6,6 @@ import eu.darken.capod.common.debug.logging.Logging.Priority.INFO
import eu.darken.capod.common.debug.logging.Logging.Priority.VERBOSE
import eu.darken.capod.common.debug.logging.log
import eu.darken.capod.common.debug.logging.logTag
import eu.darken.capod.pods.core.apple.AppleFactory
import eu.darken.capod.pods.core.unknown.UnknownDeviceFactory
import javax.inject.Inject
app/src/main/java/eu/darken/capod/pods/core/SingleBlePodSnapshot.kt → app/src/main/java/eu/darken/capod/pods/core/apple/ble/SingleBlePodSnapshot.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package eu.darken.capod.pods.core
package eu.darken.capod.pods.core.apple.ble
interface SingleBlePodSnapshot : BlePodSnapshot {
app/src/main/java/eu/darken/capod/pods/core/apple/ApplePods.kt → app/src/main/java/eu/darken/capod/pods/core/apple/ble/devices/ApplePods.kt
+3 -3
View File
@@ -1,9 +1,9 @@
package eu.darken.capod.pods.core.apple
package eu.darken.capod.pods.core.apple.ble.devices
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.ble.ProximityPayload
import eu.darken.capod.pods.core.apple.ble.BlePodSnapshot
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityPayload
import eu.darken.capod.profiles.core.AppleDeviceProfile
interface ApplePods : BlePodSnapshot {
app/src/main/java/eu/darken/capod/pods/core/apple/ApplePodsFactory.kt → app/src/main/java/eu/darken/capod/pods/core/apple/ble/devices/ApplePodsFactory.kt
+4 -4
View File
@@ -1,9 +1,9 @@
package eu.darken.capod.pods.core.apple
package eu.darken.capod.pods.core.apple.ble.devices
import eu.darken.capod.common.bluetooth.BleScanResult
import eu.darken.capod.pods.core.apple.history.KnownDevice
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityMessage
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPayload
import eu.darken.capod.pods.core.apple.ble.history.KnownDevice
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityMessage
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityPayload
interface ApplePodsFactory {
fun isResponsible(message: ProximityMessage): Boolean
app/src/main/java/eu/darken/capod/pods/core/apple/DualApplePods.kt → app/src/main/java/eu/darken/capod/pods/core/apple/ble/devices/DualApplePods.kt
+3 -7
View File
@@ -1,15 +1,11 @@
package eu.darken.capod.pods.core.apple
package eu.darken.capod.pods.core.apple.ble.devices
import eu.darken.capod.common.debug.logging.log
import eu.darken.capod.common.isBitSet
import eu.darken.capod.common.lowerNibble
import eu.darken.capod.common.upperNibble
import eu.darken.capod.pods.core.DualBlePodSnapshot
import eu.darken.capod.pods.core.DualBlePodSnapshot.Pod
import eu.darken.capod.pods.core.HasCase
import eu.darken.capod.pods.core.HasChargeDetectionDual
import eu.darken.capod.pods.core.HasDualMicrophone
import eu.darken.capod.pods.core.HasEarDetectionDual
import eu.darken.capod.pods.core.apple.ble.DualBlePodSnapshot
import eu.darken.capod.pods.core.apple.ble.DualBlePodSnapshot.Pod
interface DualApplePods : ApplePods, HasChargeDetectionDual, DualBlePodSnapshot, HasEarDetectionDual, HasCase,
HasDualMicrophone, HasAppleColor {
app/src/main/java/eu/darken/capod/pods/core/apple/HasAppleColor.kt → app/src/main/java/eu/darken/capod/pods/core/apple/ble/devices/HasAppleColor.kt
+3 -4
View File
@@ -1,8 +1,7 @@
package eu.darken.capod.pods.core.apple
package eu.darken.capod.pods.core.apple.ble.devices
import android.R
import android.content.Context
import eu.darken.capod.pods.core.HasPodStyle
import eu.darken.capod.R
interface HasAppleColor : ApplePods, HasPodStyle {
@@ -29,7 +28,7 @@ interface HasAppleColor : ApplePods, HasPodStyle {
override fun getLabel(context: Context): String = this.name
override fun getColor(context: Context): Int = android.R.color.white
override fun getColor(context: Context): Int = R.color.white
override val identifier: String
get() = name
app/src/main/java/eu/darken/capod/pods/core/HasCase.kt → app/src/main/java/eu/darken/capod/pods/core/apple/ble/devices/HasCase.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package eu.darken.capod.pods.core
package eu.darken.capod.pods.core.apple.ble.devices
import androidx.annotation.DrawableRes
import eu.darken.capod.R
app/src/main/java/eu/darken/capod/pods/core/HasChargeDetection.kt → app/src/main/java/eu/darken/capod/pods/core/apple/ble/devices/HasChargeDetection.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package eu.darken.capod.pods.core
package eu.darken.capod.pods.core.apple.ble.devices
interface HasChargeDetection {
app/src/main/java/eu/darken/capod/pods/core/HasChargeDetectionDual.kt → app/src/main/java/eu/darken/capod/pods/core/apple/ble/devices/HasChargeDetectionDual.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package eu.darken.capod.pods.core
package eu.darken.capod.pods.core.apple.ble.devices
interface HasChargeDetectionDual : HasChargeDetection {
app/src/main/java/eu/darken/capod/pods/core/HasDualMicrophone.kt → app/src/main/java/eu/darken/capod/pods/core/apple/ble/devices/HasDualMicrophone.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package eu.darken.capod.pods.core
package eu.darken.capod.pods.core.apple.ble.devices
interface HasDualMicrophone {
app/src/main/java/eu/darken/capod/pods/core/HasEarDetection.kt → app/src/main/java/eu/darken/capod/pods/core/apple/ble/devices/HasEarDetection.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package eu.darken.capod.pods.core
package eu.darken.capod.pods.core.apple.ble.devices
interface HasEarDetection {
app/src/main/java/eu/darken/capod/pods/core/HasEarDetectionDual.kt → app/src/main/java/eu/darken/capod/pods/core/apple/ble/devices/HasEarDetectionDual.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package eu.darken.capod.pods.core
package eu.darken.capod.pods.core.apple.ble.devices
interface HasEarDetectionDual : HasEarDetection {
app/src/main/java/eu/darken/capod/pods/core/HasPodStyle.kt → app/src/main/java/eu/darken/capod/pods/core/apple/ble/devices/HasPodStyle.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package eu.darken.capod.pods.core
package eu.darken.capod.pods.core.apple.ble.devices
import android.content.Context
import androidx.annotation.ColorRes
app/src/main/java/eu/darken/capod/pods/core/HasStateDetection.kt → app/src/main/java/eu/darken/capod/pods/core/apple/ble/devices/HasStateDetection.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package eu.darken.capod.pods.core
package eu.darken.capod.pods.core.apple.ble.devices
import android.content.Context
app/src/main/java/eu/darken/capod/pods/core/apple/SingleApplePods.kt → app/src/main/java/eu/darken/capod/pods/core/apple/ble/devices/SingleApplePods.kt
+2 -2
View File
@@ -1,8 +1,8 @@
package eu.darken.capod.pods.core.apple
package eu.darken.capod.pods.core.apple.ble.devices
import eu.darken.capod.common.debug.logging.log
import eu.darken.capod.common.lowerNibble
import eu.darken.capod.pods.core.SingleBlePodSnapshot
import eu.darken.capod.pods.core.apple.ble.SingleBlePodSnapshot
/**
* Devices that only present a single charge level, e.g. most Beats devices
app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen1.kt → app/src/main/java/eu/darken/capod/pods/core/apple/ble/devices/airpods/AirPodsGen1.kt
+10 -10
View File
@@ -1,16 +1,16 @@
package eu.darken.capod.pods.core.apple.airpods
package eu.darken.capod.pods.core.apple.ble.devices.airpods
import eu.darken.capod.common.bluetooth.BleScanResult
import eu.darken.capod.common.debug.logging.logTag
import eu.darken.capod.pods.core.BlePodSnapshot
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.DualApplePods
import eu.darken.capod.pods.core.apple.history.PodHistoryRepo
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.ble.BlePodSnapshot
import eu.darken.capod.pods.core.apple.PodModel
import eu.darken.capod.pods.core.apple.ble.devices.ApplePods
import eu.darken.capod.pods.core.apple.ble.devices.ApplePodsFactory
import eu.darken.capod.pods.core.apple.ble.devices.DualApplePods
import eu.darken.capod.pods.core.apple.ble.history.PodHistoryRepo
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityMessage
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityPairing
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityPayload
import java.time.Instant
import javax.inject.Inject
app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen2.kt → app/src/main/java/eu/darken/capod/pods/core/apple/ble/devices/airpods/AirPodsGen2.kt
+10 -10
View File
@@ -1,16 +1,16 @@
package eu.darken.capod.pods.core.apple.airpods
package eu.darken.capod.pods.core.apple.ble.devices.airpods
import eu.darken.capod.common.bluetooth.BleScanResult
import eu.darken.capod.common.debug.logging.logTag
import eu.darken.capod.pods.core.BlePodSnapshot
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.DualApplePods
import eu.darken.capod.pods.core.apple.history.PodHistoryRepo
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.ble.BlePodSnapshot
import eu.darken.capod.pods.core.apple.PodModel
import eu.darken.capod.pods.core.apple.ble.devices.ApplePods
import eu.darken.capod.pods.core.apple.ble.devices.ApplePodsFactory
import eu.darken.capod.pods.core.apple.ble.devices.DualApplePods
import eu.darken.capod.pods.core.apple.ble.history.PodHistoryRepo
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityMessage
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityPairing
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityPayload
import java.time.Instant
import javax.inject.Inject
app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen3.kt → app/src/main/java/eu/darken/capod/pods/core/apple/ble/devices/airpods/AirPodsGen3.kt
+10 -10
View File
@@ -1,18 +1,18 @@
package eu.darken.capod.pods.core.apple.airpods
package eu.darken.capod.pods.core.apple.ble.devices.airpods
import androidx.annotation.DrawableRes
import eu.darken.capod.R
import eu.darken.capod.common.bluetooth.BleScanResult
import eu.darken.capod.common.debug.logging.logTag
import eu.darken.capod.pods.core.BlePodSnapshot
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.DualApplePods
import eu.darken.capod.pods.core.apple.history.PodHistoryRepo
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.ble.BlePodSnapshot
import eu.darken.capod.pods.core.apple.PodModel
import eu.darken.capod.pods.core.apple.ble.devices.ApplePods
import eu.darken.capod.pods.core.apple.ble.devices.ApplePodsFactory
import eu.darken.capod.pods.core.apple.ble.devices.DualApplePods
import eu.darken.capod.pods.core.apple.ble.history.PodHistoryRepo
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityMessage
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityPairing
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityPayload
import java.time.Instant
import javax.inject.Inject
app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen4.kt → app/src/main/java/eu/darken/capod/pods/core/apple/ble/devices/airpods/AirPodsGen4.kt
+10 -10
View File
@@ -1,18 +1,18 @@
package eu.darken.capod.pods.core.apple.airpods
package eu.darken.capod.pods.core.apple.ble.devices.airpods
import androidx.annotation.DrawableRes
import eu.darken.capod.R
import eu.darken.capod.common.bluetooth.BleScanResult
import eu.darken.capod.common.debug.logging.logTag
import eu.darken.capod.pods.core.BlePodSnapshot
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.DualApplePods
import eu.darken.capod.pods.core.apple.history.PodHistoryRepo
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.ble.BlePodSnapshot
import eu.darken.capod.pods.core.apple.PodModel
import eu.darken.capod.pods.core.apple.ble.devices.ApplePods
import eu.darken.capod.pods.core.apple.ble.devices.ApplePodsFactory
import eu.darken.capod.pods.core.apple.ble.devices.DualApplePods
import eu.darken.capod.pods.core.apple.ble.history.PodHistoryRepo
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityMessage
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityPairing
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityPayload
import java.time.Instant
import javax.inject.Inject
app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen4Anc.kt → app/src/main/java/eu/darken/capod/pods/core/apple/ble/devices/airpods/AirPodsGen4Anc.kt
+10 -10
View File
@@ -1,18 +1,18 @@
package eu.darken.capod.pods.core.apple.airpods
package eu.darken.capod.pods.core.apple.ble.devices.airpods
import androidx.annotation.DrawableRes
import eu.darken.capod.R
import eu.darken.capod.common.bluetooth.BleScanResult
import eu.darken.capod.common.debug.logging.logTag
import eu.darken.capod.pods.core.BlePodSnapshot
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.DualApplePods
import eu.darken.capod.pods.core.apple.history.PodHistoryRepo
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.ble.BlePodSnapshot
import eu.darken.capod.pods.core.apple.PodModel
import eu.darken.capod.pods.core.apple.ble.devices.ApplePods
import eu.darken.capod.pods.core.apple.ble.devices.ApplePodsFactory
import eu.darken.capod.pods.core.apple.ble.devices.DualApplePods
import eu.darken.capod.pods.core.apple.ble.history.PodHistoryRepo
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityMessage
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityPairing
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityPayload
import java.time.Instant
import javax.inject.Inject
app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsMax.kt → app/src/main/java/eu/darken/capod/pods/core/apple/ble/devices/airpods/AirPodsMax.kt
+13 -13
View File
@@ -1,20 +1,20 @@
package eu.darken.capod.pods.core.apple.airpods
package eu.darken.capod.pods.core.apple.ble.devices.airpods
import eu.darken.capod.common.bluetooth.BleScanResult
import eu.darken.capod.common.debug.logging.logTag
import eu.darken.capod.common.isBitSet
import eu.darken.capod.pods.core.BlePodSnapshot
import eu.darken.capod.pods.core.HasChargeDetection
import eu.darken.capod.pods.core.HasEarDetection
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.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.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.ble.BlePodSnapshot
import eu.darken.capod.pods.core.apple.ble.devices.HasChargeDetection
import eu.darken.capod.pods.core.apple.ble.devices.HasEarDetection
import eu.darken.capod.pods.core.apple.PodModel
import eu.darken.capod.pods.core.apple.ble.devices.ApplePods
import eu.darken.capod.pods.core.apple.ble.devices.ApplePodsFactory
import eu.darken.capod.pods.core.apple.ble.devices.HasAppleColor
import eu.darken.capod.pods.core.apple.ble.devices.SingleApplePods
import eu.darken.capod.pods.core.apple.ble.history.PodHistoryRepo
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityMessage
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityPairing
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityPayload
import java.time.Instant
import javax.inject.Inject
app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsMaxUsbc.kt → app/src/main/java/eu/darken/capod/pods/core/apple/ble/devices/airpods/AirPodsMaxUsbc.kt
+13 -13
View File
@@ -1,20 +1,20 @@
package eu.darken.capod.pods.core.apple.airpods
package eu.darken.capod.pods.core.apple.ble.devices.airpods
import eu.darken.capod.common.bluetooth.BleScanResult
import eu.darken.capod.common.debug.logging.logTag
import eu.darken.capod.common.isBitSet
import eu.darken.capod.pods.core.BlePodSnapshot
import eu.darken.capod.pods.core.HasChargeDetection
import eu.darken.capod.pods.core.HasEarDetection
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.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.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.ble.BlePodSnapshot
import eu.darken.capod.pods.core.apple.ble.devices.HasChargeDetection
import eu.darken.capod.pods.core.apple.ble.devices.HasEarDetection
import eu.darken.capod.pods.core.apple.PodModel
import eu.darken.capod.pods.core.apple.ble.devices.ApplePods
import eu.darken.capod.pods.core.apple.ble.devices.ApplePodsFactory
import eu.darken.capod.pods.core.apple.ble.devices.HasAppleColor
import eu.darken.capod.pods.core.apple.ble.devices.SingleApplePods
import eu.darken.capod.pods.core.apple.ble.history.PodHistoryRepo
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityMessage
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityPairing
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityPayload
import java.time.Instant
import javax.inject.Inject
app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro.kt → app/src/main/java/eu/darken/capod/pods/core/apple/ble/devices/airpods/AirPodsPro.kt
+11 -11
View File
@@ -1,19 +1,19 @@
package eu.darken.capod.pods.core.apple.airpods
package eu.darken.capod.pods.core.apple.ble.devices.airpods
import androidx.annotation.DrawableRes
import eu.darken.capod.R
import eu.darken.capod.common.bluetooth.BleScanResult
import eu.darken.capod.common.debug.logging.logTag
import eu.darken.capod.pods.core.BlePodSnapshot
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.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.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.ble.BlePodSnapshot
import eu.darken.capod.pods.core.apple.PodModel
import eu.darken.capod.pods.core.apple.ble.devices.ApplePods
import eu.darken.capod.pods.core.apple.ble.devices.ApplePodsFactory
import eu.darken.capod.pods.core.apple.ble.devices.DualApplePods
import eu.darken.capod.pods.core.apple.ble.devices.DualApplePods.LidState
import eu.darken.capod.pods.core.apple.ble.history.PodHistoryRepo
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityMessage
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityPairing
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityPayload
import java.time.Instant
import javax.inject.Inject
app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro2.kt → app/src/main/java/eu/darken/capod/pods/core/apple/ble/devices/airpods/AirPodsPro2.kt
+11 -11
View File
@@ -1,19 +1,19 @@
package eu.darken.capod.pods.core.apple.airpods
package eu.darken.capod.pods.core.apple.ble.devices.airpods
import androidx.annotation.DrawableRes
import eu.darken.capod.R
import eu.darken.capod.common.bluetooth.BleScanResult
import eu.darken.capod.common.debug.logging.logTag
import eu.darken.capod.pods.core.BlePodSnapshot
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.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.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.ble.BlePodSnapshot
import eu.darken.capod.pods.core.apple.PodModel
import eu.darken.capod.pods.core.apple.ble.devices.ApplePods
import eu.darken.capod.pods.core.apple.ble.devices.ApplePodsFactory
import eu.darken.capod.pods.core.apple.ble.devices.DualApplePods
import eu.darken.capod.pods.core.apple.ble.devices.DualApplePods.LidState
import eu.darken.capod.pods.core.apple.ble.history.PodHistoryRepo
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityMessage
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityPairing
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityPayload
import java.time.Instant
import javax.inject.Inject
app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro2Usbc.kt → app/src/main/java/eu/darken/capod/pods/core/apple/ble/devices/airpods/AirPodsPro2Usbc.kt
+11 -11
View File
@@ -1,19 +1,19 @@
package eu.darken.capod.pods.core.apple.airpods
package eu.darken.capod.pods.core.apple.ble.devices.airpods
import androidx.annotation.DrawableRes
import eu.darken.capod.R
import eu.darken.capod.common.bluetooth.BleScanResult
import eu.darken.capod.common.debug.logging.logTag
import eu.darken.capod.pods.core.BlePodSnapshot
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.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.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.ble.BlePodSnapshot
import eu.darken.capod.pods.core.apple.PodModel
import eu.darken.capod.pods.core.apple.ble.devices.ApplePods
import eu.darken.capod.pods.core.apple.ble.devices.ApplePodsFactory
import eu.darken.capod.pods.core.apple.ble.devices.DualApplePods
import eu.darken.capod.pods.core.apple.ble.devices.DualApplePods.LidState
import eu.darken.capod.pods.core.apple.ble.history.PodHistoryRepo
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityMessage
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityPairing
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityPayload
import java.time.Instant
import javax.inject.Inject
app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro3.kt → app/src/main/java/eu/darken/capod/pods/core/apple/ble/devices/airpods/AirPodsPro3.kt
+11 -11
View File
@@ -1,19 +1,19 @@
package eu.darken.capod.pods.core.apple.airpods
package eu.darken.capod.pods.core.apple.ble.devices.airpods
import androidx.annotation.DrawableRes
import eu.darken.capod.R
import eu.darken.capod.common.bluetooth.BleScanResult
import eu.darken.capod.common.debug.logging.logTag
import eu.darken.capod.pods.core.BlePodSnapshot
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.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.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.ble.BlePodSnapshot
import eu.darken.capod.pods.core.apple.PodModel
import eu.darken.capod.pods.core.apple.ble.devices.ApplePods
import eu.darken.capod.pods.core.apple.ble.devices.ApplePodsFactory
import eu.darken.capod.pods.core.apple.ble.devices.DualApplePods
import eu.darken.capod.pods.core.apple.ble.devices.DualApplePods.LidState
import eu.darken.capod.pods.core.apple.ble.history.PodHistoryRepo
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityMessage
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityPairing
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityPayload
import java.time.Instant
import javax.inject.Inject
app/src/main/java/eu/darken/capod/pods/core/apple/airpods/HasStateDetectionAirPods.kt → app/src/main/java/eu/darken/capod/pods/core/apple/ble/devices/airpods/HasStateDetectionAirPods.kt
+3 -3
View File
@@ -1,10 +1,10 @@
package eu.darken.capod.pods.core.apple.airpods
package eu.darken.capod.pods.core.apple.ble.devices.airpods
import android.content.Context
import androidx.annotation.StringRes
import eu.darken.capod.R
import eu.darken.capod.pods.core.HasStateDetection
import eu.darken.capod.pods.core.apple.ApplePods
import eu.darken.capod.pods.core.apple.ble.devices.HasStateDetection
import eu.darken.capod.pods.core.apple.ble.devices.ApplePods
interface HasStateDetectionAirPods : HasStateDetection, ApplePods {
app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsFitPro.kt → app/src/main/java/eu/darken/capod/pods/core/apple/ble/devices/beats/BeatsFitPro.kt
+10 -10
View File
@@ -1,18 +1,18 @@
package eu.darken.capod.pods.core.apple.beats
package eu.darken.capod.pods.core.apple.ble.devices.beats
import androidx.annotation.DrawableRes
import eu.darken.capod.R
import eu.darken.capod.common.bluetooth.BleScanResult
import eu.darken.capod.common.debug.logging.logTag
import eu.darken.capod.pods.core.BlePodSnapshot
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.DualApplePods
import eu.darken.capod.pods.core.apple.history.PodHistoryRepo
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.ble.BlePodSnapshot
import eu.darken.capod.pods.core.apple.PodModel
import eu.darken.capod.pods.core.apple.ble.devices.ApplePods
import eu.darken.capod.pods.core.apple.ble.devices.ApplePodsFactory
import eu.darken.capod.pods.core.apple.ble.devices.DualApplePods
import eu.darken.capod.pods.core.apple.ble.history.PodHistoryRepo
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityMessage
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityPairing
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityPayload
import java.time.Instant
import javax.inject.Inject
app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsFlex.kt → app/src/main/java/eu/darken/capod/pods/core/apple/ble/devices/beats/BeatsFlex.kt
+10 -10
View File
@@ -1,16 +1,16 @@
package eu.darken.capod.pods.core.apple.beats
package eu.darken.capod.pods.core.apple.ble.devices.beats
import eu.darken.capod.common.bluetooth.BleScanResult
import eu.darken.capod.common.debug.logging.logTag
import eu.darken.capod.pods.core.BlePodSnapshot
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.SingleApplePods
import eu.darken.capod.pods.core.apple.history.PodHistoryRepo
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.ble.BlePodSnapshot
import eu.darken.capod.pods.core.apple.PodModel
import eu.darken.capod.pods.core.apple.ble.devices.ApplePods
import eu.darken.capod.pods.core.apple.ble.devices.ApplePodsFactory
import eu.darken.capod.pods.core.apple.ble.devices.SingleApplePods
import eu.darken.capod.pods.core.apple.ble.history.PodHistoryRepo
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityMessage
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityPairing
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityPayload
import java.time.Instant
import javax.inject.Inject
app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsSolo3.kt → app/src/main/java/eu/darken/capod/pods/core/apple/ble/devices/beats/BeatsSolo3.kt
+10 -10
View File
@@ -1,16 +1,16 @@
package eu.darken.capod.pods.core.apple.beats
package eu.darken.capod.pods.core.apple.ble.devices.beats
import eu.darken.capod.common.bluetooth.BleScanResult
import eu.darken.capod.common.debug.logging.logTag
import eu.darken.capod.pods.core.BlePodSnapshot
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.SingleApplePods
import eu.darken.capod.pods.core.apple.history.PodHistoryRepo
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.ble.BlePodSnapshot
import eu.darken.capod.pods.core.apple.PodModel
import eu.darken.capod.pods.core.apple.ble.devices.ApplePods
import eu.darken.capod.pods.core.apple.ble.devices.ApplePodsFactory
import eu.darken.capod.pods.core.apple.ble.devices.SingleApplePods
import eu.darken.capod.pods.core.apple.ble.history.PodHistoryRepo
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityMessage
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityPairing
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityPayload
import java.time.Instant
import javax.inject.Inject
app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsStudio3.kt → app/src/main/java/eu/darken/capod/pods/core/apple/ble/devices/beats/BeatsStudio3.kt
+10 -10
View File
@@ -1,16 +1,16 @@
package eu.darken.capod.pods.core.apple.beats
package eu.darken.capod.pods.core.apple.ble.devices.beats
import eu.darken.capod.common.bluetooth.BleScanResult
import eu.darken.capod.common.debug.logging.logTag
import eu.darken.capod.pods.core.BlePodSnapshot
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.SingleApplePods
import eu.darken.capod.pods.core.apple.history.PodHistoryRepo
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.ble.BlePodSnapshot
import eu.darken.capod.pods.core.apple.PodModel
import eu.darken.capod.pods.core.apple.ble.devices.ApplePods
import eu.darken.capod.pods.core.apple.ble.devices.ApplePodsFactory
import eu.darken.capod.pods.core.apple.ble.devices.SingleApplePods
import eu.darken.capod.pods.core.apple.ble.history.PodHistoryRepo
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityMessage
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityPairing
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityPayload
import java.time.Instant
import javax.inject.Inject
app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsX.kt → app/src/main/java/eu/darken/capod/pods/core/apple/ble/devices/beats/BeatsX.kt
+10 -10
View File
@@ -1,16 +1,16 @@
package eu.darken.capod.pods.core.apple.beats
package eu.darken.capod.pods.core.apple.ble.devices.beats
import eu.darken.capod.common.bluetooth.BleScanResult
import eu.darken.capod.common.debug.logging.logTag
import eu.darken.capod.pods.core.BlePodSnapshot
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.SingleApplePods
import eu.darken.capod.pods.core.apple.history.PodHistoryRepo
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.ble.BlePodSnapshot
import eu.darken.capod.pods.core.apple.PodModel
import eu.darken.capod.pods.core.apple.ble.devices.ApplePods
import eu.darken.capod.pods.core.apple.ble.devices.ApplePodsFactory
import eu.darken.capod.pods.core.apple.ble.devices.SingleApplePods
import eu.darken.capod.pods.core.apple.ble.history.PodHistoryRepo
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityMessage
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityPairing
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityPayload
import java.time.Instant
import javax.inject.Inject
app/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeats3.kt → app/src/main/java/eu/darken/capod/pods/core/apple/ble/devices/beats/PowerBeats3.kt
+10 -10
View File
@@ -1,16 +1,16 @@
package eu.darken.capod.pods.core.apple.beats
package eu.darken.capod.pods.core.apple.ble.devices.beats
import eu.darken.capod.common.bluetooth.BleScanResult
import eu.darken.capod.common.debug.logging.logTag
import eu.darken.capod.pods.core.BlePodSnapshot
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.SingleApplePods
import eu.darken.capod.pods.core.apple.history.PodHistoryRepo
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.ble.BlePodSnapshot
import eu.darken.capod.pods.core.apple.PodModel
import eu.darken.capod.pods.core.apple.ble.devices.ApplePods
import eu.darken.capod.pods.core.apple.ble.devices.ApplePodsFactory
import eu.darken.capod.pods.core.apple.ble.devices.SingleApplePods
import eu.darken.capod.pods.core.apple.ble.history.PodHistoryRepo
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityMessage
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityPairing
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityPayload
import java.time.Instant
import javax.inject.Inject
app/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeats4.kt → app/src/main/java/eu/darken/capod/pods/core/apple/ble/devices/beats/PowerBeats4.kt
+11 -11
View File
@@ -1,17 +1,17 @@
package eu.darken.capod.pods.core.apple.beats
package eu.darken.capod.pods.core.apple.ble.devices.beats
import eu.darken.capod.common.bluetooth.BleScanResult
import eu.darken.capod.common.debug.logging.logTag
import eu.darken.capod.pods.core.BlePodSnapshot
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.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.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.ble.BlePodSnapshot
import eu.darken.capod.pods.core.apple.PodModel
import eu.darken.capod.pods.core.apple.ble.devices.ApplePods
import eu.darken.capod.pods.core.apple.ble.devices.ApplePodsFactory
import eu.darken.capod.pods.core.apple.ble.devices.SingleApplePods
import eu.darken.capod.pods.core.apple.ble.devices.airpods.HasStateDetectionAirPods
import eu.darken.capod.pods.core.apple.ble.history.PodHistoryRepo
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityMessage
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityPairing
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityPayload
import java.time.Instant
import javax.inject.Inject
app/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsPro.kt → app/src/main/java/eu/darken/capod/pods/core/apple/ble/devices/beats/PowerBeatsPro.kt
+10 -10
View File
@@ -1,18 +1,18 @@
package eu.darken.capod.pods.core.apple.beats
package eu.darken.capod.pods.core.apple.ble.devices.beats
import androidx.annotation.DrawableRes
import eu.darken.capod.R
import eu.darken.capod.common.bluetooth.BleScanResult
import eu.darken.capod.common.debug.logging.logTag
import eu.darken.capod.pods.core.BlePodSnapshot
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.DualApplePods
import eu.darken.capod.pods.core.apple.history.PodHistoryRepo
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.ble.BlePodSnapshot
import eu.darken.capod.pods.core.apple.PodModel
import eu.darken.capod.pods.core.apple.ble.devices.ApplePods
import eu.darken.capod.pods.core.apple.ble.devices.ApplePodsFactory
import eu.darken.capod.pods.core.apple.ble.devices.DualApplePods
import eu.darken.capod.pods.core.apple.ble.history.PodHistoryRepo
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityMessage
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityPairing
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityPayload
import java.time.Instant
import javax.inject.Inject
app/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsPro2.kt → app/src/main/java/eu/darken/capod/pods/core/apple/ble/devices/beats/PowerBeatsPro2.kt
+10 -10
View File
@@ -1,18 +1,18 @@
package eu.darken.capod.pods.core.apple.beats
package eu.darken.capod.pods.core.apple.ble.devices.beats
import androidx.annotation.DrawableRes
import eu.darken.capod.R
import eu.darken.capod.common.bluetooth.BleScanResult
import eu.darken.capod.common.debug.logging.logTag
import eu.darken.capod.pods.core.BlePodSnapshot
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.DualApplePods
import eu.darken.capod.pods.core.apple.history.PodHistoryRepo
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.ble.BlePodSnapshot
import eu.darken.capod.pods.core.apple.PodModel
import eu.darken.capod.pods.core.apple.ble.devices.ApplePods
import eu.darken.capod.pods.core.apple.ble.devices.ApplePodsFactory
import eu.darken.capod.pods.core.apple.ble.devices.DualApplePods
import eu.darken.capod.pods.core.apple.ble.history.PodHistoryRepo
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityMessage
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityPairing
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityPayload
import java.time.Instant
import javax.inject.Inject
app/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsGen1.kt → app/src/main/java/eu/darken/capod/pods/core/apple/ble/devices/misc/FakeAirPodsGen1.kt
+12 -12
View File
@@ -1,18 +1,18 @@
package eu.darken.capod.pods.core.apple.misc
package eu.darken.capod.pods.core.apple.ble.devices.misc
import eu.darken.capod.common.bluetooth.BleScanResult
import eu.darken.capod.common.debug.logging.logTag
import eu.darken.capod.pods.core.BlePodSnapshot
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.PodModel
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.ble.ProximityMessage
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPayload
import eu.darken.capod.pods.core.apple.ble.BlePodSnapshot
import eu.darken.capod.pods.core.apple.ble.devices.HasCase
import eu.darken.capod.pods.core.apple.ble.devices.HasChargeDetectionDual
import eu.darken.capod.pods.core.apple.ble.devices.HasEarDetectionDual
import eu.darken.capod.pods.core.apple.PodModel
import eu.darken.capod.pods.core.apple.ble.devices.ApplePods
import eu.darken.capod.pods.core.apple.ble.devices.ApplePodsFactory
import eu.darken.capod.pods.core.apple.ble.devices.DualApplePods
import eu.darken.capod.pods.core.apple.ble.history.PodHistoryRepo
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityMessage
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityPayload
import java.time.Instant
import javax.inject.Inject
app/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsGen2.kt → app/src/main/java/eu/darken/capod/pods/core/apple/ble/devices/misc/FakeAirPodsGen2.kt
+12 -12
View File
@@ -1,18 +1,18 @@
package eu.darken.capod.pods.core.apple.misc
package eu.darken.capod.pods.core.apple.ble.devices.misc
import eu.darken.capod.common.bluetooth.BleScanResult
import eu.darken.capod.common.debug.logging.logTag
import eu.darken.capod.pods.core.BlePodSnapshot
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.PodModel
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.ble.ProximityMessage
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPayload
import eu.darken.capod.pods.core.apple.ble.BlePodSnapshot
import eu.darken.capod.pods.core.apple.ble.devices.HasCase
import eu.darken.capod.pods.core.apple.ble.devices.HasChargeDetectionDual
import eu.darken.capod.pods.core.apple.ble.devices.HasEarDetectionDual
import eu.darken.capod.pods.core.apple.PodModel
import eu.darken.capod.pods.core.apple.ble.devices.ApplePods
import eu.darken.capod.pods.core.apple.ble.devices.ApplePodsFactory
import eu.darken.capod.pods.core.apple.ble.devices.DualApplePods
import eu.darken.capod.pods.core.apple.ble.history.PodHistoryRepo
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityMessage
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityPayload
import java.time.Instant
import javax.inject.Inject
app/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsGen3.kt → app/src/main/java/eu/darken/capod/pods/core/apple/ble/devices/misc/FakeAirPodsGen3.kt
+12 -12
View File
@@ -1,20 +1,20 @@
package eu.darken.capod.pods.core.apple.misc
package eu.darken.capod.pods.core.apple.ble.devices.misc
import androidx.annotation.DrawableRes
import eu.darken.capod.R
import eu.darken.capod.common.bluetooth.BleScanResult
import eu.darken.capod.common.debug.logging.logTag
import eu.darken.capod.pods.core.BlePodSnapshot
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.PodModel
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.ble.ProximityMessage
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPayload
import eu.darken.capod.pods.core.apple.ble.BlePodSnapshot
import eu.darken.capod.pods.core.apple.ble.devices.HasCase
import eu.darken.capod.pods.core.apple.ble.devices.HasChargeDetectionDual
import eu.darken.capod.pods.core.apple.ble.devices.HasEarDetectionDual
import eu.darken.capod.pods.core.apple.PodModel
import eu.darken.capod.pods.core.apple.ble.devices.ApplePods
import eu.darken.capod.pods.core.apple.ble.devices.ApplePodsFactory
import eu.darken.capod.pods.core.apple.ble.devices.DualApplePods
import eu.darken.capod.pods.core.apple.ble.history.PodHistoryRepo
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityMessage
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityPayload
import java.time.Instant
import javax.inject.Inject
app/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsPro.kt → app/src/main/java/eu/darken/capod/pods/core/apple/ble/devices/misc/FakeAirPodsPro.kt
+12 -12
View File
@@ -1,20 +1,20 @@
package eu.darken.capod.pods.core.apple.misc
package eu.darken.capod.pods.core.apple.ble.devices.misc
import androidx.annotation.DrawableRes
import eu.darken.capod.R
import eu.darken.capod.common.bluetooth.BleScanResult
import eu.darken.capod.common.debug.logging.logTag
import eu.darken.capod.pods.core.BlePodSnapshot
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.PodModel
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.ble.ProximityMessage
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPayload
import eu.darken.capod.pods.core.apple.ble.BlePodSnapshot
import eu.darken.capod.pods.core.apple.ble.devices.HasCase
import eu.darken.capod.pods.core.apple.ble.devices.HasChargeDetectionDual
import eu.darken.capod.pods.core.apple.ble.devices.HasEarDetectionDual
import eu.darken.capod.pods.core.apple.PodModel
import eu.darken.capod.pods.core.apple.ble.devices.ApplePods
import eu.darken.capod.pods.core.apple.ble.devices.ApplePodsFactory
import eu.darken.capod.pods.core.apple.ble.devices.DualApplePods
import eu.darken.capod.pods.core.apple.ble.history.PodHistoryRepo
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityMessage
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityPayload
import java.time.Instant
import javax.inject.Inject
app/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsPro2.kt → app/src/main/java/eu/darken/capod/pods/core/apple/ble/devices/misc/FakeAirPodsPro2.kt
+14 -14
View File
@@ -1,22 +1,22 @@
package eu.darken.capod.pods.core.apple.misc
package eu.darken.capod.pods.core.apple.ble.devices.misc
import androidx.annotation.DrawableRes
import eu.darken.capod.R
import eu.darken.capod.common.bluetooth.BleScanResult
import eu.darken.capod.common.debug.logging.logTag
import eu.darken.capod.pods.core.BlePodSnapshot
import eu.darken.capod.pods.core.DualBlePodSnapshot
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.PodModel
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.DualApplePods.LidState
import eu.darken.capod.pods.core.apple.history.PodHistoryRepo
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityMessage
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPayload
import eu.darken.capod.pods.core.apple.ble.BlePodSnapshot
import eu.darken.capod.pods.core.apple.ble.DualBlePodSnapshot
import eu.darken.capod.pods.core.apple.ble.devices.HasCase
import eu.darken.capod.pods.core.apple.ble.devices.HasChargeDetectionDual
import eu.darken.capod.pods.core.apple.ble.devices.HasEarDetectionDual
import eu.darken.capod.pods.core.apple.PodModel
import eu.darken.capod.pods.core.apple.ble.devices.ApplePods
import eu.darken.capod.pods.core.apple.ble.devices.ApplePodsFactory
import eu.darken.capod.pods.core.apple.ble.devices.DualApplePods
import eu.darken.capod.pods.core.apple.ble.devices.DualApplePods.LidState
import eu.darken.capod.pods.core.apple.ble.history.PodHistoryRepo
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityMessage
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityPayload
import java.time.Instant
import javax.inject.Inject
app/src/main/java/eu/darken/capod/pods/core/apple/misc/UnknownAppleSnapshotBle.kt → app/src/main/java/eu/darken/capod/pods/core/apple/ble/devices/misc/UnknownAppleSnapshotBle.kt
+8 -8
View File
@@ -1,16 +1,16 @@
package eu.darken.capod.pods.core.apple.misc
package eu.darken.capod.pods.core.apple.ble.devices.misc
import android.content.Context
import eu.darken.capod.R
import eu.darken.capod.common.bluetooth.BleScanResult
import eu.darken.capod.common.debug.logging.logTag
import eu.darken.capod.pods.core.BlePodSnapshot
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.ble.ProximityMessage
import eu.darken.capod.pods.core.apple.protocol.ble.ProximityPayload
import eu.darken.capod.pods.core.apple.ble.BlePodSnapshot
import eu.darken.capod.pods.core.apple.PodModel
import eu.darken.capod.pods.core.apple.ble.devices.ApplePods
import eu.darken.capod.pods.core.apple.ble.devices.ApplePodsFactory
import eu.darken.capod.pods.core.apple.ble.history.PodHistoryRepo
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityMessage
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityPayload
import java.time.Instant
import javax.inject.Inject
app/src/main/java/eu/darken/capod/pods/core/apple/history/KnownDevice.kt → app/src/main/java/eu/darken/capod/pods/core/apple/ble/history/KnownDevice.kt
+4 -4
View File
@@ -1,10 +1,10 @@
package eu.darken.capod.pods.core.apple.history
package eu.darken.capod.pods.core.apple.ble.history
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.ble.ProximityPayload
import eu.darken.capod.pods.core.apple.ble.BlePodSnapshot
import eu.darken.capod.pods.core.apple.ble.devices.ApplePods
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityPayload
import java.time.Duration
import java.time.Instant
import kotlin.math.max
app/src/main/java/eu/darken/capod/pods/core/apple/history/PodHistoryRepo.kt → app/src/main/java/eu/darken/capod/pods/core/apple/ble/history/PodHistoryRepo.kt
+8 -8
View File
@@ -1,4 +1,4 @@
package eu.darken.capod.pods.core.apple.history
package eu.darken.capod.pods.core.apple.ble.history
import eu.darken.capod.common.debug.logging.Logging.Priority.DEBUG
import eu.darken.capod.common.debug.logging.Logging.Priority.VERBOSE
@@ -7,13 +7,13 @@ import eu.darken.capod.common.debug.logging.log
import eu.darken.capod.common.debug.logging.logTag
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.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.ble.ProximityPayload
import eu.darken.capod.pods.core.apple.protocol.RPAChecker
import eu.darken.capod.pods.core.apple.ble.BlePodSnapshot
import eu.darken.capod.pods.core.apple.ble.devices.HasCase
import eu.darken.capod.pods.core.apple.PodModel
import eu.darken.capod.pods.core.apple.ble.devices.ApplePods
import eu.darken.capod.pods.core.apple.ble.devices.DualApplePods
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityPayload
import eu.darken.capod.pods.core.apple.ble.protocol.RPAChecker
import eu.darken.capod.profiles.core.AppleDeviceProfile
import eu.darken.capod.profiles.core.DeviceProfilesRepo
import eu.darken.capod.profiles.core.currentProfiles
app/src/main/java/eu/darken/capod/pods/core/apple/protocol/ContinuityProtocol.kt → app/src/main/java/eu/darken/capod/pods/core/apple/ble/protocol/ContinuityProtocol.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package eu.darken.capod.pods.core.apple.protocol
package eu.darken.capod.pods.core.apple.ble.protocol
import android.os.ParcelUuid
import dagger.Reusable
app/src/main/java/eu/darken/capod/pods/core/apple/ble/protocol/IdentityResolvingKey.kt
+3
View File
@@ -0,0 +1,3 @@
package eu.darken.capod.pods.core.apple.ble.protocol
typealias IdentityResolvingKey = ByteArray
app/src/main/java/eu/darken/capod/pods/core/apple/ble/protocol/ProximityEncryptionKey.kt
+3
View File
@@ -0,0 +1,3 @@
package eu.darken.capod.pods.core.apple.ble.protocol
typealias ProximityEncryptionKey = ByteArray
app/src/main/java/eu/darken/capod/pods/core/apple/protocol/ble/ProximityMessage.kt → app/src/main/java/eu/darken/capod/pods/core/apple/ble/protocol/ProximityMessage.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package eu.darken.capod.pods.core.apple.protocol.ble
package eu.darken.capod.pods.core.apple.ble.protocol
import android.R.id.message
import android.annotation.SuppressLint
app/src/main/java/eu/darken/capod/pods/core/apple/protocol/ble/ProximityPairing.kt → app/src/main/java/eu/darken/capod/pods/core/apple/ble/protocol/ProximityPairing.kt
+1 -2
View File
@@ -1,9 +1,8 @@
package eu.darken.capod.pods.core.apple.protocol.ble
package eu.darken.capod.pods.core.apple.ble.protocol
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
app/src/main/java/eu/darken/capod/pods/core/apple/protocol/ble/ProximityPayload.kt → app/src/main/java/eu/darken/capod/pods/core/apple/ble/protocol/ProximityPayload.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package eu.darken.capod.pods.core.apple.protocol.ble
package eu.darken.capod.pods.core.apple.ble.protocol
data class ProximityPayload(
val public: Public,
app/src/main/java/eu/darken/capod/pods/core/apple/protocol/RPAChecker.kt → app/src/main/java/eu/darken/capod/pods/core/apple/ble/protocol/RPAChecker.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package eu.darken.capod.pods.core.apple.protocol
package eu.darken.capod.pods.core.apple.ble.protocol
import android.annotation.SuppressLint
import eu.darken.capod.common.bluetooth.BluetoothAddress
app/src/main/java/eu/darken/capod/pods/core/apple/protocol/IdentityResolvingKey.kt
-3
View File
@@ -1,3 +0,0 @@
package eu.darken.capod.pods.core.apple.protocol
typealias IdentityResolvingKey = ByteArray
app/src/main/java/eu/darken/capod/pods/core/apple/protocol/ble/ProximityEncryptionKey.kt
-3
View File
@@ -1,3 +0,0 @@
package eu.darken.capod.pods.core.apple.protocol.ble
typealias ProximityEncryptionKey = ByteArray
app/src/main/java/eu/darken/capod/pods/core/unknown/UnknownDeviceFactory.kt
+1 -1
View File
@@ -4,7 +4,7 @@ import eu.darken.capod.common.bluetooth.BleScanResult
import eu.darken.capod.common.debug.logging.Logging.Priority.VERBOSE
import eu.darken.capod.common.debug.logging.log
import eu.darken.capod.common.debug.logging.logTag
import eu.darken.capod.pods.core.BlePodSnapshot
import eu.darken.capod.pods.core.apple.ble.BlePodSnapshot
import kotlinx.coroutines.sync.Mutex
import kotlinx.coroutines.sync.withLock
import java.time.Duration
app/src/main/java/eu/darken/capod/pods/core/unknown/UnknownSnapshotBle.kt
+2 -2
View File
@@ -4,8 +4,8 @@ import android.content.Context
import eu.darken.capod.R
import eu.darken.capod.common.bluetooth.BleScanResult
import eu.darken.capod.common.debug.logging.logTag
import eu.darken.capod.pods.core.BlePodSnapshot
import eu.darken.capod.pods.core.PodModel
import eu.darken.capod.pods.core.apple.ble.BlePodSnapshot
import eu.darken.capod.pods.core.apple.PodModel
import eu.darken.capod.profiles.core.DeviceProfile
import java.time.Instant
app/src/main/java/eu/darken/capod/profiles/core/AppleDeviceProfile.kt
+3 -3
View File
@@ -1,9 +1,9 @@
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.ble.ProximityEncryptionKey
import eu.darken.capod.pods.core.apple.PodModel
import eu.darken.capod.pods.core.apple.ble.protocol.IdentityResolvingKey
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityEncryptionKey
import kotlinx.parcelize.Parcelize
import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
app/src/main/java/eu/darken/capod/profiles/core/DeviceProfile.kt
+1 -1
View File
@@ -1,7 +1,7 @@
package eu.darken.capod.profiles.core
import android.os.Parcelable
import eu.darken.capod.pods.core.PodModel
import eu.darken.capod.pods.core.apple.PodModel
import kotlinx.serialization.Serializable
@Serializable
app/src/main/java/eu/darken/capod/profiles/ui/DeviceManagerScreen.kt
+1 -1
View File
@@ -41,7 +41,7 @@ import eu.darken.capod.common.compose.PreviewWrapper
import eu.darken.capod.common.compose.preview.MockPodDataProvider
import eu.darken.capod.common.error.ErrorEventHandler
import eu.darken.capod.common.navigation.NavigationEventHandler
import eu.darken.capod.pods.core.PodModel
import eu.darken.capod.pods.core.apple.PodModel
import eu.darken.capod.profiles.core.DeviceProfile
@Composable
app/src/main/java/eu/darken/capod/profiles/ui/creation/DeviceProfileCreationScreen.kt
+1 -1
View File
@@ -64,7 +64,7 @@ import eu.darken.capod.common.compose.PreviewWrapper
import eu.darken.capod.common.error.ErrorEventHandler
import eu.darken.capod.common.navigation.NavigationEventHandler
import eu.darken.capod.common.toHex
import eu.darken.capod.pods.core.PodModel
import eu.darken.capod.pods.core.apple.PodModel
@Composable
fun DeviceProfileCreationScreenHost(
app/src/main/java/eu/darken/capod/profiles/ui/creation/DeviceProfileCreationViewModel.kt
+3 -3
View File
@@ -14,9 +14,9 @@ import eu.darken.capod.common.flow.SingleEventFlow
import eu.darken.capod.common.fromHex
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.ble.ProximityEncryptionKey
import eu.darken.capod.pods.core.apple.PodModel
import eu.darken.capod.pods.core.apple.ble.protocol.IdentityResolvingKey
import eu.darken.capod.pods.core.apple.ble.protocol.ProximityEncryptionKey
import eu.darken.capod.profiles.core.AppleDeviceProfile
import eu.darken.capod.profiles.core.DeviceProfile
import eu.darken.capod.profiles.core.DeviceProfilesRepo
app/src/main/java/eu/darken/capod/reaction/core/aap/AapAutoConnect.kt
+2 -2
View File
@@ -7,8 +7,8 @@ import eu.darken.capod.common.debug.logging.log
import eu.darken.capod.common.debug.logging.logTag
import eu.darken.capod.common.flow.setupCommonEventHandlers
import eu.darken.capod.monitor.core.BlePodMonitor
import eu.darken.capod.pods.core.apple.protocol.aap.AapConnectionManager
import eu.darken.capod.pods.core.apple.protocol.aap.AapPodState
import eu.darken.capod.pods.core.apple.aap.AapConnectionManager
import eu.darken.capod.pods.core.apple.aap.AapPodState
import eu.darken.capod.profiles.core.DeviceProfilesRepo
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.Flow
app/src/main/java/eu/darken/capod/reaction/core/aap/AapKeyPersister.kt
+1 -1
View File
@@ -3,7 +3,7 @@ package eu.darken.capod.reaction.core.aap
import eu.darken.capod.common.debug.logging.log
import eu.darken.capod.common.debug.logging.logTag
import eu.darken.capod.common.flow.setupCommonEventHandlers
import eu.darken.capod.pods.core.apple.protocol.aap.AapConnectionManager
import eu.darken.capod.pods.core.apple.aap.AapConnectionManager
import eu.darken.capod.profiles.core.AppleDeviceProfile
import eu.darken.capod.profiles.core.DeviceProfilesRepo
import kotlinx.coroutines.flow.Flow
app/src/main/java/eu/darken/capod/reaction/core/autoconnect/AutoConnect.kt
+1 -1
View File
@@ -9,7 +9,7 @@ import eu.darken.capod.common.flow.setupCommonEventHandlers
import eu.darken.capod.main.core.GeneralSettings
import eu.darken.capod.monitor.core.DeviceMonitor
import eu.darken.capod.monitor.core.primaryDevice
import eu.darken.capod.pods.core.apple.DualApplePods
import eu.darken.capod.pods.core.apple.ble.devices.DualApplePods
import eu.darken.capod.profiles.core.DeviceProfilesRepo
import eu.darken.capod.reaction.core.ReactionSettings
import kotlinx.coroutines.flow.Flow

Some files were not shown because too many files have changed in this diff Show More