From 96d7e4859b8b5d62b14fb7e331f46a7093d83cf7 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Tue, 8 Mar 2022 18:41:10 +0100
Subject: [PATCH] Revert "[TMP] Force-disable "open at first unread" setting"

This reverts commit f06ae844dcfcf0768248139a75d466e341e07fa6.

Change-Id: I12111941fc71b9f7e49742e52f9a212382a44b7b
---
 .../java/im/vector/app/features/settings/VectorPreferences.kt  | 3 +--
 vector/src/main/res/xml/vector_settings_labs.xml               | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
index 66e6671fd7..83d2122479 100755
--- a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
@@ -1034,8 +1034,7 @@ class VectorPreferences @Inject constructor(private val context: Context, privat
 
     // SC addition
     fun loadRoomAtFirstUnread(): Boolean {
-        // https://github.com/vector-im/element-android/issues/5092
-        return false // defaultPrefs.getBoolean(SETTINGS_OPEN_CHATS_AT_FIRST_UNREAD, false)
+        return defaultPrefs.getBoolean(SETTINGS_OPEN_CHATS_AT_FIRST_UNREAD, false)
     }
 
     // Element removed this, SC added it back (but this time, default to true)
diff --git a/vector/src/main/res/xml/vector_settings_labs.xml b/vector/src/main/res/xml/vector_settings_labs.xml
index b63f74499e..f43c75a81b 100644
--- a/vector/src/main/res/xml/vector_settings_labs.xml
+++ b/vector/src/main/res/xml/vector_settings_labs.xml
@@ -35,7 +35,6 @@
     <!--android:title="@string/settings_labs_enable_send_voice" />-->
 
     <im.vector.app.core.preference.VectorSwitchPreference
-        android:enabled="false"
         android:defaultValue="false"
         android:key="SETTINGS_OPEN_CHATS_AT_FIRST_UNREAD"
         android:title="@string/settings_open_chats_at_first_unread"