diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/ApplePods.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/ApplePods.kt index 1b61105a..491d91cd 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/ApplePods.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/ApplePods.kt @@ -1,14 +1,11 @@ package eu.darken.capod.pods.core.apple -import eu.darken.capod.common.debug.logging.logTag import eu.darken.capod.pods.core.PodDevice import eu.darken.capod.pods.core.apple.protocol.ContinuityProtocol import eu.darken.capod.pods.core.apple.protocol.ProximityPairing interface ApplePods : PodDevice { - val tag: String - val proximityMessage: ProximityPairing.Message override val rawData: ByteArray @@ -38,9 +35,4 @@ interface ApplePods : PodDevice { val rawSuffix: UByte get() = proximityMessage.data[8] - - companion object { - - val TAG = logTag("Pod", "AppleDevice") - } } \ No newline at end of file diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/BasicSingleApplePods.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/BasicSingleApplePods.kt index a4ee0631..a4dd3a5e 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/BasicSingleApplePods.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/BasicSingleApplePods.kt @@ -10,7 +10,7 @@ interface BasicSingleApplePods : ApplePods, HasSinglePod { get() = when (val value = rawPodsBattery.lowerNibble.toInt()) { 15 -> null else -> if (value > 10) { - log(tag) { "Left pod: Above 100% battery: $value" } + log { "Left pod: Above 100% battery: $value" } 1.0f } else { (value / 10f) diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/DualApplePods.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/DualApplePods.kt index bc6e2802..77b3d674 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/DualApplePods.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/DualApplePods.kt @@ -29,7 +29,7 @@ interface DualApplePods : ApplePods, HasDualPods, HasEarDetection, HasCase { return when (value) { 15 -> null else -> if (value > 10) { - log(tag) { "Left pod: Above 100% battery: $value" } + log { "Left pod: Above 100% battery: $value" } 1.0f } else { (value / 10f) @@ -46,7 +46,7 @@ interface DualApplePods : ApplePods, HasDualPods, HasEarDetection, HasCase { return when (value) { 15 -> null else -> if (value > 10) { - log(tag) { "Right pod: Above 100% battery: $value" } + log { "Right pod: Above 100% battery: $value" } 1.0f } else { value / 10f @@ -85,7 +85,7 @@ interface DualApplePods : ApplePods, HasDualPods, HasEarDetection, HasCase { get() = when (val value = rawCaseBattery.lowerNibble.toInt()) { 15 -> null else -> if (value > 10) { - log(tag) { "Case: Above 100% battery: $value" } + log { "Case: Above 100% battery: $value" } 1.0f } else { value / 10f diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/UnknownAppleDevice.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/UnknownAppleDevice.kt index 10d7c9b9..28f4feea 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/UnknownAppleDevice.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/UnknownAppleDevice.kt @@ -3,7 +3,6 @@ package eu.darken.capod.pods.core.apple import android.bluetooth.le.ScanResult import android.content.Context import eu.darken.capod.R -import eu.darken.capod.common.debug.logging.logTag import eu.darken.capod.pods.core.apple.protocol.ProximityPairing import java.time.Instant import java.util.* @@ -18,6 +17,4 @@ data class UnknownAppleDevice constructor( override fun getLabel(context: Context): String { return context.getString(R.string.device_unknown_label) } - - override val tag: String = logTag("Pod", "Apple", "Unknown") } \ No newline at end of file diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen1.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen1.kt index c4651c4d..070bb620 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen1.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen1.kt @@ -3,7 +3,6 @@ package eu.darken.capod.pods.core.apple.airpods import android.bluetooth.le.ScanResult import android.content.Context import eu.darken.capod.R -import eu.darken.capod.common.debug.logging.logTag import eu.darken.capod.pods.core.apple.DualApplePods import eu.darken.capod.pods.core.apple.protocol.ProximityPairing import java.time.Instant @@ -22,8 +21,6 @@ data class AirPodsGen1 constructor( override val iconRes: Int get() = R.drawable.ic_device_airpods_gen1 - override val tag: String = logTag("Pod", "Apple", "AirPods", "Gen1") - override val batteryCasePercent: Float? get() = super.batteryCasePercent ?: cachedBatteryPercentage } \ No newline at end of file diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen2.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen2.kt index 3169db89..8eb62589 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen2.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen2.kt @@ -3,7 +3,6 @@ package eu.darken.capod.pods.core.apple.airpods import android.bluetooth.le.ScanResult import android.content.Context import eu.darken.capod.R -import eu.darken.capod.common.debug.logging.logTag import eu.darken.capod.pods.core.apple.DualApplePods import eu.darken.capod.pods.core.apple.protocol.ProximityPairing import java.time.Instant @@ -22,8 +21,6 @@ data class AirPodsGen2 constructor( override val iconRes: Int get() = R.drawable.ic_device_airpods_gen2 - override val tag: String = logTag("Pod", "Apple", "AirPods", "Gen2") - override val batteryCasePercent: Float? get() = super.batteryCasePercent ?: cachedBatteryPercentage } \ No newline at end of file diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsMax.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsMax.kt index 265ea90f..fa636ffc 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsMax.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsMax.kt @@ -3,7 +3,6 @@ package eu.darken.capod.pods.core.apple.airpods import android.bluetooth.le.ScanResult import android.content.Context import eu.darken.capod.R -import eu.darken.capod.common.debug.logging.logTag import eu.darken.capod.pods.core.apple.SingleApplePods import eu.darken.capod.pods.core.apple.protocol.ProximityPairing import java.time.Instant @@ -21,5 +20,4 @@ data class AirPodsMax constructor( override val iconRes: Int get() = R.drawable.ic_device_generic_headphones - override val tag: String = logTag("Pod", "Apple", "AirPods", "Max") } \ No newline at end of file diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro.kt index b5865b28..215b8125 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro.kt @@ -3,7 +3,6 @@ package eu.darken.capod.pods.core.apple.airpods import android.bluetooth.le.ScanResult import android.content.Context import eu.darken.capod.R -import eu.darken.capod.common.debug.logging.logTag import eu.darken.capod.pods.core.apple.DualApplePods import eu.darken.capod.pods.core.apple.protocol.ProximityPairing import java.time.Instant @@ -24,8 +23,6 @@ data class AirPodsPro constructor( override val iconRes: Int get() = R.drawable.ic_device_airpods_gen2 - override val tag: String = logTag("Pod", "Apple", "AirPods", "Pro") - override val batteryCasePercent: Float? get() = super.batteryCasePercent ?: cachedBatteryPercentage } \ No newline at end of file diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsFlex.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsFlex.kt index 71de3da9..18dae06b 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsFlex.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsFlex.kt @@ -3,7 +3,6 @@ package eu.darken.capod.pods.core.apple.beats import android.bluetooth.le.ScanResult import android.content.Context import eu.darken.capod.R -import eu.darken.capod.common.debug.logging.logTag import eu.darken.capod.pods.core.apple.BasicSingleApplePods import eu.darken.capod.pods.core.apple.protocol.ProximityPairing import java.time.Instant @@ -21,5 +20,4 @@ data class BeatsFlex constructor( override val iconRes: Int get() = R.drawable.ic_device_generic_earbuds - override val tag: String = logTag("Pod", "Apple", "Beats", "Flex") } \ No newline at end of file diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsSolo3.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsSolo3.kt index 298e2c53..70c4fe37 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsSolo3.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsSolo3.kt @@ -3,7 +3,6 @@ package eu.darken.capod.pods.core.apple.beats import android.bluetooth.le.ScanResult import android.content.Context import eu.darken.capod.R -import eu.darken.capod.common.debug.logging.logTag import eu.darken.capod.pods.core.apple.BasicSingleApplePods import eu.darken.capod.pods.core.apple.protocol.ProximityPairing import java.time.Instant @@ -21,5 +20,4 @@ data class BeatsSolo3 constructor( override val iconRes: Int get() = R.drawable.ic_device_generic_earbuds - override val tag: String = logTag("Pod", "Apple", "Beats", "Solo3") } \ No newline at end of file diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsStudio3.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsStudio3.kt index 70ea0f92..cefb2e2e 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsStudio3.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsStudio3.kt @@ -3,7 +3,6 @@ package eu.darken.capod.pods.core.apple.beats import android.bluetooth.le.ScanResult import android.content.Context import eu.darken.capod.R -import eu.darken.capod.common.debug.logging.logTag import eu.darken.capod.pods.core.apple.BasicSingleApplePods import eu.darken.capod.pods.core.apple.protocol.ProximityPairing import java.time.Instant @@ -21,5 +20,4 @@ data class BeatsStudio3 constructor( override val iconRes: Int get() = R.drawable.ic_device_generic_earbuds - override val tag: String = logTag("Pod", "Apple", "Beats", "Studio3") } \ No newline at end of file diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsX.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsX.kt index 66fb9f09..3b2e78b4 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsX.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsX.kt @@ -3,7 +3,6 @@ package eu.darken.capod.pods.core.apple.beats import android.bluetooth.le.ScanResult import android.content.Context import eu.darken.capod.R -import eu.darken.capod.common.debug.logging.logTag import eu.darken.capod.pods.core.apple.BasicSingleApplePods import eu.darken.capod.pods.core.apple.protocol.ProximityPairing import java.time.Instant @@ -21,5 +20,4 @@ data class BeatsX constructor( override val iconRes: Int get() = R.drawable.ic_device_generic_earbuds - override val tag: String = logTag("Pod", "Apple", "Beats", "X") } \ No newline at end of file diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeats3.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeats3.kt index b1272ecf..440bf04e 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeats3.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeats3.kt @@ -3,7 +3,6 @@ package eu.darken.capod.pods.core.apple.beats import android.bluetooth.le.ScanResult import android.content.Context import eu.darken.capod.R -import eu.darken.capod.common.debug.logging.logTag import eu.darken.capod.pods.core.apple.BasicSingleApplePods import eu.darken.capod.pods.core.apple.protocol.ProximityPairing import java.time.Instant @@ -21,5 +20,4 @@ data class PowerBeats3 constructor( override val iconRes: Int get() = R.drawable.ic_device_generic_earbuds - override val tag: String = logTag("Pod", "Apple", "Beats", "Power3") } \ No newline at end of file diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsPro.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsPro.kt index 860b5920..f4e37a28 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsPro.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsPro.kt @@ -3,7 +3,6 @@ package eu.darken.capod.pods.core.apple.beats import android.bluetooth.le.ScanResult import android.content.Context import eu.darken.capod.R -import eu.darken.capod.common.debug.logging.logTag import eu.darken.capod.pods.core.apple.DualApplePods import eu.darken.capod.pods.core.apple.protocol.ProximityPairing import java.time.Instant @@ -22,8 +21,6 @@ data class PowerBeatsPro constructor( override val iconRes: Int get() = R.drawable.ic_device_generic_earbuds - override val tag: String = logTag("Pod", "Apple", "Beats", "PowerPro") - override val batteryCasePercent: Float? get() = super.batteryCasePercent ?: cachedBatteryPercentage } \ No newline at end of file diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/protocol/ProximityPairing.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/protocol/ProximityPairing.kt index d81626e3..118d07f1 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/protocol/ProximityPairing.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/protocol/ProximityPairing.kt @@ -5,7 +5,6 @@ import dagger.Reusable import eu.darken.capod.common.debug.logging.log import eu.darken.capod.common.lowerNibble import eu.darken.capod.common.upperNibble -import eu.darken.capod.pods.core.apple.ApplePods import javax.inject.Inject @@ -38,11 +37,11 @@ object ProximityPairing { class Decoder @Inject constructor() { fun decode(message: ContinuityProtocol.Message): Message? { if (message.type != CONTINUITY_PROTOCOL_MESSAGE_TYPE_PROXIMITY_PAIRING) { - log(ApplePods.TAG) { "Not a proximity pairing message: $this" } + log { "Not a proximity pairing message: $this" } return null } if (message.length != PROXIMITY_PAIRING_MESSAGE_LENGTH) { - log(ApplePods.TAG) { "Proximity pairing message has invalid length." } + log { "Proximity pairing message has invalid length." } return null }