From 31811bb7e0eff83b1fcabc1cd27298ebb121bc5e Mon Sep 17 00:00:00 2001
From: jonnyandrew <jonny.andrew@protonmail.com>
Date: Fri, 21 Oct 2022 17:36:31 +0100
Subject: [PATCH] Fix crash by disabling Flipper on API 22 and below (#7428)

* Disable Flipper on API 21 and below - only affects debug builds.

Due to a bug: https://github.com/facebook/flipper/issues/3572

* Add jonnyandrew to PR sign-off allowlist

Co-authored-by: Benoit Marty <benoit.marty@gmail.com>
---
 changelog.d/7428.bugfix                       |  1 +
 tools/danger/dangerfile.js                    |  1 +
 .../vector/app/flipper/VectorFlipperProxy.kt  | 56 ++++++++++++-------
 3 files changed, 38 insertions(+), 20 deletions(-)
 create mode 100644 changelog.d/7428.bugfix

diff --git a/changelog.d/7428.bugfix b/changelog.d/7428.bugfix
new file mode 100644
index 0000000000..8f014af31b
--- /dev/null
+++ b/changelog.d/7428.bugfix
@@ -0,0 +1 @@
+Fix crash by disabling Flipper on Android API 22 and below - only affects debug version of the application.
diff --git a/tools/danger/dangerfile.js b/tools/danger/dangerfile.js
index 1a36474470..2fc55bad0c 100644
--- a/tools/danger/dangerfile.js
+++ b/tools/danger/dangerfile.js
@@ -81,6 +81,7 @@ const allowList = [
     "Florian14",
     "ganfra",
     "jmartinesp",
+    "jonnyandrew",
     "langleyd",
     "MadLittleMods",
     "manuroe",
diff --git a/vector-app/src/debug/java/im/vector/app/flipper/VectorFlipperProxy.kt b/vector-app/src/debug/java/im/vector/app/flipper/VectorFlipperProxy.kt
index 2e4336c942..cbf9e4f11f 100644
--- a/vector-app/src/debug/java/im/vector/app/flipper/VectorFlipperProxy.kt
+++ b/vector-app/src/debug/java/im/vector/app/flipper/VectorFlipperProxy.kt
@@ -17,6 +17,7 @@
 package im.vector.app.flipper
 
 import android.content.Context
+import android.os.Build
 import com.facebook.flipper.android.AndroidFlipperClient
 import com.facebook.flipper.android.utils.FlipperUtils
 import com.facebook.flipper.plugins.crashreporter.CrashReporterPlugin
@@ -31,6 +32,7 @@ import com.kgurgul.flipper.RealmDatabaseDriver
 import com.kgurgul.flipper.RealmDatabaseProvider
 import im.vector.app.core.debug.FlipperProxy
 import io.realm.RealmConfiguration
+import okhttp3.Interceptor
 import org.matrix.android.sdk.api.Matrix
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -41,29 +43,43 @@ class VectorFlipperProxy @Inject constructor(
 ) : FlipperProxy {
     private val networkFlipperPlugin = NetworkFlipperPlugin()
 
+    private val isEnabled: Boolean
+        get() {
+            // https://github.com/facebook/flipper/issues/3572
+            if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.LOLLIPOP_MR1) {
+                return false
+            }
+
+            return FlipperUtils.shouldEnableFlipper(context)
+        }
+
     override fun init(matrix: Matrix) {
+        if (!isEnabled) return
+
         SoLoader.init(context, false)
 
-        if (FlipperUtils.shouldEnableFlipper(context)) {
-            val client = AndroidFlipperClient.getInstance(context)
-            client.addPlugin(CrashReporterPlugin.getInstance())
-            client.addPlugin(SharedPreferencesFlipperPlugin(context))
-            client.addPlugin(InspectorFlipperPlugin(context, DescriptorMapping.withDefaults()))
-            client.addPlugin(networkFlipperPlugin)
-            client.addPlugin(
-                    DatabasesFlipperPlugin(
-                            RealmDatabaseDriver(
-                                    context = context,
-                                    realmDatabaseProvider = object : RealmDatabaseProvider {
-                                        override fun getRealmConfigurations(): List<RealmConfiguration> {
-                                            return matrix.debugService().getAllRealmConfigurations()
-                                        }
-                                    })
-                    )
-            )
-            client.start()
-        }
+        val client = AndroidFlipperClient.getInstance(context)
+        client.addPlugin(CrashReporterPlugin.getInstance())
+        client.addPlugin(SharedPreferencesFlipperPlugin(context))
+        client.addPlugin(InspectorFlipperPlugin(context, DescriptorMapping.withDefaults()))
+        client.addPlugin(networkFlipperPlugin)
+        client.addPlugin(
+                DatabasesFlipperPlugin(
+                        RealmDatabaseDriver(
+                                context = context,
+                                realmDatabaseProvider = object : RealmDatabaseProvider {
+                                    override fun getRealmConfigurations(): List<RealmConfiguration> {
+                                        return matrix.debugService().getAllRealmConfigurations()
+                                    }
+                                })
+                )
+        )
+        client.start()
     }
 
-    override fun networkInterceptor() = FlipperOkhttpInterceptor(networkFlipperPlugin)
+    override fun networkInterceptor(): Interceptor? {
+        if (!isEnabled) return null
+
+        return FlipperOkhttpInterceptor(networkFlipperPlugin)
+    }
 }