Automatically detect whether APNonce is frozen instead of asking user to pick

Author: airsquared

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

@@ -555,21 +555,18 @@ public void readInfo() {
     }
 
     public void readApnonce() {
-        Alert alert1 = new Alert(Alert.AlertType.CONFIRMATION, "", ButtonType.CANCEL, new ButtonType("Jailbroken"), new ButtonType("Unjailbroken"));
+        Alert alert1 = new Alert(Alert.AlertType.CONFIRMATION);
         alert1.setHeaderText("Read APNonce from connected device");
         alert1.setContentText("blobsaver can read both the APNonce and generator from a connected device.\n\n" +
-                "Please connect your device and click \"Jailbroken\" if your device has a generator set or \"Unjailbroken\" if you don't. If unsure, select \"Unjailbroken\".\n\nYour device will enter recovery mode while retrieving the APNonce and will automatically reboot to normal mode when complete.");
-        boolean jailbroken;
-        if (alert1.showAndWait().isEmpty() || !alert1.getResult().getText().contains("ailbroken")) {
+                "Your device will enter recovery mode while retrieving the APNonce and will automatically reboot to normal mode when complete.");
+        if (!ButtonType.OK.equals(alert1.showAndWait().orElse(null))) {
             return;
-        } else {
-            jailbroken = alert1.getResult().getText().equals("Jailbroken");
         }
         final Alert alert2 = new Alert(Alert.AlertType.INFORMATION, "[This should not be visible]", ButtonType.FINISH);
-        alert2.setHeaderText("Reading APNonce from connected device...");
+        alert2.setHeaderText("Read APNonce from connected device");
         Utils.forEachButton(alert2, button -> button.setDisable(true));
 
-        var task = new LibimobiledeviceUtil.GetApnonceTask(jailbroken);
+        var task = new LibimobiledeviceUtil.GetApnonceTask(false);
         task.setOnSucceeded(event -> {
             apnonceField.setText(task.getApnonceResult());
             generatorField.setText(task.getGeneratorResult());

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

@@ -31,7 +31,12 @@
 import java.nio.ByteOrder;
 import java.util.Objects;
 
-import static airsquared.blobsaver.app.natives.Libimobiledevice.*;
+import static airsquared.blobsaver.app.natives.Libimobiledevice.idevice_free;
+import static airsquared.blobsaver.app.natives.Libimobiledevice.idevice_new;
+import static airsquared.blobsaver.app.natives.Libimobiledevice.lockdownd_client_free;
+import static airsquared.blobsaver.app.natives.Libimobiledevice.lockdownd_client_new_with_handshake;
+import static airsquared.blobsaver.app.natives.Libimobiledevice.lockdownd_enter_recovery;
+import static airsquared.blobsaver.app.natives.Libimobiledevice.lockdownd_get_value;
 
 
 public class LibimobiledeviceUtil {
@@ -65,11 +70,12 @@ public static void exitRecovery(Pointer irecvClient) throws LibimobiledeviceExce
 
     public static final class GetApnonceTask extends Task<Void> {
         private String apnonceResult, generatorResult;
+        private boolean tryAgain;
         /**
          * If the device is jailbroken or has a generator set, no need to try to read the apnonce in normal mode.
          * If device doesn't have generator set, need to read the apnonce in normal mode to freeze it.
          */
-        private final boolean jailbroken;
+        private final boolean forceNewApnonce;
 
         public String getApnonceResult() {
             return apnonceResult;
@@ -79,13 +85,13 @@ public String getGeneratorResult() {
             return generatorResult;
         }
 
-        public GetApnonceTask(boolean jailbroken) {
-            this.jailbroken = jailbroken;
+        public GetApnonceTask(boolean forceNewApnonce) {
+            this.forceNewApnonce = forceNewApnonce;
         }
 
         @Override
         protected Void call() throws LibimobiledeviceException {
-            if (!jailbroken) {
+            if (forceNewApnonce || tryAgain) {
                 updateMessage("Reading APNonce in normal mode...");
                 System.out.println("Read in normal mode: " + LibimobiledeviceUtil.getApNonceNormalMode());
             }
@@ -104,8 +110,13 @@ protected Void call() throws LibimobiledeviceException {
 
             if (apnonceResult.equals(getApnonce(irecvClient.getValue()))) {
                 Utils.runSafe(() -> updateMessage("Successfully got APNonce, exiting recovery mode..."));
+                tryAgain = false;
+            } else if (tryAgain) { // already tried again
+                Utils.runSafe(() -> updateMessage("Warning: Got APNonce, but APNonce is not frozen. This could mean the generator wasn't set correctly.\n\nExiting recovery mode..."));
+                tryAgain = false;
             } else {
-                Utils.runSafe(() -> updateMessage("Warning: Got APNonce, but two successive reads didn't match. This could mean the generator wasn't set correctly.\n\nExiting recovery mode..."));
+                Utils.runSafe(() -> updateMessage("APNonce is not frozen, trying again.\n\nExiting recovery mode..."));
+                tryAgain = true;
             }
 
             LibimobiledeviceUtil.exitRecovery(irecvClient.getValue());
@@ -153,9 +164,14 @@ protected Void call() throws LibimobiledeviceException {
 
             generatorResult = getGenerator();
 
+            if (tryAgain) {
+                call();
+                return null;
+            }
+
             updateMessage("Success");
 
-            Analytics.readAPNonce(jailbroken);
+            Analytics.readAPNonce(!forceNewApnonce && !tryAgain);
             return null;
         }