Don't use a generator when user has supplied apnonce (fixes #100)

Author: airsquared

blobsaver.iss

@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "blobsaver"
-#define MyAppVersion "2.5.0-beta4"
+#define MyAppVersion "2.5.0-beta6"
 #define MyAppPublisher "airsquared"
 #define MyAppURL "https://www.github.com/airsquared/blobsaver"
 #define MyAppExeName "blobsaver.exe"

build.gradle

@@ -32,7 +32,7 @@ sourceCompatibility = 1.8
  *  - Main.java
  *  - blobsaver.iss
  */
-String appVersion = "v2.5.0-beta4";
+String appVersion = "v2.5.0-beta6";
 
 repositories {
     mavenCentral()

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

@@ -857,7 +857,7 @@ public void readApnonce() {
                 System.out.println("Entering recovery mode");
                 Libimobiledevice.enterRecovery(true);
                 PointerByReference irecvClient = new PointerByReference();
-                long endTime = System.currentTimeMillis() + 60_000; // timeout is 20 seconds
+                long endTime = System.currentTimeMillis() + 60_000; // timeout is 60 seconds
                 int errorCode = -3;
                 while (errorCode == -3 && System.currentTimeMillis() < endTime) {
                     Thread.sleep(1000);

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

@@ -38,7 +38,7 @@
 
 public class Main {
 
-    static final String appVersion = "v2.5.0-beta4";
+    static final String appVersion = "v2.5.0-beta6";
     static final Preferences appPrefs = Preferences.userRoot().node("airsquared/blobsaver/prefs");
     static Stage primaryStage;
     static final File jarDirectory;

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

@@ -141,12 +141,14 @@ private static void run(URL ipswURL, String device, String version) throws TSSCh
         File locationToSaveBlobs = new File(controller.pathField.getText());
         //noinspection ResultOfMethodCallIgnored
         locationToSaveBlobs.mkdirs();
-        ArrayList<String> args = new ArrayList<>(Arrays.asList(tsschecker.getPath(), "--generator", "0x1111111111111111", "--nocache", "-d", device, "-s", "-e", ecid, "--save-path", savePath));
+        ArrayList<String> args = new ArrayList<>(Arrays.asList(tsschecker.getPath(), "--nocache", "-d", device, "-s", "-e", ecid, "--save-path", savePath));
         if (controller.getBoardConfig) {
             Collections.addAll(args, "--boardconfig", boardConfig);
         }
         if (controller.apnonceCheckBox.isSelected()) {
             Collections.addAll(args, "--apnonce", apnonce);
+        } else {
+            Collections.addAll(args, "--generator", "0x1111111111111111");
         }
         if (controller.betaCheckBox.isSelected()) {
             if (!controller.ipswField.getText().matches("https?://.*apple.*\\.ipsw")) {
@@ -205,7 +207,8 @@ private static void run(URL ipswURL, String device, String version) throws TSSCh
                 resizeAlertButtons(alert);
                 alert.showAndWait();
                 reportError(alert);
-            } else if (containsIgnoreCase(tsscheckerLog, "[Error] [TSSC] manually specified ApNonce=" + apnonce + ", but parsing failed")) {
+            } else if (containsIgnoreCase(tsscheckerLog, "[Error] [TSSC] manually specified ApNonce=" + apnonce + ", but parsing failed")
+                    || containsIgnoreCase(tsscheckerLog, "[Error] [TSSR] parsed APNoncelen != requiredAPNoncelen")) {
                 newUnreportableError("\"" + apnonce + "\" is not a valid apnonce");
                 controller.apnonceField.setEffect(errorBorder);
             } else if (containsIgnoreCase(tsscheckerLog, "could not get id0 for installType=Erase")