Save the generator in saved devices

Author: airsquared

.idea/blobsaver.iml

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-rc-1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

.idea/misc.xml

@@ -269,6 +269,7 @@ private static void saveBlobs(Prefs.SavedDevice savedDevice) {
                 .setEcid(savedDevice.getEcid()).setSavePath(savedDevice.getSavePath());
         savedDevice.getBoardConfig().ifPresent(builder::setBoardConfig);
         savedDevice.getApnonce().ifPresent(builder::setApnonce);
+        savedDevice.getGenerator().ifPresent(builder::setGenerator);
 
         try {
             builder.build().call();

gradle/wrapper/gradle-wrapper.properties

@@ -186,10 +186,11 @@ private void loadSavedDevice(Prefs.SavedDevice savedDevice) {
             Utils.setSelectedFire(identifierCheckBox, true);
             identifierField.setText(identifier);
         }
-        savedDevice.getBoardConfig().ifPresent(b -> boardConfigField.setText(b));
+        savedDevice.getBoardConfig().ifPresent(boardConfigField::setText);
         savedDevice.getApnonce().ifPresent(a -> {
             Utils.setSelectedFire(apnonceCheckBox, true);
             apnonceField.setText(a);
+            savedDevice.getGenerator().ifPresent(generatorField::setText);
         });
     }
 
@@ -219,6 +220,9 @@ public void saveDeviceHandler() {
             }
             if (apnonceCheckBox.isSelected()) {
                 builder.setApnonce(apnonceField.getText());
+                if (!Utils.isEmptyOrNull(generatorField.getText())) {
+                    builder.setGenerator(generatorField.getText());
+                }
             }
             builder.save();
         }

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

@@ -216,6 +216,14 @@ public void setApnonce(String apnonce) {
             node.put("Apnonce", apnonce);
         }
 
+        public Optional<String> getGenerator() {
+            return Optional.ofNullable(node.get("Generator", null));
+        }
+
+        public void setGenerator(String generator) {
+            node.put("Generator", generator);
+        }
+
         public boolean isBackground() {
             return node.getBoolean("Save in background", false);
         }
@@ -243,7 +251,7 @@ public int hashCode() {
     @SuppressWarnings("UnusedReturnValue")
     public static class SavedDeviceBuilder {
         private final String name;
-        private String ecid, savePath, identifier, boardConfig, apnonce;
+        private String ecid, savePath, identifier, boardConfig, apnonce, generator;
 
         public SavedDeviceBuilder(String name) {
             this.name = name;
@@ -274,6 +282,11 @@ public SavedDeviceBuilder setApnonce(String apnonce) {
             return this;
         }
 
+        public SavedDeviceBuilder setGenerator(String generator) {
+            this.generator = generator;
+            return this;
+        }
+
         public SavedDevice save() {
             SavedDevice device = new SavedDevice(Objects.requireNonNull(name, "Device Name"));
             device.setEcid(Objects.requireNonNull(ecid, "ECID"));
@@ -285,6 +298,9 @@ public SavedDevice save() {
             if (apnonce != null) {
                 device.setApnonce(apnonce);
             }
+            if (generator != null) {
+                device.setGenerator(generator);
+            }
 
             if (!savedDevicesList.contains(device)) {
                 savedDevicesList.add(device); // update observable list

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

@@ -167,9 +167,12 @@ private ArrayList<String> constructArgs() {
                 Objects.requireNonNullElse(boardConfig, Devices.getBoardConfig(deviceIdentifier)));
         if (apnonce != null) {
             Collections.addAll(args, "--apnonce", apnonce);
+            if (generator != null) {
+                Collections.addAll(args, "--generator", generator);
+            }
+        } else {
+            Collections.addAll(args, "--generator", "0x1111111111111111");
         }
-        Collections.addAll(args, "--generator",
-                Objects.requireNonNullElse(generator, "0x1111111111111111"));
         Collections.addAll(args, "--build-manifest", "will be replaced in loop");
 
         return args;