Read the generator for both unjailbroken and jailbroken devices

Author: airsquared

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

@@ -42,7 +42,6 @@
 
 import java.io.File;
 import java.util.Locale;
-import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 
 @SuppressWarnings({"TextBlockMigration"})
@@ -514,21 +513,21 @@ public void readInfo() {
     }
 
     public void readApnonce() {
-        Alert alert1 = new Alert(Alert.AlertType.CONFIRMATION);
+        Alert alert1 = new Alert(Alert.AlertType.CONFIRMATION, "", ButtonType.CANCEL, new ButtonType("Jailbroken"), new ButtonType("Unjailbroken"));
         alert1.setHeaderText("Read apnonce from connected device");
-        alert1.setContentText("blobsaver can read the apnonce from a connected device.\n\n" +
-                "It is recommended, but not required to set a generator on your device prior to reading the apnonce. " +
-                "blobsaver can read the generator from your device to confirm whether the generator was set properly (currently jailbroken devices only, it will return a random value on unjailbroken devices).\n\n" +
-                "Please connect your device and hit \"OK\" to begin. Your device will enter recovery mode while retrieving the apnonce and will automatically reboot to normal mode when complete.\n\n" +
-                "NOTE: an apnonce is only required for devices with an A12 processor or newer.");
-        Optional<ButtonType> result = alert1.showAndWait();
-        if (result.isEmpty() || !result.get().equals(ButtonType.OK)) return;
-        final Alert alert2 = new Alert(Alert.AlertType.INFORMATION, "Entering recovery mode...\n\n" +
-                "This can take up to 60 seconds", ButtonType.FINISH);
+        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. Your device will enter recovery mode while retrieving the apnonce and will automatically reboot to normal mode when complete.\n\n");
+        boolean jailbroken;
+        if (alert1.showAndWait().isEmpty() || !alert1.getResult().getText().contains("ailbroken")) {
+            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...");
         Utils.forEachButton(alert2, button -> button.setDisable(true));
 
-        LibimobiledeviceUtil.GetApnonceTask task = LibimobiledeviceUtil.createGetApnonceTask();
+        LibimobiledeviceUtil.GetApnonceTask task = LibimobiledeviceUtil.createApnonceTask(jailbroken);
         task.setOnSucceeded(event -> {
             apnonceField.setText(task.getApnonceResult());
             generatorField.setText(task.getGeneratorResult());

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

@@ -62,12 +62,17 @@ public static void exitRecovery(Pointer irecvClient) throws LibimobiledeviceExce
         throwIfNeeded(Libirecovery.close(irecvClient), ErrorCodeType.irecv_error);
     }
 
-    public static GetApnonceTask createGetApnonceTask() {
-        return new GetApnonceTask();
+    public static GetApnonceTask createApnonceTask(boolean jailbroken) {
+        return new GetApnonceTask(jailbroken);
     }
 
     public static final class GetApnonceTask extends Task<Void> {
         private String apnonceResult, generatorResult;
+        /**
+         * 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;
 
         public String getApnonceResult() {
             return apnonceResult;
@@ -77,24 +82,29 @@ public String getGeneratorResult() {
             return generatorResult;
         }
 
+        private GetApnonceTask(boolean jailbroken) {
+            this.jailbroken = jailbroken;
+        }
+
         @Override
         protected Void call() throws LibimobiledeviceException {
+            if (!jailbroken) {
+                updateMessage("Reading ApNonce in normal mode...");
+                System.out.println("Read in normal mode: " + LibimobiledeviceUtil.getApNonceNormalMode());
+            }
             updateMessage("Entering recovery mode...\n\nThis can take up to 60 seconds");
             LibimobiledeviceUtil.enterRecovery();
-            PointerByReference irecvClient = new PointerByReference();
-            long endTime = System.currentTimeMillis() + 60_000; // timeout is 60 seconds
-            int errorCode = -3;
-            while (errorCode == -3 && System.currentTimeMillis() < endTime) {
-                if (!sleep(1000)) {
-                    return null;
-                }
-                errorCode = Libirecovery.open(irecvClient);
-            }
-            throwIfNeeded(errorCode, ErrorCodeType.irecv_error);
+            PointerByReference irecvClient = waitForRecovery();
+            if (irecvClient == null) return null;
 
+            updateMessage("Reading ApNonce...");
             apnonceResult = getApnonce(irecvClient.getValue());
             Libirecovery.sendCommand(irecvClient.getValue(), "reset");
 
+            throwIfNeeded(Libirecovery.close(irecvClient.getValue()), ErrorCodeType.irecv_error);
+            irecvClient = waitForRecovery();
+            if (irecvClient == null) return null;
+
             if (apnonceResult.equals(getApnonce(irecvClient.getValue()))) {
                 Utils.runSafe(() -> updateMessage("Successfully got ApNonce, exiting recovery mode..."));
             } else {
@@ -106,8 +116,8 @@ protected Void call() throws LibimobiledeviceException {
             sleep(3000);
 
             PointerByReference device = new PointerByReference();
-            endTime = System.currentTimeMillis() + 80_000; // timeout is 80 seconds
-            errorCode = -3;
+            long endTime = System.currentTimeMillis() + 80_000; // timeout is 80 seconds
+            int errorCode = -3;
             while (errorCode == -3 && System.currentTimeMillis() < endTime) {
                 if (!sleep(1000)) {
                     return null;
@@ -116,7 +126,7 @@ protected Void call() throws LibimobiledeviceException {
             }
             throwIfNeeded(errorCode, ErrorCodeType.idevice_error);
 
-            Utils.runSafe(() -> updateMessage("Please unlock your device"));
+            updateMessage("Please unlock your device");
 
             PointerByReference lockdown = new PointerByReference();
             endTime = System.currentTimeMillis() + 120_000; // timeout is 120 seconds
@@ -151,17 +161,32 @@ protected Void call() throws LibimobiledeviceException {
             return null;
         }
 
-        /**
-         * @return false if task was cancelled during the Thread.sleep
-         */
-        private boolean sleep(long millis) {
-            try {
-                Thread.sleep(millis);
-            } catch (InterruptedException e) {
-                return false;
+    }
+
+    /**
+     * @return false if task was cancelled during the Thread.sleep
+     */
+    private static boolean sleep(long millis) {
+        try {
+            Thread.sleep(millis);
+        } catch (InterruptedException e) {
+            return false;
+        }
+        return true;
+    }
+
+    private static PointerByReference waitForRecovery() throws LibimobiledeviceException {
+        PointerByReference irecvClient = new PointerByReference();
+        long endTime = System.currentTimeMillis() + 60_000; // timeout is 60 seconds
+        int errorCode = -3;
+        while (errorCode == -3 && System.currentTimeMillis() < endTime) {
+            if (!sleep(1000)) {
+                return null;
             }
-            return true;
+            errorCode = Libirecovery.open(irecvClient);
         }
+        throwIfNeeded(errorCode, ErrorCodeType.irecv_error);
+        return irecvClient;
     }
 
     private static String getApnonce(Pointer irecv_client) {