librepods-org · Spottq · Sep 4, 2026
diff --git a/android/app/src/main/java/me/kavishdevar/librepods/QuickSettingsDialogActivity.kt b/android/app/src/main/java/me/kavishdevar/librepods/QuickSettingsDialogActivity.kt
@@ -92,6 +92,7 @@ import me.kavishdevar.librepods.presentation.components.VerticalVolumeSlider
 import me.kavishdevar.librepods.data.AirPodsNotifications
 import me.kavishdevar.librepods.data.NoiseControlMode
 import me.kavishdevar.librepods.services.AirPodsService
+import me.kavishdevar.librepods.services.ServiceManager
 import me.kavishdevar.librepods.presentation.theme.LibrePodsTheme
 import me.kavishdevar.librepods.bluetooth.AACPManager
 import kotlin.io.encoding.ExperimentalEncodingApi
@@ -311,15 +312,14 @@ fun NewControlCenterDialogContent(
     var isConvAwarenessEnabled by remember { mutableStateOf(false) }
 
     val isOffModeEnabled = remember { sharedPreferences.getBoolean("off_listening_mode", true) }
-    val availableModes = remember(isOffModeEnabled) {
-        mutableListOf(
-            NoiseControlMode.TRANSPARENCY,
-            NoiseControlMode.ADAPTIVE,
-            NoiseControlMode.NOISE_CANCELLATION
-        ).apply {
-            if (isOffModeEnabled) {
-                add(0, NoiseControlMode.OFF)
-            }
+    // The AirPods Max have no Adaptive mode.
+    val isAdaptiveSupported = remember { ServiceManager.getService()?.supportsAdaptiveMode != false }
+    val availableModes = remember(isOffModeEnabled, isAdaptiveSupported) {
+        buildList {
+            if (isOffModeEnabled) add(NoiseControlMode.OFF)
+            add(NoiseControlMode.TRANSPARENCY)
+            if (isAdaptiveSupported) add(NoiseControlMode.ADAPTIVE)
+            add(NoiseControlMode.NOISE_CANCELLATION)
         }
     }
 
@@ -427,7 +427,9 @@ fun NewControlCenterDialogContent(
                 verticalArrangement = Arrangement.Center
             ) {
                 Icon(
-                    painter = painterResource(id = R.drawable.airpods),
+                    painter = painterResource(
+                        id = ServiceManager.getService()?.currentIconRes ?: R.drawable.airpods
+                    ),
                     contentDescription = "Device Icon",
                     tint = textColor.copy(alpha = 0.8f),
                     modifier = Modifier.size(48.dp)

diff --git a/android/app/src/main/java/me/kavishdevar/librepods/bluetooth/BLEManager.kt b/android/app/src/main/java/me/kavishdevar/librepods/bluetooth/BLEManager.kt
@@ -48,6 +48,8 @@ class BLEManager(private val context: Context) {
         val lastSeen: Long = System.currentTimeMillis(),
         val paired: Boolean = false,
         val model: String = "Unknown",
+        /** Raw proximity-pairing model id, e.g. 0x0A20 for the AirPods Max. */
+        val modelId: Int = 0,
         val leftBattery: Int? = null,
         val rightBattery: Int? = null,
         val caseBattery: Int? = null,
@@ -375,6 +377,7 @@ class BLEManager(private val context: Context) {
             lastSeen = System.currentTimeMillis(),
             paired = paired,
             model = model,
+            modelId = modelId,
             leftBattery = leftBattery,
             rightBattery = rightBattery,
             caseBattery = caseBattery,
@@ -475,6 +478,7 @@ class BLEManager(private val context: Context) {
             lastSeen = System.currentTimeMillis(),
             paired = paired,
             model = model,
+            modelId = modelId,
             leftBattery = decodeBattery(leftBatteryNibble),
             rightBattery = decodeBattery(rightBatteryNibble),
             caseBattery = decodeBattery(caseBattery),

diff --git a/android/app/src/main/java/me/kavishdevar/librepods/data/AirPods.kt b/android/app/src/main/java/me/kavishdevar/librepods/data/AirPods.kt
@@ -20,6 +20,14 @@ package me.kavishdevar.librepods.data
 
 import me.kavishdevar.librepods.R
 
+enum class FormFactor {
+    /** Earbuds that live in a charging case, reporting a left, right and case battery. */
+    IN_EAR,
+
+    /** Over-ear headphones: a single body, a single battery and a case that does not charge. */
+    OVER_EAR
+}
+
 open class AirPodsBase(
     val modelNumber: List<String>,
     val name: String,
@@ -30,8 +38,19 @@ open class AirPodsBase(
     val leftBudsRes: Int,
     val rightBudsRes: Int,
     val caseRes: Int,
-    val capabilities: Set<Capability>
-)
+    val capabilities: Set<Capability>,
+    val formFactor: FormFactor = FormFactor.IN_EAR,
+    /** Monochrome icon used for the notification, the QS tile and the popup. */
+    val iconRes: Int = R.drawable.airpods,
+    /** Proximity-pairing model ids advertised over BLE, used when the model number is unknown. */
+    val bleModelIds: Set<Int> = emptySet()
+) {
+    /** Over-ear models have a case, but it holds no battery and is never reported. */
+    val hasCase: Boolean get() = formFactor == FormFactor.IN_EAR
+
+    /** Over-ear models are a single unit and report one battery instead of a left/right pair. */
+    val isSingleBattery: Boolean get() = formFactor == FormFactor.OVER_EAR
+}
 enum class Capability {
     LISTENING_MODE,
     CONVERSATION_AWARENESS,
@@ -60,7 +79,8 @@ class AirPods: AirPodsBase(
     rightBudsRes = R.drawable.airpods_pro_2_right,
     // caseRes = R.drawable.airpods_1_case
     caseRes = R.drawable.airpods_pro_2_case,
-    capabilities = emptySet()
+    capabilities = emptySet(),
+    bleModelIds = setOf(0x0220)
 )
 
 class AirPods2: AirPodsBase(
@@ -76,7 +96,8 @@ class AirPods2: AirPodsBase(
     rightBudsRes = R.drawable.airpods_pro_2_right,
     // caseRes = R.drawable.airpods_2_case
     caseRes = R.drawable.airpods_pro_2_case,
-    capabilities = emptySet()
+    capabilities = emptySet(),
+    bleModelIds = setOf(0x0F20)
 )
 
 class AirPods3: AirPodsBase(
@@ -94,7 +115,8 @@ class AirPods3: AirPodsBase(
     caseRes = R.drawable.airpods_pro_2_case,
     capabilities = setOf(
         Capability.HEAD_GESTURES
-    )
+    ),
+    bleModelIds = setOf(0x1320)
 )
 
 class AirPods4: AirPodsBase(
@@ -114,7 +136,8 @@ class AirPods4: AirPodsBase(
         Capability.HEAD_GESTURES,
         Capability.SLEEP_DETECTION,
         Capability.ADAPTIVE_VOLUME
-    )
+    ),
+    bleModelIds = setOf(0x1920)
 )
 
 class AirPods4ANC: AirPodsBase(
@@ -138,7 +161,8 @@ class AirPods4ANC: AirPodsBase(
         Capability.SLEEP_DETECTION,
         Capability.ADAPTIVE_VOLUME,
         Capability.STEM_CONFIG
-    )
+    ),
+    bleModelIds = setOf(0x1B20)
 )
 
 class AirPodsPro1: AirPodsBase(
@@ -157,7 +181,8 @@ class AirPodsPro1: AirPodsBase(
     caseRes = R.drawable.airpods_pro_2_case,
     capabilities = setOf(
         Capability.LISTENING_MODE
-    )
+    ),
+    bleModelIds = setOf(0x0E20)
 )
 
 class AirPodsPro2Lightning: AirPodsBase(
@@ -185,7 +210,8 @@ class AirPodsPro2Lightning: AirPodsBase(
         Capability.ADAPTIVE_VOLUME,
         Capability.SWIPE_FOR_VOLUME,
         Capability.HEAD_GESTURES
-    )
+    ),
+    bleModelIds = setOf(0x1420)
 )
 
 class AirPodsPro2USBC: AirPodsBase(
@@ -213,7 +239,8 @@ class AirPodsPro2USBC: AirPodsBase(
         Capability.ADAPTIVE_VOLUME,
         Capability.SWIPE_FOR_VOLUME,
         Capability.HEAD_GESTURES
-    )
+    ),
+    bleModelIds = setOf(0x2420)
 )
 
 class AirPodsPro3: AirPodsBase(
@@ -246,6 +273,61 @@ class AirPodsPro3: AirPodsBase(
     )
 )
 
+class AirPodsMax: AirPodsBase(
+    modelNumber = listOf("A2096"),
+    name = "AirPods Max",
+    displayName = "AirPods Max",
+    budCaseRes = R.drawable.airpods_max_device,
+    budsRes = R.drawable.airpods_max_buds,
+    leftBudsRes = R.drawable.airpods_max_left,
+    rightBudsRes = R.drawable.airpods_max_right,
+    // AirPods Max ship with a Smart Case that holds no battery, so this is never shown.
+    caseRes = R.drawable.airpods_max_case,
+    capabilities = setOf(
+        Capability.LISTENING_MODE
+    ),
+    formFactor = FormFactor.OVER_EAR,
+    iconRes = R.drawable.airpods_max_icon,
+    bleModelIds = setOf(0x0A20)
+)
+
+class AirPodsMaxUSBC: AirPodsBase(
+    modelNumber = listOf("A3184"),
+    name = "AirPods Max (USB-C)",
+    displayName = "AirPods Max",
+    budCaseRes = R.drawable.airpods_max_usbc_device,
+    budsRes = R.drawable.airpods_max_usbc_buds,
+    leftBudsRes = R.drawable.airpods_max_usbc_left,
+    rightBudsRes = R.drawable.airpods_max_usbc_right,
+    caseRes = R.drawable.airpods_max_usbc_case,
+    capabilities = setOf(
+        Capability.LISTENING_MODE
+    ),
+    formFactor = FormFactor.OVER_EAR,
+    iconRes = R.drawable.airpods_max_usbc_icon,
+    bleModelIds = setOf(0x1F20)
+)
+
+class AirPodsMax2: AirPodsBase(
+    modelNumber = listOf("A3454"),
+    name = "AirPods Max 2",
+    displayName = "AirPods Max",
+    // No separate product render is published yet; the two generations look the same.
+    budCaseRes = R.drawable.airpods_max_usbc_device,
+    budsRes = R.drawable.airpods_max_usbc_buds,
+    leftBudsRes = R.drawable.airpods_max_usbc_left,
+    rightBudsRes = R.drawable.airpods_max_usbc_right,
+    caseRes = R.drawable.airpods_max_usbc_case,
+    capabilities = setOf(
+        Capability.LISTENING_MODE,
+        Capability.CONVERSATION_AWARENESS,
+        Capability.ADAPTIVE_AUDIO,
+        Capability.ADAPTIVE_VOLUME
+    ),
+    formFactor = FormFactor.OVER_EAR,
+    iconRes = R.drawable.airpods_max_usbc_icon
+)
+
 data class AirPodsInstance(
     val name: String,
     val model: AirPodsBase,
@@ -268,10 +350,47 @@ object AirPodsModels {
         AirPodsPro1(),
         AirPodsPro2Lightning(),
         AirPodsPro2USBC(),
-        AirPodsPro3()
+        AirPodsPro3(),
+        AirPodsMax(),
+        AirPodsMaxUSBC(),
+        AirPodsMax2()
     )
 
     fun getModelByModelNumber(modelNumber: String): AirPodsBase? {
         return models.find { modelNumber in it.modelNumber }
     }
+
+    /** Looks up a model by the proximity-pairing id it advertises over BLE. */
+    fun getModelByBleModelId(bleModelId: Int): AirPodsBase? {
+        return models.find { bleModelId in it.bleModelIds }
+    }
+
+    /**
+     * Last-resort match on the Bluetooth name, for firmware that reports a model number we do not
+     * know yet. Only distinctive names are matched; anything ambiguous is left unresolved so the
+     * caller can fall back to its own default.
+     */
+    fun getModelByName(name: String): AirPodsBase? {
+        val n = name.lowercase()
+        if (!n.contains("airpod")) return null
+        return when {
+            n.contains("max") -> if (n.contains("usb")) AirPodsMaxUSBC() else AirPodsMax()
+            else -> null
+        }
+    }
+
+    /**
+     * Resolves a model from whatever identifying information is available, most reliable first.
+     * Returns null when nothing matches, so callers keep control over the fallback.
+     */
+    fun resolveModel(
+        modelNumber: String? = null,
+        bleModelId: Int? = null,
+        name: String? = null
+    ): AirPodsBase? {
+        modelNumber?.takeIf { it.isNotBlank() }?.let { getModelByModelNumber(it)?.let { m -> return m } }
+        bleModelId?.let { getModelByBleModelId(it)?.let { m -> return m } }
+        name?.takeIf { it.isNotBlank() }?.let { getModelByName(it)?.let { m -> return m } }
+        return null
+    }
 }