Allow specifying a local IPSW or BuildManifest.plist file URL

Author: airsquared

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

@@ -36,6 +36,7 @@
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyEvent;
 import javafx.scene.layout.HBox;
+import javafx.scene.layout.Pane;
 import javafx.scene.layout.VBox;
 import javafx.stage.FileChooser;
 import javafx.stage.Modality;
@@ -66,7 +67,7 @@ public class Controller {
     @FXML private ToggleButton backgroundSettingsButton;
 
     @FXML private ListView<Prefs.SavedDevice> deviceList;
-    @FXML private VBox savedDevicesVBox;
+    @FXML private Pane savedDevicesVBox;
 
     public static final String initialPath = System.getProperty("user.home") + File.separator + "Blobs";
 
@@ -174,7 +175,17 @@ public void manualURLCheckBoxHandler() {
         }
     }
 
-    public void filePickerHandler() {
+    public void ipswPickerHandler() {
+        FileChooser chooser = new FileChooser();
+        chooser.setTitle("Choose an IPSW or Build Manifest file");
+        chooser.getExtensionFilters().add(new FileChooser.ExtensionFilter("IPSW files, Plist files", "*.ipsw", "*.plist"));
+        File file = chooser.showOpenDialog(Main.primaryStage);
+        if (file != null) {
+            ipswField.setText(file.toURI().toString());
+        }
+    }
+
+    public void folderPickerHandler() {
         File result = Utils.showFilePickerDialog(Main.primaryStage, new File(pathField.getText()));
         if (result != null) {
             pathField.setText(result.getAbsolutePath());
@@ -301,35 +312,29 @@ public void checkBlobs() {
         Analytics.checkBlobs();
     }
 
-    public void helpLabelHandler(Event evt) {
+    public void locationHelp() {
+        ButtonType openURL = new ButtonType("Open URL");
+        Alert alert = new Alert(Alert.AlertType.INFORMATION,
+                "Click \"Open URL\" to see how to automatically upload blobs you save to the cloud.", openURL, ButtonType.OK);
+        alert.setTitle("Tip: Saving Blobs to the Cloud");
+        alert.setHeaderText("Tip");
+        alert.showAndWait();
+        if (openURL.equals(alert.getResult())) {
+            Utils.openURL("https://github.com/airsquared/blobsaver/wiki/Automatically-saving-blobs-to-the-cloud");
+        }
+    }
+
+    public void ipswURLHelp() {
         if (Main.SHOW_BREAKPOINT) {
             return; // remember to put a breakpoint here
         }
 
-        String labelID = ((Label) evt.getSource()).getId();
-
-        ButtonType openURL = new ButtonType("Open URL");
-        ButtonType customOK = new ButtonType("OK", ButtonBar.ButtonData.CANCEL_CLOSE);
-        Alert alert = new Alert(Alert.AlertType.INFORMATION, "", openURL, customOK);
-        ((Button) alert.getDialogPane().lookupButton(customOK)).setDefaultButton(true);
-        String url = switch (labelID) {
-            case "ipswURLHelp":
-                alert.setContentText("Get the IPSW download URL for the iOS version from theiphonewiki.com/wiki/Beta_Firmware and paste it here.\n\nIf you already have the IPSW downloaded, you can also supply a 'file:' URL.");
-                alert.setTitle("Help: IPSW URL");
-                alert.setHeaderText("Help");
-                yield "https://www.theiphonewiki.com/wiki/Beta_Firmware";
-            case "locationHelp":
-                alert.setContentText("Click \"Open URL\" to see how to automatically upload blobs you save to the cloud.");
-                alert.setTitle("Tip: Saving Blobs to the Cloud");
-                alert.setHeaderText("Tip");
-                yield "https://github.com/airsquared/blobsaver/wiki/Automatically-saving-blobs-to-the-cloud";
-            default:
-                throw new IllegalStateException("Unexpected value for labelID: " + labelID);
-        };
+        Alert alert = new Alert(Alert.AlertType.INFORMATION,
+                        "You can supply either a URL to an IPSW file or a build manifest (.plist). " +
+                        "If you already have the file downloaded, you can also use a 'file:' URL to either an IPSW or a build manifest plist.");
+        alert.setTitle("Help: IPSW URL");
+        alert.setHeaderText("Help");
         alert.showAndWait();
-        if (openURL.equals(alert.getResult())) {
-            Utils.openURL(url);
-        }
     }
 
     public void aboutMenuHandler(Event ignored) {
@@ -551,7 +556,7 @@ public void readInfo() {
                 boardConfigField.setText(LibimobiledeviceUtil.getBoardConfig());
             }
         } catch (LibimobiledeviceUtil.LibimobiledeviceException e) {
-            System.err.println(e.getMessage()); // don't need full stack trace
+            System.err.println(e.getMessage()); // don't need a full stack trace
             e.showErrorAlert();
         } catch (Throwable e) {
             e.printStackTrace();

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

@@ -87,7 +87,7 @@ static void setJNALibraryPath() {
     }
 
     /**
-     * Apple Decided use some old distrusted certificate for the iOS 15.5 IPSW, causing this error:
+     * Apple decided use some old distrusted certificate for the iOS 15.5 IPSW, causing this error:
      * {@code javax.net.ssl.SSLHandshakeException: TLS Server certificate issued after 2019-12-31 and anchored by a distrusted legacy Symantec root CA: CN=GeoTrust Primary Certification Authority - G2, OU=(c) 2007 GeoTrust Inc. - For authorized use only, O=GeoTrust Inc., C=US }
      *
      * This uses reflection/unsafe to make the certificate "trusted" anyway.

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

@@ -48,7 +48,7 @@
 
 public class TSS extends Task<String> {
 
-    private static final Pattern ipswURLPattern = Pattern.compile("(https?://|file:/).*\\.ipsw");
+    private static final Pattern ipswURLPattern = Pattern.compile("(https?://|file:/).*\\.(ipsw|plist)");
     private static final Pattern versionPattern = Pattern.compile("[0-9]+\\.[0-9]+\\.?[0-9]*(?<!\\.)");
 
     private final String deviceIdentifier;
@@ -165,12 +165,12 @@ private void checkInputs() throws TSSException {
                 }
                 new URL(manualIpswURL); // check URL
             } catch (MalformedURLException e) {
-                throw new TSSException("The IPSW URL is not valid.\n\nMake sure it's a valid URL that ends with \".ipsw\"", false, e);
+                throw new TSSException("The IPSW URL is not valid.\n\nMake sure it's a valid URL that ends with \".ipsw\" or \".plist\"", false, e);
             }
             if (manualIpswURL.startsWith("file:")) try {
                 Path.of(new URI(manualIpswURL)).toRealPath(); // check URI
             } catch (IllegalArgumentException | URISyntaxException | IOException e) {
-                throw new TSSException("The IPSW URL is not valid.\n\nMake sure it's a valid file URL to a local .ipsw file.", false, e);
+                throw new TSSException("The IPSW URL is not valid.\n\nMake sure it's a valid file URL to a local .ipsw or .plist file.", false, e);
             }
         } else if (manualVersion != null && !versionPattern.matcher(manualVersion).matches()) {
             throw new TSSException("Invalid version. Make sure it follows the convention X.X.X or X.X, like \"13.1\" or \"13.5.5\"", false);
@@ -259,8 +259,7 @@ && containsIgnoreCase(tsscheckerLog, "checking tss status failed")) {
 
         } else if (containsIgnoreCase(tsscheckerLog, "failed to load manifest")) {
             if (manualIpswURL != null) {
-                throw new TSSException("Failed to load manifest. The IPSW URL is not valid.\n\n" +
-                        "Make sure it starts with \"http://\" or \"https://\", has \"apple\" in it, and ends with \".ipsw\"", false);
+                throw new TSSException("Failed to load manifest. The IPSW or build manifest URL is not valid.\n\n", false);
             } else {
                 throw new TSSException("Failed to load manifest.", true, tsscheckerLog);
             }

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

@@ -110,7 +110,7 @@ private static void _checkForUpdates(boolean forceCheck) {
         try {
             newVersion = LatestVersion.request();
         } catch (IOException e) {
-            runLater(() -> showReportableError("Unable to check for updates.", e.toString()));
+            runLater(() -> showReportableError("Unable to check for updates.", exceptionToString(e)));
             throw new UncheckedIOException(e);
         }
 
@@ -385,6 +385,16 @@ static Path extractBuildManifest(String ipswUrl) throws IOException {
             } catch (Exception e) {
                 e.printStackTrace();
             }
+        } else if (ipswUrl.startsWith("file:") && ipswUrl.endsWith(".plist")) {
+            Files.copy(Path.of(URI.create(ipswUrl)), buildManifest, StandardCopyOption.REPLACE_EXISTING);
+            return buildManifest.toRealPath();
+        } else if (ipswUrl.endsWith(".plist")) {
+            var manifestURL = new URL(ipswUrl);
+            try (var stream = manifestURL.openStream()) {
+                Files.copy(stream, buildManifest, StandardCopyOption.REPLACE_EXISTING);
+                System.out.println("Directly downloaded to " + buildManifest);
+                return buildManifest.toRealPath();
+            }
         }
         extractManifestFromZip(ipswUrl, buildManifest);
         System.out.println("Extracted to " + buildManifest);

src/main/resources/airsquared/blobsaver/app/blobsaver.fxml

@@ -185,13 +185,20 @@
             </VBox.margin>
             <TextField fx:id="versionField" disable="${allSignedVersionsCheckBox.selected || manualURLCheckBox.selected}"
                        promptText="Version" onTextChange="#clearEffectHandler"/>
-            <TextField fx:id="ipswField" disable="${!manualURLCheckBox.selected}" HBox.hgrow="ALWAYS"
-                       promptText="URL to .ipsw file" onTextChange="#clearEffectHandler">
+            <AnchorPane disable="${!manualURLCheckBox.selected}" HBox.hgrow="ALWAYS">
                 <HBox.margin>
                     <Insets left="5.0"/>
                 </HBox.margin>
-            </TextField>
-            <Label id="ipswURLHelp" onMouseClicked="#helpLabelHandler" text="?">
+                <TextField fx:id="ipswField" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
+                           AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"
+                           promptText="URL to .ipsw or build manifest .plist" onTextChange="#clearEffectHandler">
+                    <padding>
+                        <Insets left="8.0" right="33.0"/>
+                    </padding>
+                </TextField>
+                <Button mnemonicParsing="false" onAction="#ipswPickerHandler" text="..." AnchorPane.rightAnchor="0.0"/>
+            </AnchorPane>
+            <Label id="ipswURLHelp" onMouseClicked="#ipswURLHelp" text="?">
                 <padding>
                     <Insets bottom="5.0" left="5.0"/>
                 </padding>
@@ -255,9 +262,9 @@
                     </padding>
                     <Controller fx:constant="initialPath"/>
                 </TextField>
-                <Button mnemonicParsing="false" onAction="#filePickerHandler" text="..." AnchorPane.rightAnchor="0.0"/>
+                <Button mnemonicParsing="false" onAction="#folderPickerHandler" text="..." AnchorPane.rightAnchor="0.0"/>
             </AnchorPane>
-            <Label id="locationHelp" onMouseClicked="#helpLabelHandler" text="?">
+            <Label id="locationHelp" onMouseClicked="#locationHelp" text="?">
                 <padding>
                     <Insets bottom="5.0" left="5.0"/>
                 </padding>