Add Apple Silicon Macs and Apple Vision Pro

Co-authored-by: alexandredoyen29 <[email protected]>

Author: airsquared

src/main/java/airsquared/blobsaver/app/Devices.java

@@ -35,15 +35,18 @@ public final class Devices {
 
     private static final List<String> iPhones = new ArrayList<>(), iPads = new ArrayList<>();
 
-    private static final ObservableList<String> iPhoneList, iPadList, iBridgeList = FXCollections.observableArrayList();
+    private static final ObservableList<String> iPhoneList, iPadList,
+            iBridgeList = FXCollections.observableArrayList(), macList = FXCollections.observableArrayList();
 
     private static final ObservableList<String> iPodList = unmodifiableArrayList("iPod Touch 3", "iPod Touch 4",
             "iPod Touch 5", "iPod Touch 6", "iPod Touch 7 (iPod9,1)");
 
     private static final ObservableList<String> AppleTVList = unmodifiableArrayList("Apple TV 2G", "Apple TV 3",
             "Apple TV 3 (2013)", "Apple TV 4 (2015)", "Apple TV 4K", "Apple TV 4K (2021) (AppleTV11,1)", "Apple TV 4K (2022) (AppleTV14,1)");
+    private static final ObservableList<String> visionList = unmodifiableArrayList("Apple Vision Pro (RealityDevice14,1)");
 
-    private static final ObservableList<String> deviceTypes = unmodifiableArrayList("iPhone", "iPod", "iPad", "AppleTV", "T2 Mac");
+    private static final ObservableList<String> deviceTypes = unmodifiableArrayList("iPhone", "iPod", "iPad",
+            "AppleTV", "Mac", "T2 Mac", "Apple Vision");
 
     private static final Map<String, String> boardConfigs = (Map) new Properties();
 
@@ -110,7 +113,7 @@ public static String modelToIdentifier(String deviceModel) {
     }
 
     /**
-     * @return either "iPhone", "iPod", "iPad", "AppleTV", or "T2 Mac".
+     * @return either "iPhone", "iPod", "iPad", "AppleTV", "Mac",  "T2 Mac".
      */
     public static String getDeviceType(String identifier) {
         if (identifier.startsWith("iPhone")) {
@@ -121,8 +124,12 @@ public static String getDeviceType(String identifier) {
             return "iPad";
         } else if (identifier.startsWith("AppleTV")) {
             return "AppleTV";
+        } else if (identifier.startsWith("Mac")) {
+            return "Mac";
         } else if (identifier.startsWith("iBridge")) {
             return "T2 Mac";
+        } else if (identifier.startsWith("RealityDevice")) {
+            return "Apple Vision";
         }
         throw new IllegalArgumentException("Not found: " + identifier);
     }
@@ -133,7 +140,9 @@ public static ObservableList<String> getModelsForType(String deviceType) {
             case "iPod" -> iPodList;
             case "iPad" -> iPadList;
             case "AppleTV" -> AppleTVList;
+            case "Mac" -> macList;
             case "T2 Mac" -> iBridgeList;
+            case "Apple Vision" -> visionList;
             default -> FXCollections.emptyObservableList();
         };
     }
@@ -143,7 +152,9 @@ public static String getOSNameForType(String deviceType) {
             case "iPhone", "iPod" -> "iOS";
             case "iPad" -> "iOS/iPadOS";
             case "AppleTV" -> "tvOS";
+            case "Mac" -> "macOS";
             case "T2 Mac" -> "bridgeOS";
+            case "Apple Vision" -> "visionOS";
             default -> null;
         };
     }
@@ -194,6 +205,7 @@ public Object put(Object key, Object value) {
 
         loader.load("devicemodels/iPhones.properties", iPhones::add);
         loader.load("devicemodels/iPads.properties", iPads::add);
+        loader.load("devicemodels/Macs.properties", macList::add);
         loader.load("devicemodels/iBridges.properties", iBridgeList::add);
         loader.load("devicemodels/others.properties", _ -> {});
     }

src/main/java/airsquared/blobsaver/app/TSS.java

@@ -19,6 +19,7 @@
 package airsquared.blobsaver.app;
 
 import com.google.gson.Gson;
+import com.google.gson.JsonSyntaxException;
 import javafx.concurrent.Task;
 
 import java.io.FileNotFoundException;
@@ -191,12 +192,12 @@ private String parsePath(String input) {
         String template = input;
 
         var variables = Map.of("${Name}", Utils.defIfNull(name, "UnknownName"),
-                            "${DeviceIdentifier}", deviceIdentifier,
-                            "${BoardConfig}", getBoardConfig(),
-                            "${APNonce}", Utils.defIfNull(apnonce, "UnknownAPNonce"),
-                            "${Generator}", Utils.defIfNull(generator, "UnknownGenerator"),
-                            "${DeviceModel}", Devices.identifierToModel(deviceIdentifier),
-                            "${ECID}", ecid);
+                "${DeviceIdentifier}", deviceIdentifier,
+                "${BoardConfig}", getBoardConfig(),
+                "${APNonce}", Utils.defIfNull(apnonce, "UnknownAPNonce"),
+                "${Generator}", Utils.defIfNull(generator, "UnknownGenerator"),
+                "${DeviceModel}", Devices.identifierToModel(deviceIdentifier),
+                "${ECID}", ecid);
         for (Map.Entry<String, String> entry : variables.entrySet()) {
             template = template.replace(entry.getKey(), entry.getValue());
         }
@@ -391,6 +392,7 @@ public Builder setName(String name) {
             this.name = name;
             return this;
         }
+
         public Builder setDevice(String device) {
             this.device = device;
             return this;
@@ -517,7 +519,14 @@ private void saveBlobsTSSSaver(StringBuilder responseBuilder) throws IOException
                 Network.makePOSTRequest("https://tsssaver.1conan.com/v2/api/save.php", deviceParameters, headers, true);
         System.out.println(response.body());
 
-        var responseBody = new Gson().fromJson(response.body(), Map.class);
+        Map responseBody;
+        try {
+            responseBody = new Gson().fromJson(response.body(), Map.class);
+        } catch (JsonSyntaxException e) {
+            responseBuilder.append("Error encountered while trying to save blobs to TSSSaver: ").append(response.body())
+                    .append("\nThis is likely an issue with the third-party service, not blobsaver.");
+            return;
+        }
 
         if (responseBody == null) {
             responseBuilder.append("Error encountered while trying to save blobs to TSSSaver: ").append("Response code=").append(response.statusCode());
@@ -558,7 +567,14 @@ private void saveBlobsSHSHHost(StringBuilder responseBuilder) throws IOException
                 Network.makePOSTRequest("https://api.arx8x.net/shsh3/", deviceParameters, headers, false);
         System.out.println(response.body());
 
-        var responseBody = new Gson().fromJson(response.body(), Map.class);
+        Map responseBody;
+        try {
+            responseBody = new Gson().fromJson(response.body(), Map.class);
+        } catch (JsonSyntaxException e) {
+            responseBuilder.append("Error encountered while trying to save blobs to SHSH Host: ").append(response.body())
+                    .append("\nThis is likely an issue with the third-party service, not blobsaver.");
+            return;
+        }
 
         if (responseBody.get("code").equals((double) 0)) {
             responseBuilder.append("Also saved blobs online to SHSH Host.");

src/main/resources/airsquared/blobsaver/app/boardconfigs.properties

@@ -67,6 +67,7 @@ AppleTV5,3=j42dap
 AppleTV6,2=j105aap
 AppleTV11,1=j305ap
 AppleTV14,1=j255ap
+RealityDevice14,1=n301ap
 iPad1,1=k48ap
 iPad2,1=k93ap
 iPad2,2=k94ap
@@ -186,3 +187,41 @@ iBridge2,19=j185ap
 iBridge2,20=j185fap
 iBridge2,21=j223ap
 iBridge2,22=j215ap
+Mac13,1=j375cap
+Mac13,2=j375dap
+Mac14,2=j413ap
+Mac14,7=j493ap
+Mac14,3=j473ap
+Mac14,5=j414cap
+Mac14,6=j416cap
+Mac14,8=j180dap
+Mac14,9=j414sap
+Mac14,10=j416sap
+Mac14,12=j474sap
+Mac14,13=j475cap
+Mac14,14=j475dap
+Mac14,15=j415ap
+Mac15,3=j504ap
+Mac15,4=j433ap
+Mac15,5=j434ap
+Mac15,6=j514sap
+Mac15,7=j516sap
+Mac15,8=j514cap
+Mac15,9=j516cap
+Mac15,10=j514map
+Mac15,11=j516map
+Mac15,12=j613ap
+Mac15,13=j615ap
+Mac15,14=j575dap
+Mac16,1=j604ap
+Mac16,2=j623ap
+Mac16,3=j624ap
+Mac16,5=j616cap
+Mac16,6=j614cap
+Mac16,7=j616sap
+Mac16,8=j614sap
+Mac16,9=j575cap
+Mac16,10=j773gap
+Mac16,11=j773sap
+Mac16,12=j713ap
+Mac16,13=j715ap

src/main/resources/airsquared/blobsaver/app/devicemodels/Macs.properties

@@ -0,0 +1,39 @@
+# suppress inspection "UnusedProperty" for whole file
+Mac\ Studio\ (M1\ Max)\ (Mac13,1)=Mac13,1
+Mac\ Studio\ (M1\ Ultra)\ (Mac13,2)=Mac13,2
+MacBook\ Air\ (M2)\ (Mac14,2)=Mac14,2
+MacBook\ Pro\ 13'\ (M2)\ (Mac14,7)=Mac14,7
+Mac\ mini\ (M2)\ (Mac14,3)=Mac14,3
+MacBook\ Pro\ 14'\ (M2\ Max)\ (Mac14,5)=Mac14,5
+MacBook\ Pro\ 16'\ (M2\ Max)\ (Mac14,6)=Mac14,6
+Mac\ Pro\ (2023)\ (Mac14,8)=Mac14,8
+MacBook\ Pro\ 14'\ (M2\ Pro)\ (Mac14,9)=Mac14,9
+MacBook\ Pro\ 16'\ (M2\ Pro)\ (Mac14,10)=Mac14,10
+Mac\ mini\ (M2\ Pro)\ (Mac14,12)=Mac14,12
+Mac\ Studio\ (M2\ Max)\ (Mac14,13)=Mac14,13
+Mac\ Studio\ (M2\ Ultra)\ (Mac14,14)=Mac14,14
+MacBook\ Air\ 15'\ (M2)\ (Mac14,15)=Mac14,15
+MacBook\ Pro\ 14'\ (M3)\ (Mac15,3)=Mac15,3
+iMac\ 24'\ (M3,\ Two\ Ports)\ (Mac15,4)=Mac15,4
+iMac\ 24'\ (M3,\ Four\ Ports)\ (Mac15,5)=Mac15,5
+MacBook\ Pro\ 14'\ (M3\ Pro)\ (Mac15,6)=Mac15,6
+MacBook\ Pro\ 16'\ (M3\ Pro)\ (Mac15,7)=Mac15,7
+MacBook\ Pro\ 14'\ (M3\ Max,\ 16/40\ CPU/GPU)\ (Mac15,8)=Mac15,8
+MacBook\ Pro\ 16'\ (M3\ Max,\ 16/40\ CPU/GPU)\ (Mac15,9)=Mac15,9
+MacBook\ Pro\ 14'\ (M3\ Max,\ 14/30\ CPU/GPU)\ (Mac15,10)=Mac15,10
+MacBook\ Pro\ 16'\ (M3\ Max,\ 14/30\ CPU/GPU)\ (Mac15,11)=Mac15,11
+MacBook\ Air\ 13'\ (M3)\ (Mac15,12)=Mac15,12
+MacBook\ Air\ 15'\ (M3)\ (Mac15,13)=Mac15,13
+Mac\ Studio\ (M3\ Ultra)\ (Mac15,14)=Mac15,14
+MacBook\ Pro\ 14'\ (M4)\ (Mac16,1)=Mac16,1
+iMac\ 24'\ (M4,\ Two\ Ports)\ (Mac16,2)=Mac16,2
+iMac\ 24'\ (M4,\ Four\ Ports)\ (Mac16,3)=Mac16,3
+MacBook\ Pro\ 16'\ (M4\ Max)\ (Mac16,5)=Mac16,5
+MacBook\ Pro\ 14'\ (M4\ Max)\ (Mac16,6)=Mac16,6
+MacBook\ Pro\ 16'\ (M4\ Pro)\ (Mac16,7)=Mac16,7
+MacBook\ Pro\ 14'\ (M4\ Pro)\ (Mac16,8)=Mac16,8
+Mac\ Studio\ (M4\ Max)\ (Mac16,9)=Mac16,9
+Mac\ mini\ (M4)\ (Mac16,10)=Mac16,10
+Mac\ mini\ (M4\ Pro)\ (Mac16,11)=Mac16,11
+MacBook\ Air\ 13'\ (M4)\ (Mac16,12)=Mac16,12
+MacBook\ Air\ 15'\ (M4)\ (Mac16,13)=Mac16,13

src/main/resources/airsquared/blobsaver/app/devicemodels/iPads.properties

@@ -80,19 +80,19 @@ iPad\ Pro\ 11'\ (4th\ gen)\ (WiFi)\ (iPad14,3)=iPad14,3
 iPad\ Pro\ 11'\ (4th\ gen)\ (Cellular)\ (iPad14,4)=iPad14,4
 iPad\ Pro\ 12.9'\ (6th\ gen)\ (WiFi)\ (iPad14,5)=iPad14,5
 iPad\ Pro\ 12.9'\ (6th\ gen)\ (Cellular)\ (iPad14,6)=iPad14,6
-iPad\ Air\ 11'\ (M2,\ WiFi)=iPad14,8
-iPad\ Air\ 11'\ (M2,\ Cellular)=iPad14,9
-iPad\ Air\ 13'\ (M2,\ WiFi)=iPad14,10
-iPad\ Air\ 13'\ (M2,\ Cellular)=iPad14,11
-iPad\ Air\ 11'\ (M3,\ WiFi)=iPad15,3
-iPad\ Air\ 11'\ (M3,\ Cellular)=iPad15,4
-iPad\ Air\ 13'\ (M3,\ WiFi)=iPad15,5
-iPad\ Air\ 13'\ (M3,\ Cellular)=iPad15,6
-iPad\ (A16,\ WiFi)=iPad15,7
-iPad\ (A16,\ Cellular)=iPad15,8
-iPad\ mini\ (A17\ Pro,\ WiFi)=iPad16,1
-iPad\ mini\ (A17\ Pro,\ Cellular)=iPad16,2
-iPad\ Pro\ 11'\ (M4,\ WiFi)=iPad16,3
-iPad\ Pro\ 11'\ (M4,\ Cellular)=iPad16,4
-iPad\ Pro\ 13'\ (M4,\ WiFi)=iPad16,5
-iPad\ Pro\ 13'\ (M4,\ Cellular)=iPad16,6
+iPad\ Air\ 11'\ (M2,\ WiFi)\ (iPad14,8)=iPad14,8
+iPad\ Air\ 11'\ (M2,\ Cellular)\ (iPad14,9)=iPad14,9
+iPad\ Air\ 13'\ (M2,\ WiFi)\ (iPad14,10)=iPad14,10
+iPad\ Air\ 13'\ (M2,\ Cellular)\ (iPad14,11)=iPad14,11
+iPad\ Air\ 11'\ (M3,\ WiFi)\ (iPad15,3)=iPad15,3
+iPad\ Air\ 11'\ (M3,\ Cellular)\ (iPad15,4)=iPad15,4
+iPad\ Air\ 13'\ (M3,\ WiFi)\ (iPad15,5)=iPad15,5
+iPad\ Air\ 13'\ (M3,\ Cellular)\ (iPad15,6)=iPad15,6
+iPad\ (A16,\ WiFi)\ (iPad15,7)=iPad15,7
+iPad\ (A16,\ Cellular)\ (iPad15,8)=iPad15,8
+iPad\ mini\ (A17\ Pro,\ WiFi)\ (iPad16,1)=iPad16,1
+iPad\ mini\ (A17\ Pro,\ Cellular)\ (iPad16,2)=iPad16,2
+iPad\ Pro\ 11'\ (M4,\ WiFi)\ (iPad16,3)=iPad16,3
+iPad\ Pro\ 11'\ (M4,\ Cellular)\ (iPad16,4)=iPad16,4
+iPad\ Pro\ 13'\ (M4,\ WiFi)\ (iPad16,5)=iPad16,5
+iPad\ Pro\ 13'\ (M4,\ Cellular)\ (iPad16,6)=iPad16,6

src/main/resources/airsquared/blobsaver/app/devicemodels/others.properties

@@ -10,3 +10,4 @@ Apple\ TV\ 4\ (2015)=AppleTV5,3
 Apple\ TV\ 4K=AppleTV6,2
 Apple\ TV\ 4K\ (2021)\ (AppleTV11,1)=AppleTV11,1
 Apple\ TV\ 4K\ (2022)\ (AppleTV14,1)=AppleTV14,1
+Apple\ Vision\ Pro\ (RealityDevice14,1)=RealityDevice14,1