From c3f16c24289f0ea1b6f72d94824b46640d966736 Mon Sep 17 00:00:00 2001
From: Alexander Bakker <ab@alexbakker.me>
Date: Wed, 13 Dec 2017 16:39:03 +0100
Subject: [PATCH] Fix an issue with duplicate activities on rotation

---
 app/src/main/AndroidManifest.xml                  | 7 +++++--
 app/src/main/java/me/impy/aegis/MainActivity.java | 5 +++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 001c8dfc..2147dc33 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -31,9 +31,12 @@
         </activity>
         <activity
             android:name=".IntroActivity"
-            android:theme="@style/Theme.Intro">
+            android:theme="@style/Theme.Intro"
+            android:launchMode="singleTop">
         </activity>
-        <activity android:name=".AuthActivity">
+        <activity
+            android:name=".AuthActivity"
+            android:launchMode="singleTop">
         </activity>
         <activity android:name=".PreferencesActivity">
         </activity>
diff --git a/app/src/main/java/me/impy/aegis/MainActivity.java b/app/src/main/java/me/impy/aegis/MainActivity.java
index 21a75917..7e7e383b 100644
--- a/app/src/main/java/me/impy/aegis/MainActivity.java
+++ b/app/src/main/java/me/impy/aegis/MainActivity.java
@@ -339,6 +339,11 @@ public class MainActivity extends AppCompatActivity implements KeyProfileAdapter
         intent.removeExtra("Action");
     }
 
+    public void startActivityForResult(Intent intent, int requestCode) {
+        intent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+        super.startActivityForResult(intent, requestCode);
+    }
+
     @Override
     protected void onResume() {
         super.onResume();