Fix iPad 5(#6), Add support for the new iPhones(iPhone XS, iPhone XR)(#9

)
airsquared · Oct 6, 2018 · 95a2c4e · 95a2c4e
1 parent 0e4ae44
commit 95a2c4e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ If you have an antivirus or firewall, you may need to disable some other setting
 - **Automatically save blobs in the background**
 - Store up to ten devices with presets
 - Save blobs for beta versions
-- Automatically read ECID and other info from device so you don't to get it manually
+- Read ECID and other info from device so you don't to get it manually (currently broken on Windows)
 - No need to download entire .ipsw for beta versions(just specify link)
 - Choose where to save blobs with file picker
 - Explains how to get ECID, Board Config(if needed), and information necessary for beta versions
@@ -26,6 +26,7 @@ If you have an antivirus or firewall, you may need to disable some other setting
 Please send feedback via [Github Issue](https://github.com/airsquared/blobsaver/issues/new/choose) or [Reddit PM](https://www.reddit.com//message/compose?to=01110101_00101111&subject=Blobsaver+Feedback) if you encounter any bugs/problems or have a feature request. 
 
 ## TODO:
+- Fix reading the information from the device on Windows
 - Better notifications
 
 ## Built With

diff --git a/src/main/java/com/airsquared/blobsaver/Controller.java b/src/main/java/com/airsquared/blobsaver/Controller.java
@@ -145,7 +145,8 @@ public void initialize() {
                 "iPhone 6+", "iPhone 6", "iPhone 6s", "iPhone 6s+", "iPhone SE", "iPhone 7 (Global)(iPhone9,1)",
                 "iPhone 7+ (Global)(iPhone9,2)", "iPhone 7 (GSM)(iPhone9,3)", "iPhone 7+ (GSM)(iPhone9,4)",
                 "iPhone 8 (iPhone10,1)", "iPhone 8+ (iPhone10,2)", "iPhone X (iPhone10,3)", "iPhone 8 (iPhone10,4)",
-                "iPhone 8+ (iPhone10,5)", "iPhone X (iPhone10,6)");
+                "iPhone 8+ (iPhone10,5)", "iPhone X (iPhone10,6)", "iPhone XS (Global) (iPhone11,2)",
+                "iPhone XS Max (iPhone11,4)", "iPhone XS Max (China) (iPhone11,6)", "iPhone XR (iPhone11,8)");
         final ObservableList iPods = FXCollections.observableArrayList("iPod Touch 3", "iPod Touch 4", "iPod Touch 5", "iPod Touch 6");
         final ObservableList iPads = FXCollections.observableArrayList("iPad 1", "iPad 2 (WiFi)", "iPad 2 (GSM)",
                 "iPad 2 (CDMA)", "iPad 2 (Mid 2012)", "iPad Mini (Wifi)", "iPad Mini (GSM)", "iPad Mini (Global)",
@@ -196,7 +197,7 @@ public void initialize() {
                 return;
             }
             final String v = (String) newValue;
-            if (v.equals("iPhone 6s") || v.equals("iPhone 6s+") || v.equals("iPhone SE") || v.equals("iPad 6 (WiFi)(iPad 7,5)") || v.equals("iPad 6 (Cellular)(iPad7,6)")) {
+            if (v.equals("iPhone 6s") || v.equals("iPhone 6s+") || v.equals("iPhone SE") || v.equals("iPad 6 (WiFi)(iPad 7,5)") || v.equals("iPad 6 (Cellular)(iPad7,6)") || v.equals("iPad 5 (Wifi)") || v.equals("iPad 5 (Cellular)")) {
                 boardConfigField.setEffect(borderGlow);
                 getBoardConfig = true;
                 boardConfigField.setDisable(false);
@@ -209,7 +210,7 @@ public void initialize() {
         });
         identifierField.textProperty().addListener((observable, oldValue, newValue) -> {
             identifierField.setEffect(null);
-            if (newValue.equals("iPhone8,1") || newValue.equals("iPhone8,2") || newValue.equals("iPhone8,4") || newValue.equals("iPad7,5") || newValue.equals("iPad7,6")) {
+            if (newValue.equals("iPhone8,1") || newValue.equals("iPhone8,2") || newValue.equals("iPhone8,4") || newValue.equals("iPad7,5") || newValue.equals("iPad7,6") || newValue.equals("iPad6,11") || newValue.equals("iPad6,12")) {
                 boardConfigField.setEffect(borderGlow);
                 getBoardConfig = true;
                 boardConfigField.setDisable(false);

diff --git a/src/main/resources/com/airsquared/blobsaver/blobsaver.fxml b/src/main/resources/com/airsquared/blobsaver/blobsaver.fxml
@@ -79,7 +79,7 @@
                 </padding>
             </Label>
             <Region HBox.hgrow="ALWAYS"/>
-            <Button onAction="#readInfo" text="Read from connected device">
+            <Button onAction="#readInfo" text="Read from connected device (beta)">
                 <HBox.margin>
                     <Insets right="5.0"/>
                 </HBox.margin>

diff --git a/src/main/resources/com/airsquared/blobsaver/devicemodels.properties b/src/main/resources/com/airsquared/blobsaver/devicemodels.properties
@@ -41,6 +41,10 @@ iPhone\ X\ (iPhone10,3)=iPhone10,3
 iPhone\ 8\ (iPhone10,4)=iPhone10,4
 iPhone\ 8+\ (iPhone10,5)=iPhone10,5
 iPhone\ X\ (iPhone10,6)=iPhone10,6
+iPhone\ XS\ (Global)\ (iPhone11,2)=iPhone11,2
+iPhone\ XS\ Max\ (iPhone11,4)=iPhone11,4
+iPhone\ XS\ Max\ (China)\ (iPhone11,6)=iPhone11,6
+iPhone\ XR\ (iPhone11,8)=iPhone11,8
 iPod\ Touch\ 3=iPod3,1
 iPod\ Touch\ 4=iPod4,1
 iPod\ Touch\ 5=iPod5,1