From cbfb28078339ea9f5887ad6f4183951aa6eee150 Mon Sep 17 00:00:00 2001
From: Pascal Hartig <realpassy@fb.com>
Date: Fri, 22 Feb 2019 02:46:51 -0800
Subject: [PATCH] Set up FrescoFlipperPlugin default constructor

Summary:
Not quite sure about the default as static, but then if it's for
debugging only, does it matter?

Reviewed By: oprisnik

Differential Revision: D14165668

fbshipit-source-id: edd53420a4fc8570de87f02b3e5e65cfe649f810
---
 .../sample/FlipperSampleApplication.java       | 18 +-----------------
 .../plugins/fresco/FrescoFlipperPlugin.java    | 12 ++++++++++++
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/android/sample/src/main/java/com/facebook/flipper/sample/FlipperSampleApplication.java b/android/sample/src/main/java/com/facebook/flipper/sample/FlipperSampleApplication.java
index a0bc17872..0d5ca1041 100644
--- a/android/sample/src/main/java/com/facebook/flipper/sample/FlipperSampleApplication.java
+++ b/android/sample/src/main/java/com/facebook/flipper/sample/FlipperSampleApplication.java
@@ -12,13 +12,10 @@ import androidx.annotation.Nullable;
 import com.facebook.common.memory.manager.NoOpDebugMemoryManager;
 import com.facebook.drawee.backends.pipeline.Fresco;
 import com.facebook.flipper.android.AndroidFlipperClient;
-import com.facebook.flipper.core.FlipperArray;
 import com.facebook.flipper.core.FlipperClient;
-import com.facebook.flipper.perflogger.NoOpFlipperPerfLogger;
 import com.facebook.flipper.plugins.crashreporter.CrashReporterPlugin;
 import com.facebook.flipper.plugins.example.ExampleFlipperPlugin;
 import com.facebook.flipper.plugins.fresco.FrescoFlipperPlugin;
-import com.facebook.flipper.plugins.fresco.objecthelper.FlipperObjectHelper;
 import com.facebook.flipper.plugins.inspector.DescriptorMapping;
 import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin;
 import com.facebook.flipper.plugins.leakcanary.LeakCanaryFlipperPlugin;
@@ -27,7 +24,6 @@ import com.facebook.flipper.plugins.network.FlipperOkhttpInterceptor;
 import com.facebook.flipper.plugins.network.NetworkFlipperPlugin;
 import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesFlipperPlugin;
 import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesFlipperPlugin.SharedPreferencesDescriptor;
-import com.facebook.imagepipeline.debug.FlipperImageTracker;
 import com.facebook.litho.config.ComponentsConfiguration;
 import com.facebook.soloader.SoLoader;
 import java.util.Arrays;
@@ -71,19 +67,7 @@ public class FlipperSampleApplication extends Application {
                 new SharedPreferencesDescriptor("sample", Context.MODE_PRIVATE),
                 new SharedPreferencesDescriptor("other_sample", Context.MODE_PRIVATE))));
     client.addPlugin(new LeakCanaryFlipperPlugin());
-    client.addPlugin(
-        new FrescoFlipperPlugin(
-            new FlipperImageTracker(),
-            Fresco.getImagePipelineFactory().getPlatformBitmapFactory(),
-            new FlipperObjectHelper() {
-              @Override
-              public FlipperArray fromCallerContext(Object callerContext) {
-                return null;
-              }
-            },
-            new NoOpDebugMemoryManager(),
-            new NoOpFlipperPerfLogger(),
-            null));
+    client.addPlugin(new FrescoFlipperPlugin());
     client.addPlugin(new ExampleFlipperPlugin());
     client.addPlugin(CrashReporterPlugin.getInstance());
     client.start();
diff --git a/android/src/main/java/com/facebook/flipper/plugins/fresco/FrescoFlipperPlugin.java b/android/src/main/java/com/facebook/flipper/plugins/fresco/FrescoFlipperPlugin.java
index b845f62c6..85a2b93a2 100644
--- a/android/src/main/java/com/facebook/flipper/plugins/fresco/FrescoFlipperPlugin.java
+++ b/android/src/main/java/com/facebook/flipper/plugins/fresco/FrescoFlipperPlugin.java
@@ -11,6 +11,7 @@ import android.util.Base64;
 import com.facebook.cache.common.CacheKey;
 import com.facebook.common.internal.Predicate;
 import com.facebook.common.memory.manager.DebugMemoryManager;
+import com.facebook.common.memory.manager.NoOpDebugMemoryManager;
 import com.facebook.common.references.CloseableReference;
 import com.facebook.drawee.backends.pipeline.Fresco;
 import com.facebook.drawee.backends.pipeline.info.ImageLoadStatus;
@@ -23,6 +24,7 @@ import com.facebook.flipper.core.FlipperObject;
 import com.facebook.flipper.core.FlipperReceiver;
 import com.facebook.flipper.core.FlipperResponder;
 import com.facebook.flipper.perflogger.FlipperPerfLogger;
+import com.facebook.flipper.perflogger.NoOpFlipperPerfLogger;
 import com.facebook.flipper.plugins.common.BufferingFlipperPlugin;
 import com.facebook.flipper.plugins.fresco.objecthelper.FlipperObjectHelper;
 import com.facebook.imagepipeline.bitmaps.PlatformBitmapFactory;
@@ -87,6 +89,16 @@ public class FrescoFlipperPlugin extends BufferingFlipperPlugin implements Image
     mDebugPrefHelper = debugPrefHelper;
   }
 
+  public FrescoFlipperPlugin() {
+    this(
+        new FlipperImageTracker(),
+        Fresco.getImagePipelineFactory().getPlatformBitmapFactory(),
+        null,
+        new NoOpDebugMemoryManager(),
+        new NoOpFlipperPerfLogger(),
+        null);
+  }
+
   public FlipperImageTracker getFlipperImageTracker() {
     return mFlipperImageTracker;
   }