From 8587611b779f8d573c40f86a605569e457b6b1c4 Mon Sep 17 00:00:00 2001
From: Vishesh Handa <me@vhanda.in>
Date: Sat, 25 Jan 2020 14:05:02 +0100
Subject: [PATCH] android: Fix bug where note contents disappear if app is
 switched

Workaround for bug https://github.com/flutter/flutter/issues/47628
---
 android/app/src/main/AndroidManifest.xml              |  1 -
 .../java/io/gitjournal/gitjournal/MainActivity.java   | 11 ++++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 99372f4e..09c3c110 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -50,6 +50,5 @@
 
         <meta-data android:name="google_analytics_adid_collection_enabled" android:value="false" />
         <meta-data android:name="firebase_analytics_collection_enabled" android:value="false" />
-        <meta-data android:name="flutterEmbedding" android:value="2" />
     </application>
 </manifest>
diff --git a/android/app/src/main/java/io/gitjournal/gitjournal/MainActivity.java b/android/app/src/main/java/io/gitjournal/gitjournal/MainActivity.java
index f19ae93c..7e7273d2 100644
--- a/android/app/src/main/java/io/gitjournal/gitjournal/MainActivity.java
+++ b/android/app/src/main/java/io/gitjournal/gitjournal/MainActivity.java
@@ -20,18 +20,19 @@ import io.flutter.plugin.common.MethodChannel.Result;
 import io.flutter.plugins.GeneratedPluginRegistrant;
 import io.flutter.util.PathUtils;
 
-import io.flutter.embedding.android.FlutterActivity;
-import io.flutter.embedding.engine.FlutterEngine;
+import io.flutter.app.FlutterActivity;
+import io.flutter.plugins.GeneratedPluginRegistrant;
 
 public class MainActivity extends FlutterActivity implements MethodCallHandler {
     private static final String CHANNEL_NAME = "gitjournal.io/git";
     static MethodChannel channel;
 
     @Override
-    public void configureFlutterEngine(@NonNull FlutterEngine flutterEngine) {
-        GeneratedPluginRegistrant.registerWith(flutterEngine);
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        GeneratedPluginRegistrant.registerWith(this);
 
-        channel = new MethodChannel(flutterEngine.getDartExecutor().getBinaryMessenger(), CHANNEL_NAME);
+        channel = new MethodChannel(getFlutterView(), CHANNEL_NAME);
         channel.setMethodCallHandler(this);
     }