Minor code cleanup

Author: airsquared

.gitignore

@@ -89,6 +89,7 @@ Carthage/Build
 # Gradle
 .idea/**/gradle.xml
 .idea/**/libraries
+.idea/**/jarRepositories.xml
 
 # CMake
 cmake-build-debug/

.idea/compiler.xml

@@ -148,13 +148,9 @@ static void startBackground(boolean runOnlyOnce) {
                 case "Hours":
                     timeUnit = TimeUnit.HOURS;
                     break;
-                case "Days":
-                    timeUnit = TimeUnit.DAYS;
-                    break;
                 case "Weeks":
-                    timeUnit = TimeUnit.DAYS;
-                    timeAmount = timeAmount * 7;
-                    break;
+                    timeAmount *= 7;
+                case "Days":
                 default:
                     timeUnit = TimeUnit.DAYS;
                     break;

.idea/misc.xml

@@ -56,7 +56,7 @@ public class Controller {
 
     @FXML private MenuBar menuBar;
 
-    @FXML private ChoiceBox deviceTypeChoiceBox, deviceModelChoiceBox;
+    @FXML private ChoiceBox<String> deviceTypeChoiceBox, deviceModelChoiceBox;
 
     @FXML TextField ecidField, boardConfigField, apnonceField, versionField, identifierField,
             pathField, ipswField, buildIDField;
@@ -80,8 +80,8 @@ public class Controller {
     private boolean editingPresets = false;
     private boolean choosingRunInBackground = false;
 
-    static DropShadow errorBorder = new DropShadow(9.5, 0f, 0f, Color.RED);
-    private static DropShadow borderGlow = new DropShadow(9.5, 0f, 0f, Color.DARKCYAN);
+    static final DropShadow errorBorder = new DropShadow(9.5, 0f, 0f, Color.RED);
+    static final DropShadow borderGlow = new DropShadow(9.5, 0f, 0f, Color.DARKCYAN);
 
     static Controller INSTANCE;
 
@@ -95,14 +95,13 @@ static void afterStageShowing() {
         checkForUpdates(false);
     }
 
-    @SuppressWarnings("unchecked")
     @FXML
     public void initialize() {
         INSTANCE = this;
 
         deviceTypeChoiceBox.getSelectionModel().selectedItemProperty().addListener((x, y, newValue) -> {
             deviceTypeChoiceBox.setEffect(null);
-            switch ((String) (newValue == null ? "" : newValue)) {
+            switch (newValue == null ? "" : newValue) {
                 case "iPhone":
                     deviceModelChoiceBox.setItems(Devices.getiPhones());
                     versionLabel.setText("iOS Version");
@@ -127,10 +126,10 @@ public void initialize() {
         deviceTypeChoiceBox.setValue("iPhone");
         deviceModelChoiceBox.getSelectionModel().selectedItemProperty().addListener((x, y, newValue) -> {
             deviceModelChoiceBox.setEffect(null);
-            if (Shared.isEmptyOrNull((String) newValue)) {
+            if (Shared.isEmptyOrNull(newValue)) {
                 return;
             }
-            String identifier = Devices.getDeviceModelIdentifiersMap().get(newValue.toString());
+            String identifier = Devices.getDeviceModelIdentifiersMap().get(newValue);
             requireBoardConfig(identifier);
             requireApnonce(identifier);
         });
@@ -236,7 +235,6 @@ public void versionCheckBoxHandler() {
         }
     }
 
-    @SuppressWarnings("unchecked")
     public void identifierCheckBoxHandler() {
         if (identifierCheckBox.isSelected()) {
             identifierField.setDisable(false);
@@ -295,7 +293,6 @@ public void filePickerHandler() {
         }
     }
 
-    @SuppressWarnings("unchecked")
     private void loadPreset(int preset) {
         Preferences prefs = Preferences.userRoot().node("airsquared/blobsaver/preset" + preset);
         if (!prefs.getBoolean("Exists", false)) {
@@ -370,7 +367,7 @@ public void presetButtonHandler(ActionEvent evt) {
     @SuppressWarnings("Duplicates")
     private void savePreset(int preset) {
         boolean doReturn = false;
-        if (!identifierCheckBox.isSelected() && Shared.isEmptyOrNull((String) deviceModelChoiceBox.getValue())) {
+        if (!identifierCheckBox.isSelected() && Shared.isEmptyOrNull(deviceModelChoiceBox.getValue())) {
             deviceModelChoiceBox.setEffect(errorBorder);
             doReturn = true;
         }
@@ -404,8 +401,8 @@ private void savePreset(int preset) {
             presetPrefs.put("Device Model", "none");
             presetPrefs.put("Device Identifier", identifierField.getText());
         } else {
-            presetPrefs.put("Device Type", (String) deviceTypeChoiceBox.getValue());
-            presetPrefs.put("Device Model", (String) deviceModelChoiceBox.getValue());
+            presetPrefs.put("Device Type", deviceTypeChoiceBox.getValue());
+            presetPrefs.put("Device Model", deviceModelChoiceBox.getValue());
         }
         if (getBoardConfig) {
             presetPrefs.put("Board Config", boardConfigField.getText());
@@ -796,7 +793,6 @@ public void showWiki() {
         openURL("https://github.com/airsquared/blobsaver/wiki");
     }
 
-    @SuppressWarnings("unchecked")
     public void readInfo() {
         if (!PlatformUtil.isMac() && !PlatformUtil.isWindows()) {
             Alert alert = new Alert(Alert.AlertType.CONFIRMATION);
@@ -895,11 +891,11 @@ public void readApnonce() {
     @SuppressWarnings("Duplicates")
     public void goButtonHandler() {
         boolean doReturn = false;
-        if (!identifierCheckBox.isSelected() && Shared.isEmptyOrNull((String) deviceTypeChoiceBox.getValue())) {
+        if (!identifierCheckBox.isSelected() && Shared.isEmptyOrNull(deviceTypeChoiceBox.getValue())) {
             deviceTypeChoiceBox.setEffect(errorBorder);
             doReturn = true;
         }
-        if (!identifierCheckBox.isSelected() && Shared.isEmptyOrNull((String) deviceModelChoiceBox.getValue())) {
+        if (!identifierCheckBox.isSelected() && Shared.isEmptyOrNull(deviceModelChoiceBox.getValue())) {
             deviceModelChoiceBox.setEffect(errorBorder);
             doReturn = true;
         }
@@ -913,7 +909,7 @@ public void goButtonHandler() {
         doReturn = doReturn || isTextFieldInvalid(betaCheckBox, ipswField);
         if (doReturn) return;
 
-        String deviceModel = (String) deviceModelChoiceBox.getValue();
+        String deviceModel = deviceModelChoiceBox.getValue();
         if (Shared.isEmptyOrNull(deviceModel)) {
             String identifierText = identifierField.getText();
             try {

.idea/modules/blobsaver.main.iml

@@ -180,17 +180,10 @@ public static class Libirecovery {
         @SuppressWarnings({"unused", "SpellCheckingInspection"})
         @Structure.FieldOrder({"cpid", "cprv", "cpfm", "scep", "bdid", "ecid", "ibfl", "srnm", "imei", "srtg", "serial_string", "ap_nonce", "ap_nonce_size", "sep_nonce", "sep_nonce_size"})
         public static class irecv_device_info extends Structure {
-            public int cpid;
-            public int cprv;
-            public int cpfm;
-            public int scep;
-            public int bdid;
+            public int cpid, cprv, cpfm, scep, bdid;
             public long ecid;
             public int ibfl;
-            public String srnm;
-            public String imei;
-            public String srtg;
-            public String serial_string;
+            public String srnm, imei, srtg, serial_string;
             public Pointer ap_nonce;
             public int ap_nonce_size;
             public Pointer sep_nonce;

.idea/modules/blobsaver.test.iml

@@ -41,6 +41,7 @@
  * TODO: fix this class to separate GUI logic
  */
 class TSSChecker {
+
     static void run(String device) {
         Controller.INSTANCE.showRunningAlert();
         new Thread(() -> runImpl(device)).start();
@@ -228,7 +229,7 @@ && containsIgnoreCase(tsscheckerLog, "checking tss status failed")) {
                 alert.showAndWait();
                 reportError(alert, tsscheckerLog);
             } else if (containsIgnoreCase(tsscheckerLog, "can't save shsh at")) {
-                newUnreportableError("\'" + savePath + "\' 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.");
+                newUnreportableError("'" + savePath + "' 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.");
                 controller.pathField.setEffect(errorBorder);
             } else if (containsIgnoreCase(tsscheckerLog, "IS NOT being signed")) {
                 newUnreportableError("iOS/tvOS " + version + " is not being signed for device " + device);