Merge pull request #9117 from element-hq/feature/bma/removeFlipper

Remove flipper from the codebase.

Author: bmarty

dependencies.gradle

@@ -19,7 +19,6 @@ def markwon = "4.6.2"
 def moshi = "1.15.1"
 def lifecycle = "2.8.3"
 def flowBinding = "1.2.0"
-def flipper = "0.259.0"
 def epoxy = "5.0.0"
 def mavericks = "3.0.9"
 def glide = "4.16.0"
@@ -95,10 +94,6 @@ ext.libs = [
                 'hiltAndroidTesting'      : "com.google.dagger:hilt-android-testing:$dagger",
                 'hiltCompiler'            : "com.google.dagger:hilt-compiler:$dagger"
         ],
-        flipper     : [
-                'flipper'                 : "com.facebook.flipper:flipper:$flipper",
-                'flipperNetworkPlugin'    : "com.facebook.flipper:flipper-network-plugin:$flipper",
-        ],
         element     : [
                 'opusencoder'             : "io.element.android:opusencoder:1.1.0",
                 'wysiwyg'                 : "io.element.android:wysiwyg:2.38.2"

dependencies_groups.gradle

@@ -69,7 +69,6 @@ ext.groups = [
                         'com.dropbox.core',
                         'com.soywiz.korlibs.korte',
                         'com.facebook.fbjni',
-                        'com.facebook.flipper',
                         'com.facebook.fresco',
                         'com.facebook.infer.annotation',
                         'com.facebook.react',
@@ -114,7 +113,6 @@ ext.groups = [
                         'com.intellij',
                         'com.jakewharton.android.repackaged',
                         'com.jakewharton.timber',
-                        'com.kgurgul.flipper',
                         'com.linkedin.dexmaker',
                         'com.mapbox.mapboxsdk',
                         'com.nulab-inc',

docs/flipper.md

@@ -391,16 +391,6 @@ dependencies {
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation "androidx.sharetarget:sharetarget:1.2.0"
 
-    // Flipper, debug builds only
-    debugImplementation(libs.flipper.flipper) {
-        exclude group: 'com.facebook.fbjni', module: 'fbjni'
-    }
-    debugImplementation(libs.flipper.flipperNetworkPlugin) {
-        exclude group: 'com.facebook.fbjni', module: 'fbjni'
-    }
-    debugImplementation 'com.facebook.soloader:soloader:0.10.5'
-    debugImplementation "com.kgurgul.flipper:flipper-realm-android:2.3.0"
-
     gplayImplementation "com.google.android.gms:play-services-location:21.3.0"
     // UnifiedPush gplay flavor only
     gplayImplementation platform(libs.google.firebaseBom)

vector-app/build.gradle

@@ -11,11 +11,6 @@
         <activity android:name="im.vector.app.features.debug.features.DebugFeaturesSettingsActivity" />
         <activity android:name="im.vector.app.features.debug.DebugMenuActivity" />
         <activity android:name="im.vector.app.features.debug.leak.DebugMemoryLeaksActivity" />
-
-        <activity
-            android:name="com.facebook.flipper.android.diagnostics.FlipperDiagnosticActivity"
-            android:exported="true" />
-
     </application>
 
 </manifest>

vector-app/src/debug/AndroidManifest.xml

@@ -16,10 +16,8 @@ import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
 import im.vector.app.core.debug.DebugNavigator
 import im.vector.app.core.debug.DebugReceiver
-import im.vector.app.core.debug.FlipperProxy
 import im.vector.app.core.debug.LeakDetector
 import im.vector.app.features.debug.DebugMenuActivity
-import im.vector.app.flipper.VectorFlipperProxy
 import im.vector.app.leakcanary.LeakCanaryLeakDetector
 import im.vector.app.receivers.VectorDebugReceiver
 
@@ -40,9 +38,6 @@ abstract class DebugModule {
     @Binds
     abstract fun bindsDebugReceiver(receiver: VectorDebugReceiver): DebugReceiver
 
-    @Binds
-    abstract fun bindsFlipperProxy(flipperProxy: VectorFlipperProxy): FlipperProxy
-
     @Binds
     abstract fun bindsLeakDetector(leakDetector: LeakCanaryLeakDetector): LeakDetector
 }

vector-app/src/debug/java/im/vector/app/features/debug/di/DebugModule.kt

@@ -38,7 +38,6 @@ import com.vanniktech.emoji.EmojiManager
 import com.vanniktech.emoji.google.GoogleEmojiProvider
 import dagger.hilt.android.HiltAndroidApp
 import im.vector.app.config.Config
-import im.vector.app.core.debug.FlipperProxy
 import im.vector.app.core.debug.LeakDetector
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.pushers.FcmHelper
@@ -97,7 +96,6 @@ class VectorApplication :
     @Inject lateinit var decryptionFailureTracker: DecryptionFailureTracker
     @Inject lateinit var vectorFileLogger: VectorFileLogger
     @Inject lateinit var vectorAnalytics: VectorAnalytics
-    @Inject lateinit var flipperProxy: FlipperProxy
     @Inject lateinit var matrix: Matrix
     @Inject lateinit var fcmHelper: FcmHelper
     @Inject lateinit var buildMeta: BuildMeta
@@ -121,7 +119,6 @@ class VectorApplication :
         enableStrictModeIfNeeded()
         super.onCreate()
         appContext = this
-        flipperProxy.init(matrix)
         vectorAnalytics.init()
         vectorAnalytics.updateSuperProperties(
                 SuperProperties(

vector-app/src/debug/java/im/vector/app/flipper/VectorFlipperProxy.kt

@@ -24,7 +24,6 @@ import im.vector.app.EmojiSpanify
 import im.vector.app.SpaceStateHandler
 import im.vector.app.SpaceStateHandlerImpl
 import im.vector.app.config.Config
-import im.vector.app.core.debug.FlipperProxy
 import im.vector.app.core.device.DefaultGetDeviceInfoUseCase
 import im.vector.app.core.device.GetDeviceInfoUseCase
 import im.vector.app.core.dispatchers.CoroutineDispatchers
@@ -140,7 +139,6 @@ import javax.inject.Singleton
     fun providesMatrixConfiguration(
             vectorPreferences: VectorPreferences,
             vectorRoomDisplayNameFallbackProvider: VectorRoomDisplayNameFallbackProvider,
-            flipperProxy: FlipperProxy,
             vectorPlugins: VectorPlugins,
             vectorCustomEventTypesProvider: VectorCustomEventTypesProvider,
             mdmService: MdmService,
@@ -149,9 +147,7 @@ import javax.inject.Singleton
                 applicationFlavor = BuildConfig.FLAVOR_DESCRIPTION,
                 roomDisplayNameFallbackProvider = vectorRoomDisplayNameFallbackProvider,
                 threadMessagesEnabledDefault = vectorPreferences.areThreadMessagesEnabled(),
-                networkInterceptors = listOfNotNull(
-                        flipperProxy.networkInterceptor(),
-                ),
+                networkInterceptors = emptyList(),
                 metricPlugins = vectorPlugins.plugins(),
                 cryptoAnalyticsPlugin = vectorPlugins.cryptoMetricPlugin,
                 customEventTypesProvider = vectorCustomEventTypesProvider,

vector-app/src/main/java/im/vector/app/VectorApplication.kt

@@ -14,10 +14,7 @@ import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
 import im.vector.app.core.debug.DebugNavigator
 import im.vector.app.core.debug.DebugReceiver
-import im.vector.app.core.debug.FlipperProxy
 import im.vector.app.core.debug.LeakDetector
-import okhttp3.Interceptor
-import org.matrix.android.sdk.api.Matrix
 
 @InstallIn(SingletonComponent::class)
 @Module
@@ -41,15 +38,6 @@ object DebugModule {
         }
     }
 
-    @Provides
-    fun providesFlipperProxy() = object : FlipperProxy {
-        override fun init(matrix: Matrix) {
-            // no op
-        }
-
-        override fun networkInterceptor(): Interceptor? = null
-    }
-
     @Provides
     fun providesLeakDetector() = object : LeakDetector {
         override fun enable(enable: Boolean) {