Better error message when no betas found

Author: airsquared

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

@@ -97,6 +97,7 @@ public void initialize() {
                 betaCheckBox.setSelected(false);
             }
         });
+        betaCheckBox.selectedProperty().addListener(__ -> betaCheckBox.setEffect(null));
         switch (Prefs.getDarkMode()) {
             case DISABLED -> darkDisabled.setSelected(true);
             case SYNC_WITH_OS -> darkSync.setSelected(true);
@@ -716,6 +717,8 @@ private void parseException(Throwable t) {
                 ipswField.setEffect(Utils.errorBorder);
             } else if (message.contains("not being signed") && !allSignedVersionsCheckBox.isSelected()) {
                 versionField.setEffect(Utils.errorBorder);
+            } else if (message.contains("without including beta versions") && betaCheckBox.isSelected()) {
+                betaCheckBox.setEffect(Utils.errorBorder);
             }
             e.showErrorAlert();
         } else {

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

@@ -296,13 +296,12 @@ private List<Utils.IOSVersion> getIOSVersions() throws TSSException {
                 return Collections.singletonList(new Utils.IOSVersion(null, null, manualIpswURL, null));
             } else if (includeBetas) {
                 var signedFirmwares = getSignedFirmwares(deviceIdentifier);
-                Stream<Utils.IOSVersion> signedBetas;
                 try {
-                    signedBetas = getSignedBetas(deviceIdentifier);
-                } catch (IOException e) {
-                    throw new TSSException("There was an error with the beta API; try without including beta versions.", false, e);
+                    Stream<Utils.IOSVersion> signedBetas = getSignedBetas(deviceIdentifier);
+                    return Stream.concat(signedFirmwares, signedBetas).toList();
+                } catch (Exception e) {
+                    throw new TSSException("There was an error retrieving beta versions; try without including beta versions.", false, e);
                 }
-                return Stream.concat(signedFirmwares, signedBetas).toList();
             } else { // all signed firmwares
                 return getSignedFirmwares(deviceIdentifier).toList();
             }

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

@@ -22,13 +22,7 @@
 import com.google.gson.JsonElement;
 import com.sun.jna.Platform;
 import javafx.scene.Node;
-import javafx.scene.control.Alert;
-import javafx.scene.control.Button;
-import javafx.scene.control.ButtonBar;
-import javafx.scene.control.ButtonType;
-import javafx.scene.control.CheckBox;
-import javafx.scene.control.TextField;
-import javafx.scene.control.TextFormatter;
+import javafx.scene.control.*;
 import javafx.scene.effect.DropShadow;
 import javafx.scene.input.Clipboard;
 import javafx.scene.input.ClipboardContent;
@@ -51,6 +45,7 @@
 import java.nio.file.StandardCopyOption;
 import java.nio.file.StandardOpenOption;
 import java.util.List;
+import java.util.NoSuchElementException;
 import java.util.Objects;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -269,6 +264,16 @@ static ButtonType showUnreportableError(String msg, ButtonType... buttons) {
         return alert.getResult();
     }
 
+    static ButtonType showUnreportableError(String msg, String toShow, ButtonType... buttons) {
+        Alert alert = new Alert(Alert.AlertType.ERROR, msg, buttons);
+        resizeAlertButtons(alert);
+        var text = new TextArea(toShow);
+        text.setEditable(false);
+        alert.getDialogPane().setExpandableContent(text);
+        alert.showAndWait();
+        return alert.getResult();
+    }
+
     static void showInfoAlert(String msg, ButtonType... buttons) {
         Alert alert = new Alert(Alert.AlertType.INFORMATION, msg, buttons);
         alert.showAndWait();
@@ -374,10 +379,16 @@ static Stream<IOSVersion> getBetaList(String deviceIdentifier) throws IOExceptio
 
     static Stream<IOSVersion> getBetaHubList(String deviceIdentifier, boolean betas) throws IOException {
         String url = "https://www.betahub.cn/api/apple/firmwares/" + deviceIdentifier + "?type=" + (betas ? 2 : 1);
-        JsonArray firmwares = Network.makeJsonRequest(url).getAsJsonObject().getAsJsonArray("firmwares");
-        return StreamSupport.stream(firmwares.spliterator(), false)
-                .map(JsonElement::getAsJsonObject)
-                .map(o -> new IOSVersion(o.get("version").getAsString(), o.get("build_id").getAsString(), o.get("url").getAsString(), o.get("signing").getAsInt() == 1));
+
+        JsonElement response = Network.makeJsonRequest(url);
+        try {
+            var firmwares = response.getAsJsonObject().getAsJsonArray("firmwares");
+            return StreamSupport.stream(firmwares.spliterator(), false)
+                    .map(JsonElement::getAsJsonObject)
+                    .map(o -> new IOSVersion(o.get("version").getAsString(), o.get("build_id").getAsString(), o.get("url").getAsString(), o.get("signing").getAsInt() == 1));
+        } catch (NullPointerException e) {
+            throw new NoSuchElementException("Unable to extract iOS Versions from JSON:\n" + response, e);
+        }
     }
 
     private static Stream<IOSVersion> createVersionStream(JsonArray array) {