Fix NullPointerException when using path variables and no APNonce/generator is provided (#519)

Author: airsquared

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

@@ -104,7 +104,7 @@ public void clearEffectHandler(Event evt) {
 
     @SuppressWarnings("unused")
     public void checkRequirements(ObservableValue<?> ignored, String ignored2, String identifier) {
-        identifier = Utils.defaultIfNull(Devices.modelToIdentifier(identifier), identifier);
+        identifier = Utils.defIfNull(Devices.modelToIdentifier(identifier), identifier);
         if (!Utils.isEmptyOrNull(identifier) && Devices.doesRequireBoardConfig(identifier)) {
             boardConfigField.setDisable(false);
             boardConfigField.setEffect(Utils.borderGlow);
@@ -125,7 +125,7 @@ public void checkRequirements(ObservableValue<?> ignored, String ignored2, Strin
     @SuppressWarnings("unused")
     public void deviceTypeChoiceBoxHandler() {
         deviceModelChoiceBox.setItems(Devices.getModelsForType(deviceTypeChoiceBox.getValue()));
-        versionLabel.setText(Utils.defaultIfNull(Devices.getOSNameForType(deviceTypeChoiceBox.getValue()), "Version"));
+        versionLabel.setText(Utils.defIfNull(Devices.getOSNameForType(deviceTypeChoiceBox.getValue()), "Version"));
     }
 
     public void checkForUpdatesHandler() { Utils.checkForUpdates(true); }

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

@@ -173,8 +173,8 @@ private String parsePath(String input) {
 
         var variables = Map.of("${DeviceIdentifier}", deviceIdentifier,
                             "${BoardConfig}", getBoardConfig(),
-                            "${APNonce}", apnonce,
-                            "${Generator}", generator,
+                            "${APNonce}", Utils.defIfNull(apnonce, "UnknownAPNonce"),
+                            "${Generator}", Utils.defIfNull(generator, "UnknownGenerator"),
                             "${DeviceModel}", Devices.identifierToModel(deviceIdentifier),
                             "${ECID}", ecid);
         for (Map.Entry<String, String> entry : variables.entrySet()) {
@@ -187,16 +187,11 @@ private String parsePathWithVersion(Utils.IOSVersion ios) {
         if (!savePath.contains("${")) return savePath;
         var template = savePath;
 
-        Map<String, String> variables;
-        if (ios.versionString() != null) {
-            variables = Map.of("${FullVersionString}", ios.versionString(),
-                            "${BuildID}", ios.buildid(),
-                            "${MajorVersion}", ios.versionString().replaceFirst("\\..*", ""));
-        } else {
-            variables = Map.of("${FullVersionString}", "UnknownVersion",
-                            "${BuildID}", "UnknownBuildID",
-                            "${MajorVersion}", "UnknownVersion");
-        }
+        var majorVersion = ios.versionString() != null ? ios.versionString().replaceFirst("\\..*", "") : "UnknownVersion";
+        Map<String, String> variables = Map.of(
+                "${FullVersionString}", Utils.defIfNull(ios.versionString(), "UnknownVersion"),
+                "${BuildID}", Utils.defIfNull(ios.buildid(), "UnknownBuildID"),
+                "${MajorVersion}", majorVersion);
         for (Map.Entry<String, String> entry : variables.entrySet()) {
             template = template.replace(entry.getKey(), entry.getValue());
         }
@@ -318,7 +313,7 @@ private ArrayList<String> constructArgs() {
     }
 
     private String getBoardConfig() {
-        return Utils.defaultIfNull(boardConfig, Devices.getBoardConfig(deviceIdentifier));
+        return Utils.defIfNull(boardConfig, Devices.getBoardConfig(deviceIdentifier));
     }
 
     private void parseTSSLog(String tsscheckerLog) throws TSSException {

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

@@ -444,7 +444,7 @@ static boolean isEmptyOrNull(String s) {
         return s == null || s.isEmpty();
     }
 
-    static <T> T defaultIfNull(T object, T def) {
+    static <T> T defIfNull(T object, T def) {
         return (object == null) ? def : object;
     }