Actually fix the "dyld: Library not loaded" error, add donation link, update about menu

Author: airsquared

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

@@ -851,10 +851,11 @@ public void aboutMenuHandler() {
         ButtonType githubRepo = new ButtonType("Github Repo");
         ButtonType viewLicense = new ButtonType("View License");
         ButtonType librariesUsed = new ButtonType("Libraries Used");
-        Alert alert = new Alert(Alert.AlertType.INFORMATION, "About text here", librariesUsed, viewLicense, githubRepo, ButtonType.OK);
+        ButtonType donate = new ButtonType("Donate!");
+        Alert alert = new Alert(Alert.AlertType.INFORMATION, "About text here", librariesUsed, viewLicense, donate, githubRepo, ButtonType.OK);
         alert.setTitle("About");
         alert.setHeaderText("blobsaver " + Main.appVersion);
-        alert.setContentText("blobsaver Copyright (c) 2018  airsquared\n" +
+        alert.setContentText("blobsaver Copyright (c) 2018  airsquared\n\n" +
                 "This program is licensed under GNU GPL v3.0-only");
         resizeAlertButtons(alert);
         alert.showAndWait();
@@ -914,6 +915,9 @@ public void aboutMenuHandler() {
                     e.printStackTrace();
                 }
                 break;
+            case "Donate!":
+                donate();
+                break;
         }
     }
 
@@ -977,6 +981,7 @@ private void useMacOSMenuBar() {
         MenuItem checkForValidBlobsMenuItem = new MenuItem("Check for Valid Blobs...");
         checkForValidBlobsMenuItem.setOnAction(event -> checkBlobs());
         helpMenu.getItems().set(5, checkForValidBlobsMenuItem);
+        helpMenu.getItems().add(6, new SeparatorMenuItem());
 
         macOSMenuBar.getMenus().add(helpMenu);
 
@@ -1242,11 +1247,17 @@ public void readInfo() {
         }
         // validate pairing status
         try {
-            String idevicepairResult = executeProgram(idevicepairPath, "pair");
+            String idevicepairResult = executeProgram(idevicepairPath, "pair").trim();
             log("idevicepair: " + idevicepairResult);
             //noinspection StatementWithEmptyBody
             if (idevicepairResult.contains("Paired with device")) {
                 // continue
+            } else if (idevicepairResult.contains("dyld: Library not loaded:")) {
+                deleteFolder(new File(System.getProperty("user.home", ".blobsaver_bin")));
+                newUnreportableError("This error will happen if you have used version v2.2 before. This error will automatically be fixed after restarting the application.");
+                Platform.exit();
+                System.exit(-1);
+                return;
             } else if (idevicepairResult.contains("Please accept the trust dialog")) {
                 newUnreportableError("Please accept the trust dialog on the device");
                 return;
@@ -1288,6 +1299,12 @@ public void readInfo() {
             if (ideviceinfoResult.contains("ERROR: Could not connect to lockdownd")) {
                 newReportableError("ideviceinfo:" + ideviceinfoResult, ideviceinfoResult);
                 return;
+            } else if (ideviceinfoResult.contains("dyld: Library not loaded:")) {
+                deleteFolder(new File(System.getProperty("user.home", ".blobsaver_bin")));
+                newUnreportableError("This error will happen if you have used version v2.2 before. This error will automatically be fixed after restarting the application.");
+                Platform.exit();
+                System.exit(-1);
+                return;
             } else if (ideviceinfoResult.contains("No device found")) {
                 newUnreportableError("No device found, is it plugged in?");
                 return;
@@ -1314,6 +1331,12 @@ public void readInfo() {
             if (ideviceinfoResult.contains("ERROR: Could not connect to lockdownd")) {
                 newReportableError("ideviceinfo:" + ideviceinfoResult, ideviceinfoResult);
                 return;
+            } else if (ideviceinfoResult.contains("dyld: Library not loaded:")) {
+                deleteFolder(new File(System.getProperty("user.home", ".blobsaver_bin")));
+                newUnreportableError("This error will happen if you have used version v2.2 before. This error will automatically be fixed after restarting the application.");
+                Platform.exit();
+                System.exit(-1);
+                return;
             } else if (ideviceinfoResult.contains("No device found")) {
                 newUnreportableError("No device found, is it plugged in?");
                 return;
@@ -1347,6 +1370,12 @@ public void readInfo() {
                 if (ideviceinfoResult.contains("ERROR: Could not connect to lockdownd")) {
                     newReportableError("ideviceinfo:" + ideviceinfoResult, ideviceinfoResult);
                     return;
+                } else if (ideviceinfoResult.contains("dyld: Library not loaded:")) {
+                    deleteFolder(new File(System.getProperty("user.home", ".blobsaver_bin")));
+                    newUnreportableError("This error will happen if you have used version v2.2 before. This error will automatically be fixed after restarting the application.");
+                    Platform.exit();
+                    System.exit(-1);
+                    return;
                 } else if (ideviceinfoResult.contains("No device found")) {
                     newUnreportableError("No device found, is it plugged in?");
                     return;
@@ -1381,6 +1410,14 @@ private String executeProgram(String... command) throws IOException {
         }
     }
 
+    public void donate() {
+        try {
+            Desktop.getDesktop().browse(new URI("https://www.paypal.me/airsqrd"));
+        } catch (IOException | URISyntaxException e) {
+            e.printStackTrace();
+        }
+    }
+
     private void log(String msg) {
         System.out.println(msg);
     }

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

@@ -50,6 +50,9 @@
                 <MenuItem mnemonicParsing="false" onAction="#newGithubIssue"
                           text="Send Feedback(Github Issue)"/>
                 <MenuItem mnemonicParsing="false" onAction="#sendRedditPM" text="Send Feedback(Reddit PM)"/>
+                <SeparatorMenuItem mnemonicParsing="false"/>
+                <MenuItem mnemonicParsing="false" onAction="#donate" text="Donate!"/>
+                <SeparatorMenuItem mnemonicParsing="false"/>
                 <MenuItem mnemonicParsing="false" onAction="#aboutMenuHandler" text="About"/>
             </Menu>
         </MenuBar>