From 4222c7c7c4c3d741c801ded89f94e561c54e44c1 Mon Sep 17 00:00:00 2001
From: NIkita Fedrunov <fedrunov@element.io>
Date: Thu, 8 Sep 2022 16:24:34 +0200
Subject: [PATCH] changed to only restart home activity when resumed with
 different app layout flag state

---
 .../src/main/java/im/vector/app/features/home/HomeActivity.kt   | 2 +-
 .../vector/app/features/settings/VectorSettingsLabsFragment.kt  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
index 8a624b23d9..1d4cbd8427 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
@@ -582,7 +582,7 @@ class HomeActivity :
     }
 
     private fun checkNewAppLayoutFlagChange() {
-        if (buildMeta.isDebug && vectorPreferences.isNewAppLayoutEnabled() != isNewAppLayoutEnabled) {
+        if (vectorPreferences.isNewAppLayoutEnabled() != isNewAppLayoutEnabled) {
             restart()
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
index 9be3d47fc8..18bc35f72a 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
@@ -138,6 +138,6 @@ class VectorSettingsLabsFragment :
      * Action when new layout preference switch is actually clicked.
      */
     private fun onNewLayoutPreferenceClicked() {
-        MainActivity.restartApp(requireActivity(), MainActivityArgs(clearCache = true))
+        configureUnreadNotificationsAsTabPreference()
     }
 }