From 31cff2ac0c259018fc51b455315e8b6acb9bd952 Mon Sep 17 00:00:00 2001
From: darken <darken@darken.eu>
Date: Mon, 25 Jul 2022 18:20:45 +0200
Subject: [PATCH] Change model check to compare against the full model
 identifier (4 bytes) and add support for AirPods 3rd gen.

Closes #140
---
 .../com/dosse/airpods/pods/PodsStatus.java    | 50 +++++++++++--------
 .../com/dosse/airpods/pods/data/AirPods3.java | 14 ++++++
 .../com/dosse/airpods/pods/data/IPods.java    |  1 +
 3 files changed, 43 insertions(+), 22 deletions(-)
 create mode 100644 app/src/main/java/com/dosse/airpods/pods/data/AirPods3.java

diff --git a/app/src/main/java/com/dosse/airpods/pods/PodsStatus.java b/app/src/main/java/com/dosse/airpods/pods/PodsStatus.java
index d9114ce..939cec6 100644
--- a/app/src/main/java/com/dosse/airpods/pods/PodsStatus.java
+++ b/app/src/main/java/com/dosse/airpods/pods/PodsStatus.java
@@ -2,6 +2,7 @@ package com.dosse.airpods.pods;
 
 import com.dosse.airpods.pods.data.AirPods1;
 import com.dosse.airpods.pods.data.AirPods2;
+import com.dosse.airpods.pods.data.AirPods3;
 import com.dosse.airpods.pods.data.AirPodsMax;
 import com.dosse.airpods.pods.data.AirPodsPro;
 import com.dosse.airpods.pods.data.BeatsFlex;
@@ -68,29 +69,34 @@ public class PodsStatus {
         Pod casePod = new Pod(caseStatus, chargeCase, false);
         Pod singlePod = new Pod(singleStatus, chargeSingle, false);
 
+        char idSingle = status.charAt(7); // We don't know the full ID for all devices
+        String idFull = status.substring(6, 10);
+
         // Detect which model
-        switch (status.charAt(7)) {
-            case '2': pods = new AirPods1(leftPod, rightPod, casePod); // Airpods 1st gen
-                break;
-            case 'F': pods = new AirPods2(leftPod, rightPod, casePod); // Airpods 2nd gen
-                break;
-            case 'E': pods = new AirPodsPro(leftPod, rightPod, casePod); // Airpods Pro
-                break;
-            case 'A': pods = new AirPodsMax(singlePod); // Airpods Max
-                break;
-            case 'B': pods = new PowerbeatsPro(leftPod, rightPod, casePod); // Powerbeats Pro
-                break;
-            case '5': pods = new BeatsX(singlePod); // Beats X
-                break;
-            case '0': pods = new BeatsFlex(singlePod); // Beats Flex
-                break;
-            case '6': pods = new BeatsSolo3(singlePod); // Beats Solo 3
-                break;
-            case '9': pods = new BeatsStudio3(singlePod); // Beats Studio 3
-                break;
-            case '3': pods = new Powerbeats3(singlePod); // Powerbeats 3
-                break;
-            default: pods = new RegularPods(leftPod, rightPod, casePod); // Unknown
+        if ("0220".equals(idFull)) {
+            pods = new AirPods1(leftPod, rightPod, casePod); // Airpods 1st gen
+        } else if ("0F20".equals(idFull)) {
+            pods = new AirPods2(leftPod, rightPod, casePod); // Airpods 2nd gen
+        } else if ("1320".equals(idFull)) {
+            pods = new AirPods3(leftPod, rightPod, casePod); // Airpods 3rd gen
+        } else if ("0E20".equals(idFull)) {
+            pods = new AirPodsPro(leftPod, rightPod, casePod); // Airpods Pro
+        } else if ('A' == idSingle) {
+            pods = new AirPodsMax(singlePod); // Airpods Max
+        } else if ('B' == idSingle) {
+            pods = new PowerbeatsPro(leftPod, rightPod, casePod); // Powerbeats Pro
+        } else if ("0520".equals(idFull)) {
+            pods = new BeatsX(singlePod); // Beats X
+        } else if ("1020".equals(idFull)) {
+            pods = new BeatsFlex(singlePod); // Beats Flex
+        } else if ("0620".equals(idFull)) {
+            pods = new BeatsSolo3(singlePod); // Beats Solo 3
+        } else if ('9' == idSingle) {
+            pods = new BeatsStudio3(singlePod); // Beats Studio 3
+        } else if ("0320".equals(idFull)) {
+            pods = new Powerbeats3(singlePod); // Powerbeats 3
+        } else {
+            pods = new RegularPods(leftPod, rightPod, casePod); // Unknown
         }
     }
 
diff --git a/app/src/main/java/com/dosse/airpods/pods/data/AirPods3.java b/app/src/main/java/com/dosse/airpods/pods/data/AirPods3.java
new file mode 100644
index 0000000..ea9aff1
--- /dev/null
+++ b/app/src/main/java/com/dosse/airpods/pods/data/AirPods3.java
@@ -0,0 +1,14 @@
+package com.dosse.airpods.pods.data;
+
+public class AirPods3 extends RegularPods {
+
+    public AirPods3(Pod leftPod, Pod rightPod, Pod casePod) {
+        super(leftPod, rightPod, casePod);
+    }
+
+    @Override
+    public String getModel () {
+        return MODEL_AIRPODS_GEN3;
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/dosse/airpods/pods/data/IPods.java b/app/src/main/java/com/dosse/airpods/pods/data/IPods.java
index 6a88132..810034a 100644
--- a/app/src/main/java/com/dosse/airpods/pods/data/IPods.java
+++ b/app/src/main/java/com/dosse/airpods/pods/data/IPods.java
@@ -4,6 +4,7 @@ public interface IPods {
 
     String MODEL_AIRPODS_GEN1 = "airpods1";
     String MODEL_AIRPODS_GEN2 = "airpods2";
+    String MODEL_AIRPODS_GEN3 = "airpods3";
     String MODEL_AIRPODS_PRO = "airpodspro";
     String MODEL_AIRPODS_MAX = "airpodsmax";
     String MODEL_BEATS_X = "beatsx";