Fix manually specifying identifier (#137, #145)

Author: airsquared

.idea/misc.xml

@@ -215,7 +215,7 @@ private static void saveBackgroundBlobs(int preset) {
                 if (!"none".equals(boardConfig) && !"".equals(boardConfig)) { // needs board config
                     Collections.addAll(args, "--boardconfig", boardConfig);
                 }
-                if (!"".equals(apnonce)) {
+                if (!Shared.isEmptyOrNull(apnonce)) {
                     Collections.addAll(args, "--apnonce", apnonce);
                 }
                 tsscheckerLog = executeProgram(args.toArray(new String[0]));

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

@@ -87,7 +87,7 @@ public class Controller {
 
     static void afterStageShowing() {
         for (int i = 0; i < 10; i++) { // sets the names for the presets
-            if (!"".equals(appPrefs.get("Name Preset" + i, ""))) {
+            if (!Shared.isEmptyOrNull(appPrefs.get("Name Preset" + i, ""))) {
                 Button btn = (Button) primaryStage.getScene().lookup("#preset" + i);
                 btn.setText("Load " + appPrefs.get("Name Preset" + i, ""));
             }
@@ -127,12 +127,18 @@ public void initialize() {
         deviceTypeChoiceBox.setValue("iPhone");
         deviceModelChoiceBox.getSelectionModel().selectedItemProperty().addListener((x, y, newValue) -> {
             deviceModelChoiceBox.setEffect(null);
+            if (Shared.isEmptyOrNull((String) newValue)) {
+                return;
+            }
             String identifier = Devices.getDeviceModelIdentifiersMap().get(newValue.toString());
             requireBoardConfig(identifier);
             requireApnonce(identifier);
         });
         identifierField.textProperty().addListener((x, y, identifier) -> {
             identifierField.setEffect(null);
+            if (Shared.isEmptyOrNull(identifier)) {
+                return;
+            }
             requireBoardConfig(identifier);
             requireApnonce(identifier);
         });
@@ -296,7 +302,7 @@ private void loadPreset(int preset) {
             return;
         }
         ecidField.setText(prefs.get("ECID", ""));
-        if (!"".equals(prefs.get("Path", ""))) {
+        if (!Shared.isEmptyOrNull(prefs.get("Path", ""))) {
             pathField.setText(prefs.get("Path", ""));
         }
         if ("none".equals(prefs.get("Device Model", ""))) {
@@ -312,7 +318,7 @@ private void loadPreset(int preset) {
         if (!"none".equals(prefs.get("Board Config", "")) && getBoardConfig) {
             boardConfigField.setText(prefs.get("Board Config", ""));
         }
-        if (!"".equals(prefs.get("Apnonce", ""))) {
+        if (!Shared.isEmptyOrNull(prefs.get("Apnonce", ""))) {
             if (!apnonceCheckBox.isSelected()) {
                 apnonceCheckBox.fire();
             }
@@ -364,7 +370,7 @@ public void presetButtonHandler(ActionEvent evt) {
     @SuppressWarnings("Duplicates")
     private void savePreset(int preset) {
         boolean doReturn = false;
-        if (!identifierCheckBox.isSelected() && "".equals(deviceModelChoiceBox.getValue())) {
+        if (!identifierCheckBox.isSelected() && Shared.isEmptyOrNull((String) deviceModelChoiceBox.getValue())) {
             deviceModelChoiceBox.setEffect(errorBorder);
             doReturn = true;
         }
@@ -382,7 +388,7 @@ private void savePreset(int preset) {
         textInputDialog.showAndWait();
 
         String result = textInputDialog.getResult();
-        if (result != null && !"".equals(result)) {
+        if (Shared.isEmptyOrNull(result)) {
             appPrefs.put("Name Preset" + preset, textInputDialog.getResult());
             ((Button) primaryStage.getScene().lookup("#preset" + preset)).setText("Save in " + textInputDialog.getResult());
         } else {
@@ -633,7 +639,6 @@ private void useMacOSMenuBar() {
 
         // needs to be run with Platform.runLater(), otherwise the application menu doesn't show up
         Platform.runLater(() -> tk.setGlobalMenuBar(macOSMenuBar));
-        System.out.println("using macOS menu bar");
     }
 
     public void backgroundSettingsHandler() {
@@ -708,7 +713,7 @@ public void chooseTimeToRunHandler() {
         hBox.getChildren().addAll(textField, choiceBox);
         alert.getDialogPane().setContent(hBox);
         alert.showAndWait();
-        if ((alert.getResult() != null) && !ButtonType.CANCEL.equals(alert.getResult()) && !"".equals(textField.getText()) && (choiceBox.getValue() != null)) {
+        if ((alert.getResult() != null) && !ButtonType.CANCEL.equals(alert.getResult()) && !Shared.isEmptyOrNull(textField.getText()) && Shared.isEmptyOrNull(choiceBox.getValue())) {
             appPrefs.putInt("Time to run", Integer.parseInt(textField.getText()));
             appPrefs.put("Time unit for background", choiceBox.getValue());
         } else {
@@ -891,11 +896,11 @@ public void readApnonce() {
     @SuppressWarnings("Duplicates")
     public void goButtonHandler() {
         boolean doReturn = false;
-        if (!identifierCheckBox.isSelected() && (deviceTypeChoiceBox.getValue() == null || "".equals(deviceTypeChoiceBox.getValue()))) {
+        if (!identifierCheckBox.isSelected() && Shared.isEmptyOrNull((String) deviceTypeChoiceBox.getValue())) {
             deviceTypeChoiceBox.setEffect(errorBorder);
             doReturn = true;
         }
-        if (!identifierCheckBox.isSelected() && ("".equals(deviceModelChoiceBox.getValue()))) {
+        if (!identifierCheckBox.isSelected() && Shared.isEmptyOrNull((String) deviceModelChoiceBox.getValue())) {
             deviceModelChoiceBox.setEffect(errorBorder);
             doReturn = true;
         }
@@ -910,7 +915,7 @@ public void goButtonHandler() {
         if (doReturn) return;
 
         String deviceModel = (String) deviceModelChoiceBox.getValue();
-        if ("".equals(deviceModel)) {
+        if (Shared.isEmptyOrNull(deviceModel)) {
             String identifierText = identifierField.getText();
             try {
                 if (identifierText.startsWith("iPad") || identifierText.startsWith("iPod") || identifierText.startsWith("iPhone") || identifierText.startsWith("AppleTV")) {
@@ -952,7 +957,7 @@ private static boolean isTextFieldInvalid(CheckBox checkBox, TextField textField
     }
 
     private static boolean isTextFieldInvalid(boolean isTextFieldRequired, TextField textField) {
-        if (isTextFieldRequired && (textField.getText() == null || "".equals(textField.getText()))) {
+        if (isTextFieldRequired && Shared.isEmptyOrNull(textField.getText())) {
             textField.setEffect(errorBorder);
             return true;
         }

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

@@ -320,6 +320,10 @@ static String exceptionToString(Throwable t) {
         return writer.toString();
     }
 
+    static boolean isEmptyOrNull(String s) {
+        return s == null || s.isEmpty();
+    }
+
     // temporary until ProGuard is implemented
     static boolean containsIgnoreCase(final CharSequence str, final CharSequence searchStr) {
         if (str == null || searchStr == null) {