From eab0296125bf2f9173d92061d6f6441a418c5e70 Mon Sep 17 00:00:00 2001
From: darken <darken@darken.eu>
Date: Wed, 4 Jun 2025 22:59:16 +0200
Subject: [PATCH] Introduce helper for parsing battery state

This commit introduces a new `BatteryState` data class and an extension function `ProximityPayload.Private.asBatteryState` to simplify the parsing of battery level and charging status from the proximity payload.

The `asBatteryState` function takes the position of the battery data in the payload and returns a `BatteryState` object, or null if the data is invalid.

This change improves code readability and maintainability by encapsulating the battery state parsing logic.
---
 .../darken/capod/pods/core/apple/ApplePods.kt | 18 ++++++++++
 .../capod/pods/core/apple/DualApplePods.kt    | 34 +++++++------------
 2 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/apple/ApplePods.kt b/app-common/src/main/java/eu/darken/capod/pods/core/apple/ApplePods.kt
index c04fbaa3..a64b5ff3 100644
--- a/app-common/src/main/java/eu/darken/capod/pods/core/apple/ApplePods.kt
+++ b/app-common/src/main/java/eu/darken/capod/pods/core/apple/ApplePods.kt
@@ -36,4 +36,22 @@ interface ApplePods : PodDevice {
 
     val pubSuffix: UByte
         get() = payload.public.data[8]
+
+    data class BatteryState(
+        val isCharging: Boolean,
+        val level: Float,
+    )
+
+    fun ProximityPayload.Private.asBatteryState(pos: Int): BatteryState? {
+        val raw = data[pos]
+        val level = (raw and 0x7Fu).toInt() / 100f
+        if (level < 0f || level > 1.0f) return null
+
+        val isCharging = (raw and 0x80u).toInt() != 0
+
+        return BatteryState(
+            isCharging = isCharging,
+            level = level
+        )
+    }
 }
\ No newline at end of file
diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/apple/DualApplePods.kt b/app-common/src/main/java/eu/darken/capod/pods/core/apple/DualApplePods.kt
index 899a9109..14931dc6 100644
--- a/app-common/src/main/java/eu/darken/capod/pods/core/apple/DualApplePods.kt
+++ b/app-common/src/main/java/eu/darken/capod/pods/core/apple/DualApplePods.kt
@@ -29,10 +29,10 @@ interface DualApplePods : ApplePods, HasChargeDetectionDual, DualPodDevice, HasE
 
     override val batteryLeftPodPercent: Float?
         get() {
-            payload.private?.data?.get(if (areValuesFlipped) 2 else 1)?.let { raw ->
-                val level = (raw and 0x7Fu).toInt() / 100f
-                if (level <= 1.0f) return level
+            payload.private?.asBatteryState(if (areValuesFlipped) 2 else 1)?.let {
+                return it.level
             }
+
             val value = when (areValuesFlipped) {
                 true -> pubPodsBattery.upperNibble.toInt()
                 false -> pubPodsBattery.lowerNibble.toInt()
@@ -50,10 +50,10 @@ interface DualApplePods : ApplePods, HasChargeDetectionDual, DualPodDevice, HasE
 
     override val batteryRightPodPercent: Float?
         get() {
-            payload.private?.data?.get(if (areValuesFlipped) 1 else 2)?.let { raw ->
-                val level = (raw and 0x7Fu).toInt() / 100f
-                if (level <= 1.0f) return level
+            payload.private?.asBatteryState(if (areValuesFlipped) 1 else 2)?.let {
+                return it.level
             }
+
             val value = when (areValuesFlipped) {
                 true -> pubPodsBattery.lowerNibble.toInt()
                 false -> pubPodsBattery.upperNibble.toInt()
@@ -106,9 +106,8 @@ interface DualApplePods : ApplePods, HasChargeDetectionDual, DualPodDevice, HasE
 
     override val isLeftPodCharging: Boolean
         get() {
-            payload.private?.data?.get(if (areValuesFlipped) 2 else 1)?.let { raw ->
-                val isCharging = (raw and 0x80u).toInt() != 0
-                return isCharging
+            payload.private?.asBatteryState(if (areValuesFlipped) 2 else 1)?.let {
+                return it.isCharging
             }
             return when (areValuesFlipped) {
                 false -> pubFlags.isBitSet(0)
@@ -118,9 +117,8 @@ interface DualApplePods : ApplePods, HasChargeDetectionDual, DualPodDevice, HasE
 
     override val isRightPodCharging: Boolean
         get() {
-            payload.private?.data?.get(if (areValuesFlipped) 1 else 2)?.let { raw ->
-                val isCharging = (raw and 0x80u).toInt() != 0
-                return isCharging
+            payload.private?.asBatteryState(if (areValuesFlipped) 1 else 2)?.let {
+                return it.isCharging
             }
             return when (areValuesFlipped) {
                 false -> pubFlags.isBitSet(1)
@@ -130,10 +128,8 @@ interface DualApplePods : ApplePods, HasChargeDetectionDual, DualPodDevice, HasE
 
     override val batteryCasePercent: Float?
         get() {
-            payload.private?.data?.get(3)?.let { raw ->
-                val level = (raw and 0x7Fu).toInt() / 100f
-                if (level <= 1.0f) return level
-            }
+            payload.private?.asBatteryState(3)?.let { return it.level }
+
             return when (val value = pubCaseBattery.toInt()) {
                 15 -> null
                 else -> if (value > 10) {
@@ -147,11 +143,7 @@ interface DualApplePods : ApplePods, HasChargeDetectionDual, DualPodDevice, HasE
 
     override val isCaseCharging: Boolean
         get() {
-            payload.private?.data?.get(3)?.let { raw ->
-                val level = (raw and 0x7Fu).toInt() / 100f
-                val isCharging = (raw and 0x80u).toInt() != 0
-                if (0f <= level && level <= 1.0f) return isCharging
-            }
+            payload.private?.asBatteryState(3)?.let { return it.isCharging }
 
             return pubFlags.isBitSet(2)
         }