Fix developer beta error introduced by previous commit

airsquared · Jul 20, 2023 · 8407f3a · 8407f3a
1 parent d0c72a3
commit 8407f3a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/main/java/airsquared/blobsaver/app/Network.java b/src/main/java/airsquared/blobsaver/app/Network.java
@@ -25,6 +25,7 @@
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
 import java.net.URI;
 import java.net.URL;
 import java.net.URLConnection;
@@ -173,11 +174,17 @@ private void ensureOpen() throws IOException {
                 if (pos > 0)
                     connection.addRequestProperty("Range", "bytes=" + pos + "-");
                 ch = Channels.newChannel(connection.getInputStream());
+                if (connection instanceof HttpURLConnection c && c.getResponseCode() != 200) {
+                    throw new IOException("HTTP Response was " + c.getResponseCode() + " " + Utils.defIfNull(c.getResponseMessage(), ""));
+                }
                 String resp = connection.getHeaderField("Content-Range");
                 if (resp != null) {
                     length = Long.parseLong(resp.split("/")[1]);
                 } else {
                     resp = connection.getHeaderField("Content-Length");
+                    if (resp == null) {
+                        throw new IOException("No Content-Range or Content-Length header");
+                    }
                     length = Long.parseLong(resp);
                 }
             }

diff --git a/src/main/java/airsquared/blobsaver/app/TSS.java b/src/main/java/airsquared/blobsaver/app/TSS.java
@@ -108,11 +108,13 @@ protected String call() throws TSSException {
                 saveFor(iosVersion, args);
             } catch (TSSException e) {
                 if (manualVersion == null && manualIpswURL == null) {
-                    if (e.getMessage().contains("not being signed")) {
+                    var msg = e.getMessage();
+                    if (msg.contains("not being signed")) {
                         System.err.println("Warning: ignoring unsigned version; API is likely out of date");
                         continue; // ignore not being signed (API might not be updated)
                     }
-                    if (e.getMessage().contains("Failed to load manifest") && includeBetas
+                    if ((msg.contains("Failed to load manifest") || msg.contains("Unable to extract BuildManifest"))
+                            && includeBetas
                             && containsIgnoreCase(iosVersion.versionString(), "beta")
                             && iosVersion.ipswURL().contains("developer.apple")) {
                         System.err.println("Warning: ignoring developer beta");