Move DraweeView#setController(null) to use #resetActualImage() instead

Reviewed By: jsendros Differential Revision: D49782690 fbshipit-source-id: 43da6392e31e775b690b90c2a0a1b1f7e852f1a0
facebook · Oct 6, 2023 · 6fc3b62 · 6fc3b62
1 parent faf5846
commit 6fc3b62
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 14 deletions.
diff --git a/drawee/src/main/java/com/facebook/drawee/view/DraweeView.java b/drawee/src/main/java/com/facebook/drawee/view/DraweeView.java
@@ -221,7 +221,7 @@ public boolean onTouchEvent(MotionEvent event) {
   @Deprecated
   public void setImageDrawable(@Nullable Drawable drawable) {
     init(getContext());
-    mDraweeHolder.setController(null);
+    mDraweeHolder.resetActualImage();
     super.setImageDrawable(drawable);
   }
 
@@ -234,7 +234,7 @@ public void setImageDrawable(@Nullable Drawable drawable) {
   @Deprecated
   public void setImageBitmap(Bitmap bm) {
     init(getContext());
-    mDraweeHolder.setController(null);
+    mDraweeHolder.resetActualImage();
     super.setImageBitmap(bm);
   }
 
@@ -247,7 +247,7 @@ public void setImageBitmap(Bitmap bm) {
   @Deprecated
   public void setImageResource(int resId) {
     init(getContext());
-    mDraweeHolder.setController(null);
+    mDraweeHolder.resetActualImage();
     super.setImageResource(resId);
   }
 
@@ -260,7 +260,7 @@ public void setImageResource(int resId) {
   @Deprecated
   public void setImageURI(Uri uri) {
     init(getContext());
-    mDraweeHolder.setController(null);
+    mDraweeHolder.resetActualImage();
     super.setImageURI(uri);
   }
 

diff --git a/drawee/src/test/java/com/facebook/drawee/view/DraweeHolderTest.java b/drawee/src/test/java/com/facebook/drawee/view/DraweeHolderTest.java
@@ -83,7 +83,7 @@ public void testSetControllerBeforeHierarchy() {
   @Test
   public void testClearControllerKeepsHierarchy() {
     mDraweeHolder.setController(mController);
-    mDraweeHolder.setController(null);
+    mDraweeHolder.resetActualImage();
     assertSame(mDraweeHierarchy, mDraweeHolder.getHierarchy());
     assertNull(mDraweeHolder.getController());
     assertNull(mController.getHierarchy());
@@ -125,7 +125,7 @@ public void testSetControllerWhenAlreadyAttached() {
 
   @Test
   public void testSetNullController() {
-    mDraweeHolder.setController(null);
+    mDraweeHolder.resetActualImage();
     mDraweeHolder.onAttach();
     mDraweeHolder.onDetach();
     mDraweeHolder.onAttach();
@@ -140,7 +140,7 @@ public void testSetNewControllerWithInvalidController() {
     mDraweeHolder.setController(mController);
     draweeHolder2.setController(mController);
 
-    mDraweeHolder.setController(null);
+    mDraweeHolder.resetActualImage();
     verify(mController, never()).onDetach();
     assertEquals(draweeHierarchy2, mController.getHierarchy());
   }

diff --git a/drawee/src/test/java/com/facebook/drawee/view/DraweeViewTest.java b/drawee/src/test/java/com/facebook/drawee/view/DraweeViewTest.java
@@ -80,7 +80,7 @@ public void testSetController() {
   public void testClearControllerKeepsHierarchy() {
     mDraweeView.setHierarchy(mDraweeHierarchy);
     mDraweeView.setController(mController);
-    mDraweeView.setController(null);
+    mDraweeView.resetActualImage();
     assertNull(mDraweeView.getController());
     assertSame(mTopLevelDrawable, mDraweeView.getDrawable());
     verify(mController).setHierarchy(null);
@@ -156,7 +156,7 @@ public void testLifecycle_ControllerSetWhileAttached() {
   @Test
   public void testLifecycle_NullController() {
     mDraweeView.setHierarchy(mDraweeHierarchy);
-    mDraweeView.setController(null);
+    mDraweeView.resetActualImage();
     mDraweeView.onStartTemporaryDetach();
     mDraweeView.onFinishTemporaryDetach();
   }

diff --git a/...se/src/main/java/com/facebook/fresco/samples/showcase/drawee/DraweeHierarchyFragment.java b/...se/src/main/java/com/facebook/fresco/samples/showcase/drawee/DraweeHierarchyFragment.java
@@ -92,7 +92,7 @@ public void onClick(View v) {
             new View.OnClickListener() {
               @Override
               public void onClick(View v) {
-                draweeView.setController(null);
+                draweeView.resetActualImage();
                 Fresco.getImagePipeline().evictFromCache(uriSuccess);
               }
             });

diff --git a/...ava/com/facebook/fresco/samples/showcase/imagepipeline/ImagePipelinePrefetchFragment.java b/...ava/com/facebook/fresco/samples/showcase/imagepipeline/ImagePipelinePrefetchFragment.java
@@ -199,7 +199,7 @@ public void onClick(View v) {
               }
             } else {
               for (int i = 0; i < mDraweesHolder.getChildCount(); i++) {
-                ((SimpleDraweeView) mDraweesHolder.getChildAt(i)).setController(null);
+                ((SimpleDraweeView) mDraweesHolder.getChildAt(i)).resetActualImage();
               }
             }
             mShowing = !mShowing;

diff --git a/.../main/java/com/facebook/fresco/samples/showcase/imagepipeline/PartialRequestFragment.java b/.../main/java/com/facebook/fresco/samples/showcase/imagepipeline/PartialRequestFragment.java
@@ -49,8 +49,8 @@ public void onViewCreated(final View view, @Nullable Bundle savedInstanceState)
         new View.OnClickListener() {
           @Override
           public void onClick(View v) {
-            partialDrawee.setController(null);
-            fullDrawee.setController(null);
+            partialDrawee.resetActualImage();
+            fullDrawee.resetActualImage();
             Fresco.getImagePipeline().clearDiskCaches();
             Fresco.getImagePipeline().clearMemoryCaches();
           }

diff --git a/samples/zoomableapp/src/main/java/com/facebook/samples/zoomableapp/MyPagerAdapter.java b/samples/zoomableapp/src/main/java/com/facebook/samples/zoomableapp/MyPagerAdapter.java
@@ -71,7 +71,7 @@ public Object instantiateItem(ViewGroup container, int position) {
   public void destroyItem(ViewGroup container, int position, Object object) {
     FrameLayout page = (FrameLayout) container.getChildAt(position);
     ZoomableDraweeView zoomableDraweeView = (ZoomableDraweeView) page.getChildAt(0);
-    zoomableDraweeView.setController(null);
+    zoomableDraweeView.resetActualImage();
   }
 
   @Override