Android: more meaningful errors for non-200 HTTP responses

Author: ofalvai

android/app/src/main/java/com/microsoft/codepush/react/CodePushUpdateManager.java

@@ -178,6 +178,13 @@ public void downloadPackage(JSONObject updatePackage, String expectedBundleFileN
             }
 
             connection.setRequestProperty("Accept-Encoding", "identity");
+
+            int responseCode = connection.getResponseCode();
+            if (responseCode < 200 || responseCode >= 300) {
+                throw new CodePushUnknownException("Error downloading update package. Response code: "
+                        + responseCode + ". Response body: " + NetworkUtils.readStreamToString(connection.getErrorStream()));
+            }
+
             bin = new BufferedInputStream(connection.getInputStream());
 
             long totalBytes = connection.getContentLength();
@@ -349,6 +356,13 @@ public void downloadAndReplaceCurrentBundle(String remoteBundleUrl, String bundl
         try {
             downloadUrl = new URL(remoteBundleUrl);
             connection = (HttpURLConnection) (downloadUrl.openConnection());
+
+            int responseCode = connection.getResponseCode();
+            if (responseCode < 200 || responseCode >= 300) {
+                throw new CodePushUnknownException("Error downloading update package. Response code: "
+                        + responseCode + ". Response body: " + NetworkUtils.readStreamToString(connection.getErrorStream()));
+            }
+
             bin = new BufferedInputStream(connection.getInputStream());
             File downloadFile = new File(getCurrentPackageBundlePath(bundleFileName));
             downloadFile.delete();

android/app/src/main/java/com/microsoft/codepush/react/NetworkUtils.kt

@@ -0,0 +1,14 @@
+@file:JvmName("NetworkUtils")
+
+package com.microsoft.codepush.react
+
+import java.io.InputStream
+
+/**
+ * Reads an InputStream to its end and returns the contents as a UTF-8 string,
+ * closing the stream afterwards. Returns an empty string for a null stream (e.g.
+ * HttpURLConnection.getErrorStream() when the server sent no error body).
+ */
+fun readStreamToString(inputStream: InputStream?): String {
+    return inputStream?.bufferedReader()?.use { it.readText() } ?: ""
+}