Support latest iPads(iPad8,9, iPad8,10, iPad8,11, iPad8,12) (#149)

Author: airsquared

src/main/java/com/airsquared/blobsaver/Controller.java

@@ -197,7 +197,7 @@ private void requireBoardConfig(String identifier) {
 
     private void requireApnonce(String identifier) {
         if (!"".equals(identifier) && (identifier.startsWith("iPhone11,") || identifier.startsWith("iPhone12,") ||
-                identifier.startsWith("iPad11,"))) {
+                identifier.startsWith("iPad8,") || identifier.startsWith("iPad11,"))) {
             if (!apnonceCheckBox.isSelected()) {
                 apnonceCheckBox.fire();
             }
@@ -838,7 +838,6 @@ public void readInfo() {
             newReportableError("Error: unable to register native methods", exceptionToString(e));
         } finally {
             readFromConnectedDeviceButton.setDisable(false);
-            readFromConnectedDeviceButton.setText("Read from connected device");
         }
     }
 
@@ -847,7 +846,7 @@ public void readApnonce() {
         alert1.setHeaderText("Read apnonce from connected device");
         alert1.setContentText("blobsaver can read the apnonce from a connected device.\n\n" +
                 "It is recommended, but not required to set a generator on your device prior to reading the apnonce. " +
-                "blobsaver uses the generator 0x1111111111111111 (that's 0x followed by sixteen 1's) when saving blobs.\n\n" +
+                "If you set a generator, make sure to take note of that generator so you can use it in the future.\n\n" +
                 "Please connect your device and hit \"OK\" to begin. Your device will enter recovery mode while retrieving the apnonce and will automatically reboot to normal mode when complete.\n\n" +
                 "NOTE: an apnonce is only required for devices with an A12 processor or newer.");
         Optional<ButtonType> result = alert1.showAndWait();

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

@@ -36,7 +36,8 @@ public class Devices {
             "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 XS (Global) (iPhone11,2)",
             "iPhone XS Max (China) (iPhone11,4)", "iPhone XS Max (iPhone11,6)", "iPhone XR (iPhone11,8)",
-            "iPhone 11 (iPhone12,1)", "iPhone 11 Pro (iPhone12,3)", "iPhone 11 Pro Max (iPhone12,5)");
+            "iPhone 11 (iPhone12,1)", "iPhone 11 Pro (iPhone12,3)", "iPhone 11 Pro Max (iPhone12,5)",
+            "iPhone SE 2 (iPhone12,8)");
 
     private static final ObservableList<String> iPods =
             FXCollections.observableArrayList("iPod Touch 3", "iPod Touch 4", "iPod Touch 5", "iPod Touch 6",
@@ -55,8 +56,10 @@ public class Devices {
                     "iPad 6 (Cellular)(iPad7,6)", "iPad 7 (WiFi)(iPad7,11)", "iPad 7 (Cellular)(iPad7,12)",
                     "iPad Pro 3 11' (WiFi)(iPad8,1)", "iPad Pro 3 11' (WiFi)(iPad8,2)", "iPad Pro 3 11' (Cellular)(iPad8,3)",
                     "iPad Pro 3 11' (Cellular)(iPad8,4)", "iPad Pro 3 12.9'(WiFi)(iPad8,5)", "iPad Pro 3 12.9 (WiFi)(iPad8,6)",
-                    "iPad Pro 3 12.9 (Cellular)(iPad8,7)", "iPad Pro 3 12.9 (Cellular)(iPad8,8)", "iPad Mini 5 (WiFi)(iPad11,1)",
-                    "iPad Mini 5 (Cellular)(iPad11,2)", "iPad Air 3 (WiFi)(iPad11,3)", "iPad Air 3 (Cellular)(iPad11,4)");
+                    "iPad Pro 3 12.9 (Cellular)(iPad8,7)", "iPad Pro 3 12.9 (Cellular)(iPad8,8)", "iPad Pro 4 11' (WiFi)(iPad8,9)",
+                    "iPad Pro 4 11' (Cellular)(iPad8,10)", "iPad Pro 4 12.9' (WiFi)(iPad8,11)",
+                    "iPad Pro 4 12.9' (Cellular)(iPad8,12)", "iPad Mini 5 (WiFi)(iPad11,1)", "iPad Mini 5 (Cellular)(iPad11,2)",
+                    "iPad Air 3 (WiFi)(iPad11,3)", "iPad Air 3 (Cellular)(iPad11,4)");
 
     private static final ObservableList<String> AppleTVs =
             FXCollections.observableArrayList("Apple TV 2G", "Apple TV 3", "Apple TV 3 (2013)", "Apple TV 4 (2015)", "Apple TV 4K");
@@ -68,6 +71,13 @@ public class Devices {
     private static HashMap<String, String> deviceModelIdentifiers = null;
 
     static {
+        requiresBoardConfig.put("iPhone12,8", "D79AP");
+        requiresBoardConfig.put("iPad8,9", "J417AP");
+        requiresBoardConfig.put("iPad8,10", "J418AP");
+        requiresBoardConfig.put("iPad8,11", "J420AP");
+        requiresBoardConfig.put("iPad8,12", "J421AP");
+
+        // devices with multiple board configs
         requiresBoardConfig.put("iPhone8,1", "");
         requiresBoardConfig.put("iPhone8,2", "");
         requiresBoardConfig.put("iPhone8,4", "");

src/main/resources/com/airsquared/blobsaver/devicemodels.properties

@@ -48,6 +48,7 @@ iPhone\ XR\ (iPhone11,8)=iPhone11,8
 iPhone\ 11\ (iPhone12,1)=iPhone12,1
 iPhone\ 11\ Pro\ (iPhone12,3)=iPhone12,3
 iPhone\ 11\ Pro\ Max\ (iPhone12,5)=iPhone12,5
+iPhone\ SE\ 2\ (iPhone12,8)=iPhone12,8
 iPod\ Touch\ 3=iPod3,1
 iPod\ Touch\ 4=iPod4,1
 iPod\ Touch\ 5=iPod5,1
@@ -107,6 +108,10 @@ iPad\ Pro\ 3\ 12.9'(WiFi)(iPad8,5)=iPad8,5
 iPad\ Pro\ 3\ 12.9\ (WiFi)(iPad8,6)=iPad8,6
 iPad\ Pro\ 3\ 12.9\ (Cellular)(iPad8,7)=iPad8,7
 iPad\ Pro\ 3\ 12.9\ (Cellular)(iPad8,8)=iPad8,8
+iPad\ Pro\ 4\ 11'\ (WiFi)(iPad8,9)=iPad8,9
+iPad\ Pro\ 4\ 11'\ (Cellular)(iPad8,10)=iPad8,10
+iPad\ Pro\ 4\ 12.9'\ (WiFi)(iPad8,11)=iPad8,11
+iPad\ Pro\ 4\ 12.9'\ (Cellular)(iPad8,12)=iPad8,12
 iPad\ Mini\ 5\ (WiFi)(iPad11,1)=iPad11,1
 iPad\ Mini\ 5\ (Cellular)(iPad11,2)=iPad11,2
 iPad\ Air\ 3\ (WiFi)(iPad11,3)=iPad11,3