Clear local perf data listener when null

Reviewed By: oprisnik Differential Revision: D45867838 fbshipit-source-id: 87b2bb7bbf5683085f24152fc1dc39fc5ac493e2
Enerfek · May 18, 2023 · 349555d · 349555d
1 parent 124bcb6
commit 349555d
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/ui-common/src/main/java/com/facebook/fresco/ui/common/ImagePerfNotifierHolder.kt b/ui-common/src/main/java/com/facebook/fresco/ui/common/ImagePerfNotifierHolder.kt
@@ -8,5 +8,5 @@
 package com.facebook.fresco.ui.common
 
 interface ImagePerfNotifierHolder {
-  fun setImagePerfNotifier(imagePerfNotifier: ImagePerfNotifier)
+  fun setImagePerfNotifier(imagePerfNotifier: ImagePerfNotifier?)
 }
diff --git a/...common-impl/src/main/java/com/facebook/fresco/vito/core/impl/CombinedImageListenerImpl.kt b/...common-impl/src/main/java/com/facebook/fresco/vito/core/impl/CombinedImageListenerImpl.kt
@@ -47,15 +47,14 @@ class CombinedImageListenerImpl : CombinedImageListener {
     checkAndSetLocalImagePerfStateListener()
   }
 
-  override fun setLocalImagePerfStateListener(imagePerfNotifier: ImagePerfNotifier) {
+  override fun setLocalImagePerfStateListener(imagePerfNotifier: ImagePerfNotifier?) {
     localImagePerfStateListener = imagePerfNotifier
     checkAndSetLocalImagePerfStateListener()
   }
 
   private fun checkAndSetLocalImagePerfStateListener() {
-    (imagePerfControllerListener as? ImagePerfNotifierHolder)?.let { localPerfStatePublisher ->
-      localImagePerfStateListener?.let { localPerfStatePublisher.setImagePerfNotifier(it) }
-    }
+    val localPerfStatePublisher = imagePerfControllerListener as? ImagePerfNotifierHolder
+    localPerfStatePublisher?.setImagePerfNotifier(localImagePerfStateListener)
   }
 
   override fun onSubmit(

diff --git a/vito/core-impl/src/main/java/com/facebook/fresco/vito/core/impl/KFrescoController.kt b/vito/core-impl/src/main/java/com/facebook/fresco/vito/core/impl/KFrescoController.kt
@@ -118,9 +118,8 @@ class KFrescoController(
       listenerManager.setVitoImageRequestListener(globalImageRequestListener)
 
       // Setup local perf data listener
-      perfDataListener
-          ?.let { ImagePerfDataNotifier(it) }
-          ?.let { listenerManager.setLocalImagePerfStateListener(it) }
+      val localPerfStateListener = perfDataListener?.let { ImagePerfDataNotifier(it) }
+      listenerManager.setLocalImagePerfStateListener(localPerfStateListener)
 
       _imageId = imageId
       this.viewportDimensions = viewportDimensions

diff --git a/...ore-java-impl/src/main/java/com/facebook/fresco/vito/core/impl/FrescoController2Impl.java b/...ore-java-impl/src/main/java/com/facebook/fresco/vito/core/impl/FrescoController2Impl.java
@@ -148,8 +148,10 @@ public boolean fetch(
 
     // Setup local perf data listener
     if (perfDataListener != null) {
-      ImagePerfNotifier perfDataNotifier = new ImagePerfDataNotifier(perfDataListener);
-      frescoDrawable.getInternalListener().setLocalImagePerfStateListener(perfDataNotifier);
+      ImagePerfNotifier localPerfStateListener = new ImagePerfDataNotifier(perfDataListener);
+      frescoDrawable.getInternalListener().setLocalImagePerfStateListener(localPerfStateListener);
+    } else {
+      frescoDrawable.getInternalListener().setLocalImagePerfStateListener(null);
     }
 
     frescoDrawable.setOnFadeListener(onFadeListener);

diff --git a/vito/core/src/main/java/com/facebook/fresco/vito/core/CombinedImageListener.kt b/vito/core/src/main/java/com/facebook/fresco/vito/core/CombinedImageListener.kt
@@ -20,7 +20,7 @@ interface CombinedImageListener : VitoImageRequestListener {
   var imageListener: ImageListener?
 
   fun setImagePerfControllerListener(imagePerfControllerListener: ControllerListener2<ImageInfo>?)
-  fun setLocalImagePerfStateListener(imagePerfNotifier: ImagePerfNotifier)
+  fun setLocalImagePerfStateListener(imagePerfNotifier: ImagePerfNotifier?)
 
   fun onReset()
 }