Do not use WeakRef for target in RemoteViews requests.

dnkoutso · dnkoutso · commit 7871f1f372b7 · 2014-09-23T08:13:43.000-07:00
diff --git a/picasso/src/main/java/com/squareup/picasso/Action.java b/picasso/src/main/java/com/squareup/picasso/Action.java
@@ -48,7 +48,8 @@ public RequestWeakReference(Action action, T referent, ReferenceQueue<? super T>
       int errorResId, Drawable errorDrawable, String key, Object tag) {
     this.picasso = picasso;
     this.request = request;
-    this.target = new RequestWeakReference<T>(this, target, picasso.referenceQueue);
+    this.target =
+        target == null ? null : new RequestWeakReference<T>(this, target, picasso.referenceQueue);
     this.skipCache = skipCache;
     this.noFade = noFade;
     this.errorResId = errorResId;
diff --git a/picasso/src/main/java/com/squareup/picasso/RemoteViewsAction.java b/picasso/src/main/java/com/squareup/picasso/RemoteViewsAction.java
@@ -28,9 +28,11 @@ abstract class RemoteViewsAction extends Action<RemoteViewsAction.RemoteViewsTar
   final RemoteViews remoteViews;
   final int viewId;
 
+  private RemoteViewsTarget target;
+
   RemoteViewsAction(Picasso picasso, Request data, RemoteViews remoteViews, int viewId,
       int errorResId, boolean skipCache, String key, Object tag) {
-    super(picasso, new RemoteViewsTarget(remoteViews, viewId), data, skipCache, false, errorResId,
+    super(picasso, null, data, skipCache, false, errorResId,
         null, key, tag);
     this.remoteViews = remoteViews;
     this.viewId = viewId;
@@ -47,6 +49,13 @@ abstract class RemoteViewsAction extends Action<RemoteViewsAction.RemoteViewsTar
     }
   }
 
+  @Override RemoteViewsTarget getTarget() {
+    if (target == null) {
+      target = new RemoteViewsTarget(remoteViews, viewId);
+    }
+    return target;
+  }
+
   void setImageResource(int resId) {
     remoteViews.setImageViewResource(viewId, resId);
     update();
