Merge pull request #1507 from dimagi/commcare_2.60

Backmerge CommCare 2.60

Author: avazirna

src/main/java/org/commcare/core/interfaces/HttpResponseProcessor.java

@@ -20,7 +20,7 @@ public interface HttpResponseProcessor {
      * Can represent authentication issues, data parity issues between client
      * and server, among other things
      */
-    void processClientError(int responseCode);
+    void processClientError(int responseCode, InputStream errorStream);
 
     /**
      * Http response was in the 500s

src/main/java/org/commcare/core/interfaces/ResponseStreamAccessor.java

@@ -3,7 +3,12 @@
 import java.io.IOException;
 import java.io.InputStream;
 
+import javax.annotation.Nullable;
+
 public interface ResponseStreamAccessor {
     InputStream getResponseStream() throws IOException;
+
+    @Nullable
+    InputStream getErrorResponseStream() throws IOException;
     String getApiVersion();
 }

src/main/java/org/commcare/core/network/ModernHttpRequester.java

@@ -8,10 +8,12 @@
 import org.commcare.core.network.bitcache.BitCacheFactory;
 import org.commcare.util.NetworkStatus;
 import org.javarosa.core.io.StreamsUtil;
+import org.javarosa.core.services.Logger;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -99,6 +101,12 @@ public InputStream getResponseStream() throws IOException {
                     return requester.getResponseStream(response);
                 }
 
+                @Nullable
+                @Override
+                public InputStream getErrorResponseStream() throws IOException {
+                    return requester.getErrorResponseStream(response);
+                }
+
                 @Override
                 public String getApiVersion() {
                     return requester.getApiVersion();
@@ -175,7 +183,15 @@ public static void processResponse(HttpResponseProcessor responseProcessor,
                 StreamsUtil.closeStream(responseStream);
             }
         } else if (responseCode >= 400 && responseCode < 500) {
-            responseProcessor.processClientError(responseCode);
+            InputStream errorStream = null;
+            try {
+                errorStream = streamAccessor.getErrorResponseStream();
+                responseProcessor.processClientError(responseCode, errorStream);
+            } catch (Exception e) {
+                Logger.exception("Exception during network error processing", e);
+            } finally {
+                StreamsUtil.closeStream(errorStream);
+            }
         } else if (responseCode >= 500 && responseCode < 600) {
             responseProcessor.processServerError(responseCode);
         } else {
@@ -191,13 +207,26 @@ public static void processResponse(HttpResponseProcessor responseProcessor,
 
     public InputStream getResponseStream(Response<ResponseBody> response) throws IOException {
         InputStream inputStream = response.body().byteStream();
+        return cacheResponse(inputStream, response);
+    }
+
+    private InputStream cacheResponse(InputStream inputStream, Response<ResponseBody> response)
+            throws IOException {
         BitCache cache = BitCacheFactory.getCache(cacheDirSetup, getContentLength(response));
         cache.initializeCache();
         OutputStream cacheOut = cache.getCacheStream();
         StreamsUtil.writeFromInputToOutputNew(inputStream, cacheOut);
         return cache.retrieveCache();
     }
 
+    @Nullable
+    public InputStream getErrorResponseStream(Response<ResponseBody> response) throws IOException {
+        if (response.errorBody() != null) {
+            return cacheResponse( response.errorBody().byteStream(), response);
+        }
+        return null;
+    }
+
     public String getApiVersion() {
         return response != null ? response.headers().get("x-api-current-version") : null;
     }