Allow optionally specifying a generator

Author: airsquared

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

@@ -55,7 +55,7 @@ public class Controller {
 
     @FXML private ChoiceBox<String> deviceTypeChoiceBox, deviceModelChoiceBox;
 
-    @FXML private TextField ecidField, boardConfigField, apnonceField, versionField, identifierField,
+    @FXML private TextField ecidField, boardConfigField, apnonceField, generatorField, versionField, identifierField,
             pathField, ipswField;
 
     @FXML private CheckBox apnonceCheckBox, allSignedVersionsCheckBox, identifierCheckBox, betaCheckBox;
@@ -123,6 +123,7 @@ public void apnonceCheckBoxHandler() {
         } else {
             apnonceField.setEffect(null);
             apnonceField.setText("");
+            generatorField.setText("");
         }
     }
 
@@ -592,6 +593,9 @@ private TSS createTSS(String runningAlertTitle) {
         }
         if (!apnonceField.isDisabled()) {
             builder.setApnonce(apnonceField.getText());
+            if (!Utils.isEmptyOrNull(generatorField.getText())) {
+                builder.setGenerator(generatorField.getText());
+            }
         }
 
         TSS tss = builder.build();

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

@@ -53,19 +53,20 @@ public class TSS extends Task<String> {
     private final String manualVersion;
     private final String manualIpswURL;
 
-    private final String apnonce;
+    private final String apnonce, generator;
 
     /**
      * Private constructor; use {@link TSS.Builder} instead
      */
-    private TSS(String deviceIdentifier, String ecid, String savePath, String boardConfig, String manualVersion, String manualIpswURL, String apnonce) {
+    private TSS(String deviceIdentifier, String ecid, String savePath, String boardConfig, String manualVersion, String manualIpswURL, String apnonce, String generator) {
         this.deviceIdentifier = deviceIdentifier;
         this.ecid = ecid;
         this.savePath = savePath;
         this.boardConfig = boardConfig;
         this.manualVersion = manualVersion;
         this.manualIpswURL = manualIpswURL;
         this.apnonce = apnonce;
+        this.generator = generator;
     }
 
     /**
@@ -79,6 +80,7 @@ protected String call() throws TSSException {
         List<Utils.IOSVersion> iosVersions = getIOSVersions();
         System.out.println("iosVersions = " + iosVersions);
         ArrayList<String> args = constructArgs();
+        final int urlIndex = args.size() - 1;
 
         StringBuilder sb = new StringBuilder("Successfully saved blobs in\n").append(savePath);
         if (manualIpswURL == null) {
@@ -88,7 +90,7 @@ protected String call() throws TSSException {
         // can't use forEach() because exception won't be caught
         for (Utils.IOSVersion iosVersion : iosVersions) {
             try {
-                args.set(args.size() - 1, extractBuildManifest(iosVersion.ipswURL()).toString());
+                args.set(urlIndex, extractBuildManifest(iosVersion.ipswURL()).toString());
             } catch (IOException e) {
                 throw new TSSException("Unable to extract BuildManifest.", true, e);
             }
@@ -156,26 +158,24 @@ private List<Utils.IOSVersion> getIOSVersions() throws TSSException {
     }
 
     private ArrayList<String> constructArgs() {
-        ArrayList<String> args = new ArrayList<>(15);
+        ArrayList<String> args = new ArrayList<>(17);
         String tsscheckerPath = Utils.getTsschecker().getAbsolutePath();
         //noinspection ResultOfMethodCallIgnored
         new File(savePath).mkdirs();
         Collections.addAll(args, tsscheckerPath, "--nocache", "--save", "--device", deviceIdentifier, "--ecid", ecid, "--save-path", savePath);
-        if (boardConfig == null) {
-            Collections.addAll(args, "--boardconfig", Devices.getBoardConfig(deviceIdentifier));
-        } else {
-            Collections.addAll(args, "--boardconfig", boardConfig);
-        }
+        Collections.addAll(args, "--boardconfig",
+                Objects.requireNonNullElse(boardConfig, Devices.getBoardConfig(deviceIdentifier)));
         if (apnonce != null) {
             Collections.addAll(args, "--apnonce", apnonce);
-        } else {
-            Collections.addAll(args, "--generator", "0x1111111111111111");
         }
-        Collections.addAll(args, "--build-manifest", "");
+        Collections.addAll(args, "--generator",
+                Objects.requireNonNullElse(generator, "0x1111111111111111"));
+        Collections.addAll(args, "--build-manifest", "will be replaced in loop");
 
         return args;
     }
 
+    @SuppressWarnings("TextBlockMigration")
     private void parseTSSLog(String tsscheckerLog) throws TSSException {
         if (containsIgnoreCase(tsscheckerLog, "Saved shsh blobs")) {
             return; // success
@@ -215,7 +215,7 @@ && containsIgnoreCase(tsscheckerLog, "checking tss status failed")) {
 
     @SuppressWarnings("UnusedReturnValue")
     public static class Builder {
-        private String device, ecid, savePath, boardConfig, manualVersion, manualIpswURL, apnonce;
+        private String device, ecid, savePath, boardConfig, manualVersion, manualIpswURL, apnonce, generator;
 
         public Builder setDevice(String device) {
             this.device = device;
@@ -254,11 +254,16 @@ public Builder setApnonce(String apnonce) {
             return this;
         }
 
+        public Builder setGenerator(String generator) {
+            this.generator = generator;
+            return this;
+        }
+
         public TSS build() {
             return new TSS(Objects.requireNonNull(device, "Device"),
                     Objects.requireNonNull(ecid, "ECID"),
                     Objects.requireNonNull(savePath, "Save Path"),
-                    boardConfig, manualVersion, manualIpswURL, apnonce);
+                    boardConfig, manualVersion, manualIpswURL, apnonce, generator);
         }
     }
 

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

@@ -190,7 +190,7 @@
             </VBox.margin>
         </TextField>
         <CheckBox fx:id="apnonceCheckBox" mnemonicParsing="false" onAction="#apnonceCheckBoxHandler"
-                  text="Specify Apnonce:">
+                  text="Specify ApNonce:">
             <VBox.margin>
                 <Insets bottom="5.0" left="10.0" top="5.0"/>
             </VBox.margin>
@@ -210,6 +210,11 @@
                 <Insets bottom="5.0" left="10.0" right="10.0"/>
             </VBox.margin>
         </AnchorPane>
+        <TextField fx:id="generatorField" disable="${!apnonceCheckBox.selected}" promptText="Generator (Optional)">
+            <VBox.margin>
+                <Insets top="5.0" bottom="5.0" left="10.0" right="10.0"/>
+            </VBox.margin>
+        </TextField>
         <Label text="Location">
             <VBox.margin>
                 <Insets bottom="5.0" left="10.0" top="5.0"/>