Add "Exit Recovery Mode" menu item

Author: airsquared

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

@@ -624,13 +624,9 @@ private void useMacOSMenuBar() {
 
         Menu helpMenu = menuBar.getMenus().get(1);
 
-        helpMenu.getItems().add(1, new SeparatorMenuItem());
-        helpMenu.getItems().add(4, new SeparatorMenuItem());
-
         MenuItem checkForValidBlobsMenuItem = new MenuItem("Check for Valid Blobs...");
         checkForValidBlobsMenuItem.setOnAction(event -> checkBlobs());
-        helpMenu.getItems().set(5, checkForValidBlobsMenuItem);
-        helpMenu.getItems().add(6, new SeparatorMenuItem());
+        helpMenu.getItems().add(0, checkForValidBlobsMenuItem);
 
         macOSMenuBar.getMenus().add(helpMenu);
 
@@ -886,6 +882,16 @@ public void readApnonce() {
         }).start();
     }
 
+    public void exitRecoveryHandler() {
+        PointerByReference irecvClient = new PointerByReference();
+        int errorCode = Libimobiledevice.Libirecovery.irecv_open_with_ecid(irecvClient, 0);
+        if (errorCode != 0) {
+            newReportableError("irecovery error: code=" + errorCode + "\n\nUnable to find a device, try using another tool to exit recovery mode.");
+            return;
+        }
+        Libimobiledevice.exitRecovery(irecvClient.getValue(), true);
+    }
+
     public void donate() { openURL("https://www.paypal.me/airsqrd"); }
 
     @SuppressWarnings("Duplicates")

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

@@ -253,7 +253,7 @@ public static void throwIfNeeded(int errorCode, boolean showAlert, ErrorCodeType
             }
         } else if (errorType.equals(ErrorCodeType.irecv_error_t)) {
             exceptionMessage = "irecovery error: code=" + errorCode;
-            alertMessage = exceptionMessage;
+            alertMessage = exceptionMessage + "\n\nIf your device is still in recovery mode, use the \"Exit Recovery Mode\" option from the help menu.";
             reportableError = true;
         }
         if (showAlert) {

src/main/resources/com/airsquared/blobsaver/blobsaver.fxml

@@ -34,6 +34,8 @@
                 <MenuItem mnemonicParsing="false" onAction="#resetAppHandler" text="Uninstall..."/>
             </Menu>
             <Menu mnemonicParsing="false" text="Help">
+                <MenuItem mnemonicParsing="false" onAction="#exitRecoveryHandler" text="Exit Recovery Mode..."/>
+                <SeparatorMenuItem mnemonicParsing="false"/>
                 <MenuItem mnemonicParsing="false" onAction="#showWiki" text="blobsaver Help/Wiki"/>
                 <MenuItem mnemonicParsing="false" onAction="#newGithubIssue" text="Send Feedback (Github Issue)"/>
                 <MenuItem mnemonicParsing="false" onAction="#sendRedditPM" text="Send Feedback (Reddit PM)"/>