From 13146c2b2a967653ef4bc361b8a3554e0286ab5c Mon Sep 17 00:00:00 2001
From: Sawyer Blatz <sdblatz@gmail.com>
Date: Thu, 19 Sep 2019 13:39:57 -0700
Subject: [PATCH] Reverts #1151: Removes unused Flipper library

---
 app/build.gradle                              |  4 ---
 app/src/debug/AndroidManifest.xml             |  9 +------
 .../mozilla/fenix/DebugFenixApplication.kt    | 26 -------------------
 buildSrc/src/main/java/Dependencies.kt        |  6 -----
 4 files changed, 1 insertion(+), 44 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 4a64b7416..9962be9f1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -504,10 +504,6 @@ dependencies {
     androidTestImplementation Deps.mockito_android
     testImplementation Deps.mockk
     testImplementation Deps.assertk
-
-    debugImplementation Deps.flipper
-    debugImplementation Deps.soLoader
-    releaseImplementation Deps.flipper_noop
 }
 
 if (project.hasProperty("raptor")) {
diff --git a/app/src/debug/AndroidManifest.xml b/app/src/debug/AndroidManifest.xml
index 2523164f5..8161de6d7 100644
--- a/app/src/debug/AndroidManifest.xml
+++ b/app/src/debug/AndroidManifest.xml
@@ -17,12 +17,5 @@
 
     <application
             tools:replace="android:name"
-            android:name="org.mozilla.fenix.DebugFenixApplication">
-
-        <activity android:name="com.facebook.flipper.android.diagnostics.FlipperDiagnosticActivity"
-                  android:exported="true"/>
-        <service android:name="com.facebook.flipper.plugins.leakcanary.RecordLeakService" />
-
-    </application>
-
+            android:name="org.mozilla.fenix.DebugFenixApplication"/>
 </manifest>
\ No newline at end of file
diff --git a/app/src/debug/java/org/mozilla/fenix/DebugFenixApplication.kt b/app/src/debug/java/org/mozilla/fenix/DebugFenixApplication.kt
index 2a91a4e04..9ea6d234a 100644
--- a/app/src/debug/java/org/mozilla/fenix/DebugFenixApplication.kt
+++ b/app/src/debug/java/org/mozilla/fenix/DebugFenixApplication.kt
@@ -7,14 +7,6 @@ package org.mozilla.fenix
 import android.content.Context
 import android.content.SharedPreferences
 import androidx.preference.PreferenceManager
-import com.facebook.flipper.android.AndroidFlipperClient
-import com.facebook.flipper.android.utils.FlipperUtils
-import com.facebook.flipper.plugins.inspector.DescriptorMapping
-import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin
-import com.facebook.flipper.plugins.leakcanary.LeakCanaryFlipperPlugin
-import com.facebook.flipper.plugins.leakcanary.RecordLeakService
-import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesFlipperPlugin
-import com.facebook.soloader.SoLoader
 import com.squareup.leakcanary.AndroidHeapDumper
 import com.squareup.leakcanary.HeapDumper
 import com.squareup.leakcanary.LeakCanary
@@ -25,23 +17,6 @@ import java.io.File
 
 class DebugFenixApplication : FenixApplication() {
 
-    override fun onCreate() {
-        SoLoader.init(this, false)
-
-        if (FlipperUtils.shouldEnableFlipper(this)) {
-            AndroidFlipperClient.getInstance(this).apply {
-                addPlugin(InspectorFlipperPlugin(this@DebugFenixApplication,
-                    DescriptorMapping.withDefaults()))
-                addPlugin(LeakCanaryFlipperPlugin())
-                addPlugin(SharedPreferencesFlipperPlugin(this@DebugFenixApplication,
-                    this@DebugFenixApplication.packageName + "_preferences"))
-                start()
-            }
-        }
-
-        super.onCreate()
-    }
-
     private var heapDumper: ToggleableHeapDumper? = null
 
     override fun setupLeakCanary() {
@@ -49,7 +24,6 @@ class DebugFenixApplication : FenixApplication() {
         val defaultDumper = AndroidHeapDumper(this, leakDirectoryProvider)
         heapDumper = ToggleableHeapDumper(this, defaultDumper)
         LeakCanary.refWatcher(this)
-            .listenerServiceClass(RecordLeakService::class.java)
             .heapDumper(heapDumper)
             .buildAndInstall()
     }
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
index 9c0331597..b3c576868 100644
--- a/buildSrc/src/main/java/Dependencies.kt
+++ b/buildSrc/src/main/java/Dependencies.kt
@@ -52,8 +52,6 @@ object Versions {
     const val mockito = "2.24.5"
     const val mockk = "1.9.kotlin12"
     const val assertk = "0.19"
-    const val flipper = "0.21.0"
-    const val soLoader = "0.5.1"
 
     const val espresso_version = "3.2.0"
     const val mockwebserver = "3.11.0"
@@ -197,10 +195,6 @@ object Deps {
     const val mockk = "io.mockk:mockk:${Versions.mockk}"
     const val assertk = "com.willowtreeapps.assertk:assertk-jvm:${Versions.assertk}"
 
-    const val flipper = "com.facebook.flipper:flipper:${Versions.flipper}"
-    const val flipper_noop = "com.facebook.flipper:flipper-noop:${Versions.flipper}"
-    const val soLoader = "com.facebook.soloader:soloader:${Versions.soLoader}"
-
     const val espresso_contrib = "androidx.test.espresso:espresso-contrib:${Versions.espresso_version}"
     const val espresso_core = "androidx.test.espresso:espresso-core:${Versions.espresso_version}"
     const val espresso_idling_resources = "androidx.test.espresso:espresso-idling-resource:${Versions.espresso_version}"