From e21c8792e61cff0b47db8c1d021a21d07d890b40 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 29 Dec 2020 12:20:24 +0100
Subject: [PATCH] Fix switch theme issue, and white field issue (#2599, #2528)
 Remove some workarounds. I cannot reproduce the bug of signout which does not
 destroy the HomeActivityViewModel...

---
 CHANGES.md                                                  | 2 ++
 vector/src/main/AndroidManifest.xml                         | 3 +--
 vector/src/main/java/im/vector/app/features/MainActivity.kt | 2 --
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 8a69aea6fd..a474ef6711 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -16,6 +16,8 @@ Bugfix 🐛:
  - Hiding membership events works the exact opposite (#2603)
  - Tapping drawer having more than 1 room in notifications gives "malformed link" error (#2605)
  - Initial sync is not retried correctly when there is some network error. (#2632)
+ - Fix switch theme issue, and white field issue (#2599, #2528)
+
 Translations 🗣:
  -
 
diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index 4ad51fdea7..0341059674 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -82,8 +82,7 @@
         </activity-alias>
 
         <activity
-            android:name=".features.home.HomeActivity"
-            android:launchMode="singleTask" />
+            android:name=".features.home.HomeActivity" />
         <activity
             android:name=".features.login.LoginActivity"
             android:launchMode="singleTask"
diff --git a/vector/src/main/java/im/vector/app/features/MainActivity.kt b/vector/src/main/java/im/vector/app/features/MainActivity.kt
index c29baac4ec..cb7be9ee3b 100644
--- a/vector/src/main/java/im/vector/app/features/MainActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/MainActivity.kt
@@ -79,8 +79,6 @@ class MainActivity : VectorBaseActivity<FragmentLoadingBinding>(), UnlockedActiv
 
             intent.putExtra(EXTRA_ARGS, args)
             activity.startActivity(intent)
-            // Ensure all the Activities are destroyed, it seems that the intent flags are not enough now.
-            activity.finishAffinity()
         }
     }