Merge pull request square#1090 from jobi/stop-placeholder-on-error

Stop placeholder animation on errors

Author: JakeWharton

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

@@ -17,6 +17,7 @@
 
 import android.content.Context;
 import android.graphics.Bitmap;
+import android.graphics.drawable.AnimationDrawable;
 import android.graphics.drawable.Drawable;
 import android.widget.ImageView;
 
@@ -57,6 +58,10 @@ class ImageViewAction extends Action<ImageView> {
     if (target == null) {
       return;
     }
+    Drawable placeholder = target.getDrawable();
+    if (placeholder instanceof AnimationDrawable) {
+      ((AnimationDrawable) placeholder).stop();
+    }
     if (errorResId != 0) {
       target.setImageResource(errorResId);
     } else if (errorDrawable != null) {

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

@@ -16,6 +16,7 @@
 package com.squareup.picasso;
 
 import android.graphics.Bitmap;
+import android.graphics.drawable.AnimationDrawable;
 import android.graphics.drawable.Drawable;
 import android.widget.ImageView;
 import org.junit.Test;
@@ -36,6 +37,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.when;
 
 @RunWith(RobolectricTestRunner.class)
 @Config(manifest = Config.NONE)
@@ -145,4 +147,17 @@ public void clearsCallbackOnCancel() throws Exception {
     request.cancel();
     assertThat(request.callback).isNull();
   }
+
+  @Test
+  public void stopPlaceholderAnimationOnError() throws Exception {
+    Picasso picasso = mock(Picasso.class);
+    AnimationDrawable placeholder = mock(AnimationDrawable.class);
+    ImageView target = mockImageViewTarget();
+    when(target.getDrawable()).thenReturn(placeholder);
+    ImageViewAction request =
+        new ImageViewAction(picasso, target, null, 0, 0, 0, null, URI_KEY_1, null,
+            null, false);
+    request.error();
+    verify(placeholder).stop();
+  }
 }