- Fix pwndfu sub-checkboxes not becoming unchecked

- Fix stop FutureRestore cancel on the popup enabling the button to start it again - Add more checks to prevent two FutureRestore processes from running at the same time - Code cleanup - Fix GUI acting as if FutureRestore was killed when Stop button pressed, even if stop was cancelled
CoocooFroggy · Jul 29, 2021 · 6879111 · 6879111
1 parent f067d39
commit 6879111
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 14 deletions.
diff --git a/src/main/java/FRUtils.java b/src/main/java/FRUtils.java
@@ -52,7 +52,7 @@ public static boolean updateFRGUI(MainMenu mainMenuInstance) throws IOException,
         JPanel mainMenuView = mainMenuInstance.getMainMenuView();
 
         // If FutureRestore process is running, cancel early
-        if (!(FutureRestoreWorker.futureRestoreProcess == null || !FutureRestoreWorker.futureRestoreProcess.isAlive())) {
+        if (FutureRestoreWorker.futureRestoreProcess != null && FutureRestoreWorker.futureRestoreProcess.isAlive()) {
             failUpdate("Can't update when FutureRestore is running!", mainMenuInstance, false);
             return false;
         }

diff --git a/src/main/java/FutureRestoreWorker.java b/src/main/java/FutureRestoreWorker.java
@@ -117,7 +117,7 @@ static void runFutureRestore(String futureRestoreFilePath, ArrayList<String> all
                                     if (!hasRecoveryRestarted) {
                                         hasRecoveryRestarted = true;
                                         //Ensure current process is killed
-                                        if (futureRestoreProcess.isAlive())
+                                        if (FutureRestoreWorker.futureRestoreProcess != null && FutureRestoreWorker.futureRestoreProcess.isAlive())
                                             futureRestoreProcess.destroy();
                                         //Restart
                                         new Thread(() -> {

diff --git a/src/main/java/MainMenu.java b/src/main/java/MainMenu.java
@@ -198,6 +198,10 @@ public MainMenu() {
                 justBootCheckBox.setSelected(false);
                 justBootCheckBox.setEnabled(false);
                 justBootLabel.setEnabled(false);
+
+                // Since we turn off the switches for pwndfu required items, also turn them off internally
+                optionNoIbssState = false;
+                optionJustBootState = false;
             }
         };
         debugDCheckBox.addActionListener(optionsListener);
@@ -209,13 +213,22 @@ public MainMenu() {
         justBootCheckBox.addActionListener(optionsListener);
 
         startFutureRestoreButton.addActionListener(e -> {
-            //Ensure they have FutureRestore selected
+            // If FutureRestore is already running, just disable ourselves
+            if (FutureRestoreWorker.futureRestoreProcess != null && FutureRestoreWorker.futureRestoreProcess.isAlive()) {
+                SwingUtilities.invokeLater(() -> {
+                    startFutureRestoreButton.setEnabled(false);
+                    // Potentially make the button say unsafe again
+                });
+                return;
+            }
+
+            // Ensure they have FutureRestore selected
             if (futureRestoreFilePath == null) {
                 JOptionPane.showMessageDialog(mainMenuView, "Please select a FutureRestore executable.", "No FutureRestore Selected", JOptionPane.ERROR_MESSAGE);
                 return;
             }
 
-            //Ensure they actually selected a blob, IPSW, and buildmanifest if needed
+            // Ensure they actually selected a blob, IPSW, and buildmanifest if needed
             if (blobFilePath == null) {
                 JOptionPane.showMessageDialog(mainMenuView, "Select a blob file.", "Error", JOptionPane.ERROR_MESSAGE);
                 return;
@@ -393,19 +406,25 @@ public MainMenu() {
         stopFutureRestoreUnsafeButton.addActionListener(e -> {
             Process futureRestoreProcess = FutureRestoreWorker.futureRestoreProcess;
 
-            if (futureRestoreProcess != null) {
-                if (futureRestoreProcess.isAlive()) {
-                    int response = JOptionPane.showConfirmDialog(mainMenuView, "Are you sure you want to stop FutureRestore? This is considered unsafe if the device is currently restoring.", "Stop FutureRestore?", JOptionPane.YES_NO_OPTION);
-                    if (response == JOptionPane.YES_OPTION) {
-                        futureRestoreProcess.destroy();
-                        messageToLog("FutureRestore process killed.");
-                    }
+            boolean killed = false;
+            if (FutureRestoreWorker.futureRestoreProcess != null && FutureRestoreWorker.futureRestoreProcess.isAlive()) {
+                int response = JOptionPane.showConfirmDialog(mainMenuView, "Are you sure you want to stop FutureRestore? This is considered unsafe if the device is currently restoring.", "Stop FutureRestore?", JOptionPane.YES_NO_OPTION);
+                if (response == JOptionPane.YES_OPTION) {
+                    futureRestoreProcess.destroy();
+                    messageToLog("FutureRestore process killed.");
+                    killed = true;
                 }
+            } else {
+                killed = true;
             }
 
-            startFutureRestoreButton.setEnabled(true);
-            stopFutureRestoreUnsafeButton.setText("Stop FutureRestore");
-            currentTaskTextField.setText("");
+            if (killed) {
+                SwingUtilities.invokeLater(() -> {
+                    startFutureRestoreButton.setEnabled(true);
+                    stopFutureRestoreUnsafeButton.setText("Stop FutureRestore");
+                    currentTaskTextField.setText("");
+                });
+            }
         });
 
         downloadFutureRestoreButton.addActionListener(event -> {