New UI for choosing presets, Bump to v1.1

Author: airsquared

README.md

@@ -3,7 +3,7 @@ A GUI for saving SHSH blobs using encounter's fork of tsschecker. Supports both
 
 If you have an antivirus, select "Always Allow" for anything related to tsschecker or Java. An antivirus may cause blobsaver to crash. If that happens please send feedback.
 
-![image](https://i.imgur.com/i74ba2a.png)
+![image](https://i.imgur.com/QzhemWh.png)
 
 ## Features
 - Store up to ten devices with presets
@@ -17,7 +17,8 @@ If you have an antivirus, select "Always Allow" for anything related to tsscheck
 Please send feedback via [Github Issue](https://github.com/airsquared/blobsaver/issues/new) or [Reddit PM](https://www.reddit.com//message/compose?to=01110101_00101111&subject=Blobsaver+Feedback) if you encounter any bugs/problems or have a feature request. 
 
 ## TODO:
-- Question mark buttons to tell you what each thing does
+- Use macOS menu bar
+- Explain how to get everything
 - Package into .app/.exe [maybe this](https://github.com/Jorl17/jar2app)
 - Automatically save blobs for all signed versions
 - Daemon to do it automatically in the background

build.gradle

@@ -3,7 +3,7 @@ plugins {
     id 'java'
 }
 
-version '1.1alpha'
+version '1.1'
 
 sourceCompatibility = 1.8
 

src/main/java/blobsaver/Controller.java

@@ -12,9 +12,9 @@
 import javafx.scene.control.*;
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;
-import javafx.scene.control.ScrollPane;
 import javafx.scene.control.TextField;
 import javafx.scene.effect.DropShadow;
+import javafx.scene.layout.VBox;
 import javafx.scene.paint.Color;
 import javafx.stage.DirectoryChooser;
 import javafx.stage.FileChooser;
@@ -56,7 +56,7 @@ public class Controller {
 
     @FXML private Label versionLabel;
 
-    @FXML private ToggleButton savePresetButton;
+    @FXML private Button savePresetButton;
     @FXML private Button preset1Button;
     @FXML private Button preset2Button;
     @FXML private Button preset3Button;
@@ -69,7 +69,7 @@ public class Controller {
     @FXML private Button preset10Button;
     private ArrayList<Button> presetButtons;
 
-    @FXML private ScrollPane scrollPane;
+    @FXML private VBox presetVBox;
 
     @FXML private Button goButton;
     @FXML private Button plistPickerButton;
@@ -237,10 +237,14 @@ public void initialize() {
         }
         pathField.setText(path);
 
-        checkForUpdates();
+        checkForUpdates(false);
     }
 
     public void checkForUpdates() {
+        checkForUpdates(true);
+    }
+
+    private void checkForUpdates(boolean forceCheck) {
         Service<Void> service = new Service<Void>() {
             @Override
             protected Task<Void> createTask() {
@@ -272,7 +276,7 @@ protected Void call() throws Exception {
                             changelog = "";
                         }
                         Preferences appPrefs = Preferences.userRoot().node("airsquared/blobsaver/prefs");
-                        if (!newVersion.equals(Main.appVersion) && !appPrefs.get("Ignore Version", "").equals(newVersion)) {
+                        if (!newVersion.equals(Main.appVersion) && (forceCheck || !appPrefs.get("Ignore Version", "").equals(newVersion))) {
                             final CountDownLatch latch = new CountDownLatch(1);
                             final String finalNewVersion = newVersion;
                             final String finalChangelog = changelog;
@@ -392,6 +396,7 @@ private void run(String device) {
         }
 
         File locationToSaveBlobs = new File(pathField.getText());
+        //noinspection ResultOfMethodCallIgnored
         locationToSaveBlobs.mkdirs();
         ArrayList<String> args;
         args = new ArrayList<>(Arrays.asList(file.getPath(), "-d", device, "-s", "-e", ecidField.getText(), "--save-path", pathField.getText()));
@@ -425,6 +430,7 @@ private void run(String device) {
             e.printStackTrace();
         }
         String tsscheckerLog;
+        //noinspection ConstantConditions
         try (BufferedReader reader = new BufferedReader(new InputStreamReader(proc.getInputStream()))) {
             StringBuilder logBuilder = new StringBuilder();
             String line;
@@ -462,7 +468,7 @@ private void run(String device) {
                 && tsscheckerLog.contains("[Error] [TSSR] faild to build tssrequest")
                 && tsscheckerLog.contains("Error] [TSSC] checking tss status failed!")) {
             Alert alert = new Alert(Alert.AlertType.ERROR,
-                    "Saving blobs failed. Check the board configuration.\n\nIf this doesn't work, please create a new issue on Github or PM me on Reddit. The log has been copied to your clipboard.",
+                    "Saving blobs failed. Check the board configuration or try again later.\n\nIf this doesn't work, please create a new issue on Github or PM me on Reddit. The log has been copied to your clipboard.",
                     githubIssue, redditPM, ButtonType.OK);
             alert.showAndWait();
             reportError(alert, tsscheckerLog);
@@ -491,7 +497,6 @@ private void run(String device) {
             newReportableError("The tsschecker process was interrupted.", e.toString());
         }
 
-
         if (!file.delete()) {
             newUnreportableError("\"There was an error deleting the temporary file.\"");
         }
@@ -682,9 +687,16 @@ private void savePreset(int preset) {
         textInputDialog.setHeaderText("Name Preset");
         textInputDialog.setContentText("Please enter a name for the preset:");
         textInputDialog.showAndWait();
-        if (!textInputDialog.getResult().equals("") || !(textInputDialog.getResult() == null)) {
-            Preferences appPrefs = Preferences.userRoot().node("airsquared/blobsaver/prefs");
-            appPrefs.put("Name Preset" + preset, textInputDialog.getResult());
+        if (textInputDialog.getResult() != null) {
+            if (!textInputDialog.getResult().equals("")) {
+                Preferences appPrefs = Preferences.userRoot().node("airsquared/blobsaver/prefs");
+                appPrefs.put("Name Preset" + preset, textInputDialog.getResult());
+                ((Button) Main.primaryStage.getScene().lookup("#preset" + preset)).setText("Save in " + textInputDialog.getResult());
+            } else {
+                return;
+            }
+        } else {
+            return;
         }
 
         Preferences presetPrefs = Preferences.userRoot().node("airsquared/blobsaver/preset" + preset);
@@ -709,18 +721,25 @@ private void savePreset(int preset) {
     public void savePresetHandler() {
         editingPresets = !editingPresets;
         if (editingPresets) {
-            goButton.setVisible(false);
-            goButton.setManaged(false);
             savePresetButton.setText("Cancel");
-            scrollPane.setMaxWidth(410.0);
-            scrollPane.setPrefWidth(410.0);
+            int depth = 20;
+            DropShadow borderGlow = new DropShadow();
+            borderGlow.setOffsetY(0f);
+            borderGlow.setOffsetX(0f);
+            borderGlow.setColor(Color.DARKCYAN);
+            borderGlow.setWidth(depth);
+            borderGlow.setHeight(depth);
+            presetVBox.setEffect(borderGlow);
             presetButtons.forEach((Button btn) -> btn.setText("Save in " + btn.getText().substring("Load ".length())));
+            goButton.setDefaultButton(false);
+            goButton.setDisable(true);
+            savePresetButton.setDefaultButton(true);
         } else {
+            savePresetButton.setDefaultButton(false);
+            goButton.setDefaultButton(true);
+            goButton.setDisable(false);
+            presetVBox.setEffect(null);
             savePresetButton.setText("Save");
-            scrollPane.setMaxWidth(385.0);
-            scrollPane.setPrefWidth(385.0);
-            goButton.setManaged(true);
-            goButton.setVisible(true);
             presetButtons.forEach((Button btn) -> btn.setText("Load " + btn.getText().substring("Save in ".length())));
         }
     }

src/main/java/blobsaver/Main.java

@@ -1,6 +1,5 @@
 package blobsaver;
 
-import com.sun.javafx.PlatformUtil;
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
@@ -9,7 +8,7 @@
 
 public class Main extends Application {
 
-    static final String appVersion = "v1.1alpha";
+    static final String appVersion = "v1.1";
     static Stage primaryStage;
 
     public static void main(String[] args) {
@@ -21,11 +20,7 @@ public void start(Stage primaryStage) throws Exception {
         Main.primaryStage = primaryStage;
         Parent root = FXMLLoader.load(getClass().getResource("blobsaver.fxml"));
         primaryStage.setTitle("SHSH Blob Saver " + appVersion);
-        if (PlatformUtil.isWindows()) {
-            primaryStage.setScene(new Scene(root, 520, 610));
-        } else {
-            primaryStage.setScene(new Scene(root, 500, 580));
-        }
+        primaryStage.setScene(new Scene(root, 685, 580));
         primaryStage.getScene().getStylesheets().add(getClass().getResource("app.css").toExternalForm());
         primaryStage.show();
         primaryStage.setResizable(false);