Merge pull request square#602 from square/dimitris/cancel-remote-views

Add API to cancel remote view requests.

Author: JakeWharton

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

@@ -24,6 +24,7 @@
 import android.os.Message;
 import android.os.Process;
 import android.widget.ImageView;
+import android.widget.RemoteViews;
 import java.io.File;
 import java.lang.ref.ReferenceQueue;
 import java.util.List;
@@ -156,6 +157,14 @@ public void cancelRequest(Target target) {
     cancelExistingRequest(target);
   }
 
+  /**
+   * Cancel any existing requests for the specified {@link RemoteViews} target with the given {@code
+   * viewId}.
+   */
+  public void cancelRequest(RemoteViews remoteViews, int viewId) {
+    cancelExistingRequest(new RemoteViewsAction.RemoteViewsTarget(remoteViews, viewId));
+  }
+
   /**
    * Start an image request using the specified URI.
    * <p>

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

@@ -18,6 +18,7 @@
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.widget.ImageView;
+import android.widget.RemoteViews;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.concurrent.ExecutorService;
@@ -31,6 +32,7 @@
 
 import static com.squareup.picasso.Picasso.Listener;
 import static com.squareup.picasso.Picasso.LoadedFrom.MEMORY;
+import static com.squareup.picasso.RemoteViewsAction.RemoteViewsTarget;
 import static com.squareup.picasso.TestUtils.BITMAP_1;
 import static com.squareup.picasso.TestUtils.URI_1;
 import static com.squareup.picasso.TestUtils.URI_KEY_1;
@@ -219,6 +221,20 @@ public class PicassoTest {
     verify(dispatcher).dispatchCancel(action);
   }
 
+  @Test public void cancelExistingRequestWithRemoteViewTarget() throws Exception {
+    int layoutId = 0;
+    int viewId = 1;
+    RemoteViews remoteViews = new RemoteViews("packageName", layoutId);
+    RemoteViewsTarget target = new RemoteViewsTarget(remoteViews, viewId);
+    Action action = mockAction(URI_KEY_1, URI_1, target);
+    picasso.enqueueAndSubmit(action);
+    assertThat(picasso.targetToAction).hasSize(1);
+    picasso.cancelRequest(remoteViews, viewId);
+    assertThat(picasso.targetToAction).isEmpty();
+    verify(action).cancel();
+    verify(dispatcher).dispatchCancel(action);
+  }
+
   @Test public void deferAddsToMap() throws Exception {
     ImageView target = mockImageViewTarget();
     DeferredRequestCreator deferredRequestCreator = mockDeferredRequestCreator();

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

@@ -161,6 +161,10 @@ static Target mockTarget() {
     return mock(Target.class);
   }
 
+  static RemoteViewsAction.RemoteViewsTarget mockRemoteViewsTarget() {
+    return mock(RemoteViewsAction.RemoteViewsTarget.class);
+  }
+
   static Callback mockCallback() {
     return mock(Callback.class);
   }