Merge pull request square#794 from square/dimitris/local-cach-e

Do not stomp exception when disk cache fails to load

Author: dnkoutso

picasso/src/main/java/com/squareup/picasso/BitmapHunter.java

@@ -116,7 +116,9 @@ class BitmapHunter implements Runnable {
         dispatcher.dispatchComplete(this);
       }
     } catch (Downloader.ResponseException e) {
-      exception = e;
+      if (!e.localCacheOnly || e.responseCode != 504) {
+        exception = e;
+      }
       dispatcher.dispatchFailed(this);
     } catch (IOException e) {
       exception = e;

picasso/src/main/java/com/squareup/picasso/Downloader.java

@@ -43,8 +43,13 @@ public interface Downloader {
 
   /** Thrown for non-2XX responses. */
   class ResponseException extends IOException {
-    public ResponseException(String message) {
+    final boolean localCacheOnly;
+    final int responseCode;
+
+    public ResponseException(String message, boolean localCacheOnly, int responseCode) {
       super(message);
+      this.localCacheOnly = localCacheOnly;
+      this.responseCode = responseCode;
     }
   }
 

picasso/src/main/java/com/squareup/picasso/OkHttpDownloader.java

@@ -105,7 +105,8 @@ protected OkHttpClient getClient() {
     int responseCode = connection.getResponseCode();
     if (responseCode >= 300) {
       connection.disconnect();
-      throw new ResponseException(responseCode + " " + connection.getResponseMessage());
+      throw new ResponseException(responseCode + " " + connection.getResponseMessage(),
+          localCacheOnly, responseCode);
     }
 
     String responseSource = connection.getHeaderField(RESPONSE_SOURCE_OKHTTP);

picasso/src/main/java/com/squareup/picasso/UrlConnectionDownloader.java

@@ -64,7 +64,8 @@ protected HttpURLConnection openConnection(Uri path) throws IOException {
     int responseCode = connection.getResponseCode();
     if (responseCode >= 300) {
       connection.disconnect();
-      throw new ResponseException(responseCode + " " + connection.getResponseMessage());
+      throw new ResponseException(responseCode + " " + connection.getResponseMessage(),
+          localCacheOnly, responseCode);
     }
 
     long contentLength = connection.getHeaderFieldInt("Content-Length", -1);

picasso/src/test/java/com/squareup/picasso/BitmapHunterTest.java

@@ -117,7 +117,7 @@ public class BitmapHunterTest {
   @Test public void responseExcpetionDispatchFailed() throws Exception {
     Action action = mockAction(URI_KEY_1, URI_1);
     BitmapHunter hunter = new TestableBitmapHunter(picasso, dispatcher, cache, stats, action, null,
-        new Downloader.ResponseException("Test"));
+        new Downloader.ResponseException("Test", false, 504));
     hunter.run();
     verify(dispatcher).dispatchFailed(hunter);
   }