Merge pull request square#359 from square/dimitris/oom

Catch OOM.

Author: JakeWharton

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

@@ -22,6 +22,8 @@
 import android.net.NetworkInfo;
 import android.net.Uri;
 import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Future;
@@ -89,6 +91,11 @@ protected void setExifRotation(int exifRotation) {
     } catch (IOException e) {
       exception = e;
       dispatcher.dispatchRetry(this);
+    } catch (OutOfMemoryError e) {
+      StringWriter writer = new StringWriter();
+      stats.createSnapshot().dump(new PrintWriter(writer));
+      exception = new RuntimeException(writer.toString(), e);
+      dispatcher.dispatchFailed(this);
     } catch (Exception e) {
       exception = e;
       dispatcher.dispatchFailed(this);

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

@@ -98,6 +98,23 @@ public class BitmapHunterTest {
     verify(dispatcher).dispatchFailed(hunter);
   }
 
+  @Test public void outOfMemoryDispatchFailed() throws Exception {
+    when(stats.createSnapshot()).thenReturn(mock(StatsSnapshot.class));
+
+    Action action = mockAction(URI_KEY_1, URI_1);
+    BitmapHunter hunter = new OOMBitmapHunter(picasso, dispatcher, cache, stats, action);
+    try {
+      hunter.run();
+    } catch (Throwable t) {
+      Exception exception = hunter.getException();
+      verify(dispatcher).dispatchFailed(hunter);
+      verify(stats).createSnapshot();
+      assertThat(hunter.getResult()).isNull();
+      assertThat(exception).isNotNull();
+      assertThat(exception.getCause()).isInstanceOf(OutOfMemoryError.class);
+    }
+  }
+
   @Test public void runWithIoExceptionDispatchRetry() throws Exception {
     Action action = mockAction(URI_KEY_1, URI_1);
     BitmapHunter hunter =
@@ -444,4 +461,16 @@ private static class TestableBitmapHunter extends BitmapHunter {
       return MEMORY;
     }
   }
+
+  private static class OOMBitmapHunter extends TestableBitmapHunter {
+
+    OOMBitmapHunter(Picasso picasso, Dispatcher dispatcher, Cache cache, Stats stats,
+        Action action) {
+      super(picasso, dispatcher, cache, stats, action);
+    }
+
+    @Override Bitmap decode(Request data) throws IOException {
+      throw new OutOfMemoryError();
+    }
+  }
 }