From b6da64846c30f01b5e111a0d1727d3547deac5d0 Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Thu, 22 Aug 2019 12:44:32 -0500
Subject: [PATCH] Add FlipperDiagnosticActivity

---
 app/src/debug/AndroidManifest.xml            | 14 ++++++++++++++
 app/src/debug/java/org/tasks/BuildSetup.java |  3 ++-
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 app/src/debug/AndroidManifest.xml

diff --git a/app/src/debug/AndroidManifest.xml b/app/src/debug/AndroidManifest.xml
new file mode 100644
index 000000000..e29b13851
--- /dev/null
+++ b/app/src/debug/AndroidManifest.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools">
+
+  <application tools:ignore="GoogleAppIndexingWarning">
+
+    <activity
+      android:exported="true"
+      android:name="com.facebook.flipper.android.diagnostics.FlipperDiagnosticActivity"/>
+
+  </application>
+
+</manifest>
diff --git a/app/src/debug/java/org/tasks/BuildSetup.java b/app/src/debug/java/org/tasks/BuildSetup.java
index 5779ab20e..03f993655 100644
--- a/app/src/debug/java/org/tasks/BuildSetup.java
+++ b/app/src/debug/java/org/tasks/BuildSetup.java
@@ -32,8 +32,9 @@ public class BuildSetup {
   public boolean setup() {
     Timber.plant(new Timber.DebugTree());
     Application application = (Application) context.getApplicationContext();
+    SoLoader.init(application, false);
+
     if (preferences.getBoolean(R.string.p_flipper, false) && FlipperUtils.shouldEnableFlipper(context)) {
-      SoLoader.init(application, false);
       FlipperClient client = AndroidFlipperClient.getInstance(application);
       client.addPlugin(new InspectorFlipperPlugin(application, DescriptorMapping.withDefaults()));
       client.addPlugin(new DatabasesFlipperPlugin(application));