Minor message updates

Author: airsquared

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

@@ -509,7 +509,12 @@ public void readInfo() {
             e.showErrorAlert();
         } catch (Throwable e) {
             e.printStackTrace();
-            Utils.showReportableError("Error: unable to register native methods", Utils.exceptionToString(e));
+            if (e instanceof Error && Platform.isLinux()) {
+                Utils.showUnreportableError("Unable to load native libraries. Ensure you have libimobiledevice installed and as libimobiledevice.so. If it is installed under a different name, try creating a symlink.");
+                System.exit(-1);
+            } else {
+                Utils.showReportableError("An unknown error occurred.", Utils.exceptionToString(e));
+            }
         }
     }
 
@@ -528,7 +533,7 @@ public void readApnonce() {
         alert2.setHeaderText("Reading APNonce from connected device...");
         Utils.forEachButton(alert2, button -> button.setDisable(true));
 
-        LibimobiledeviceUtil.GetApnonceTask task = LibimobiledeviceUtil.createApnonceTask(jailbroken);
+        var task = new LibimobiledeviceUtil.GetApnonceTask(jailbroken);
         task.setOnSucceeded(event -> {
             apnonceField.setText(task.getApnonceResult());
             generatorField.setText(task.getGeneratorResult());

src/main/java/airsquared/blobsaver/app/LibimobiledeviceUtil.java

@@ -62,10 +62,6 @@ public static void exitRecovery(Pointer irecvClient) throws LibimobiledeviceExce
         throwIfNeeded(Libirecovery.close(irecvClient), ErrorCodeType.irecv_error);
     }
 
-    public static GetApnonceTask createApnonceTask(boolean jailbroken) {
-        return new GetApnonceTask(jailbroken);
-    }
-
     public static final class GetApnonceTask extends Task<Void> {
         private String apnonceResult, generatorResult;
         /**
@@ -82,7 +78,7 @@ public String getGeneratorResult() {
             return generatorResult;
         }
 
-        private GetApnonceTask(boolean jailbroken) {
+        public GetApnonceTask(boolean jailbroken) {
             this.jailbroken = jailbroken;
         }
 
@@ -185,10 +181,9 @@ private static PointerByReference waitForRecovery() throws LibimobiledeviceExcep
             }
             try {
                 errorCode = Libirecovery.open(irecvClient);
-            } catch (UnsatisfiedLinkError e) {
+            } catch (Error e) {
                 if (Platform.isLinux()) {
-                    throw new LibimobiledeviceException("Error: libirecovery not found.\n\n" +
-                            "Please ensure you have libirecovery installed as libirecovery.so, and not as libirecovery-1.0.so.", null, 0, false);
+                    throw new LibimobiledeviceException("Unable to load native libraries. Ensure you have libirecovery installed and as libirecovery.so. If it is installed under a different name, try creating a symlink.", null, 0, false);
                 } else {
                     throw e;
                 }

src/main/java/airsquared/blobsaver/app/natives/NativeUtils.java

@@ -32,7 +32,6 @@
 
 final class NativeUtils {
 
-
     private static final Map<String, ?> libraryOptions = Map.of(Library.OPTION_CLASSLOADER, NativeUtils.class.getClassLoader(),
             Library.OPTION_FUNCTION_MAPPER, (FunctionMapper) (lib, method) ->
                     method.isAnnotationPresent(CFunctionName.class) ?

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

@@ -299,7 +299,7 @@
             </VBox.margin>
         </Button>
         <ToggleButton fx:id="backgroundSettingsButton" prefWidth="Infinity" maxWidth="Infinity"
-                      mnemonicParsing="false" onAction="#backgroundSettingsHandler" text="Background Settings">
+                      mnemonicParsing="false" onAction="#backgroundSettingsHandler" text="Auto-Save Settings">
             <VBox.margin>
                 <Insets bottom="10.0"/>
             </VBox.margin>