Skip to content

Commit f6d91ab

Browse files
committed
Minor improvements for beta versions
1 parent 2e890cd commit f6d91ab

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

src/main/java/blobsaver/Controller.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,8 @@ public void initialize() {
225225
boardConfigField.textProperty().addListener((observable, oldValue, newValue) -> boardConfigField.setEffect(null));
226226
apnonceField.textProperty().addListener((observable, oldValue, newValue) -> apnonceField.setEffect(null));
227227
pathField.textProperty().addListener((observable, oldValue, newValue) -> pathField.setEffect(null));
228+
buildIDField.textProperty().addListener((observable, oldValue, newValue) -> buildIDField.setEffect(null));
229+
ipswField.textProperty().addListener((observable, oldValue, newValue) -> ipswField.setEffect(null));
228230

229231
deviceTypeChoiceBox.setValue("iPhone");
230232

@@ -420,16 +422,22 @@ private void run(String device) {
420422
} else if (tsscheckerLog.contains("[Error] [Error] can't save shsh at " + pathField.getText())) {
421423
newUnreportableError("\'" + pathField.getText() + "\' is not a valid path\n\nIf this was done to test whether the preset works in the background, please cancel that preset, fix the error, and try again.");
422424
pathField.setEffect(errorBorder);
423-
} else if (tsscheckerLog.contains("iOS " + versionField.getText() + " for device " + device + " IS NOT being signed!")) {
425+
} else if (tsscheckerLog.contains("iOS " + versionField.getText() + " for device " + device + " IS NOT being signed!") || tsscheckerLog.contains("Build " + buildIDField.getText() + " for device iPhone9,2 IS NOT being signed!")) {
424426
newUnreportableError("iOS/tvOS " + versionField.getText() + " is not being signed for device " + device);
425427
versionField.setEffect(errorBorder);
428+
if (betaCheckBox.isSelected()) {
429+
buildIDField.setEffect(errorBorder);
430+
ipswField.setEffect(errorBorder);
431+
}
426432
} else if (tsscheckerLog.contains("[Error] [TSSC] failed to load manifest")) {
427433
Alert alert = new Alert(Alert.AlertType.ERROR,
428434
"Failed to load manifest.\n\n \"" + ipswField.getText() + "\" might not be a valid URL.\n\nMake sure it starts with \"http://\" or \"https://\", has \"apple\" in it, and ends with \".ipsw\"\n\nIf the URL is fine, please create a new issue on Github or PM me on Reddit. The log has been copied to your clipboard",
429435
githubIssue, redditPM, ButtonType.OK);
430436
resizeAlertButtons(alert);
431437
alert.showAndWait();
432438
reportError(alert, tsscheckerLog);
439+
} else if (tsscheckerLog.contains("[Error] [TSSC] selected device can't be used with that buildmanifest")) {
440+
newUnreportableError("Device and build manifest don't match.");
433441
} else if (tsscheckerLog.contains("[Error]")) {
434442
newReportableError("Saving blobs failed.\n\nIf this was done to test whether the preset works in the background, please cancel that preset, fix the error, and try again.", tsscheckerLog);
435443
} else {

0 commit comments

Comments
 (0)