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

Code cleanup

Browse Source
This commit is contained in:
darken
2022-01-05 09:03:30 +01:00
parent 368298c288
commit 14b5d4cdd8
15 changed files with 6 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/eu/darken/capod/pods/core/apple/ApplePods.kt
-8
View File
@@ -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")
}
}
app/src/main/java/eu/darken/capod/pods/core/apple/BasicSingleApplePods.kt
+1 -1
View File
@@ -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)
app/src/main/java/eu/darken/capod/pods/core/apple/DualApplePods.kt
+3 -3
View File
@@ -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
app/src/main/java/eu/darken/capod/pods/core/apple/UnknownAppleDevice.kt
-3
View File
@@ -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")
}
app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen1.kt
-3
View File
@@ -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
}
app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen2.kt
-3
View File
@@ -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
}
app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsMax.kt
-2
View File
@@ -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")
}
app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro.kt
-3
View File
@@ -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
}
app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsFlex.kt
-2
View File
@@ -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")
}
app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsSolo3.kt
-2
View File
@@ -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")
}
app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsStudio3.kt
-2
View File
@@ -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")
}
app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsX.kt
-2
View File
@@ -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")
}
app/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeats3.kt
-2
View File
@@ -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")
}
app/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsPro.kt
-3
View File
@@ -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
}
app/src/main/java/eu/darken/capod/pods/core/apple/protocol/ProximityPairing.kt
+2 -3
View File
@@ -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
}