removing legacy migration flag from 12 months ago

element-hq · Jul 12, 2022 · 6266b20 · 6266b20
1 parent bdc3704
commit 6266b20
Showing 1 changed file with 1 addition and 22 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
@@ -158,7 +158,6 @@ class VectorPreferences @Inject constructor(
         private const val SETTINGS_ENABLE_SEND_VOICE_FEATURE_PREFERENCE_KEY = "SETTINGS_ENABLE_SEND_VOICE_FEATURE_PREFERENCE_KEY"
 
         const val SETTINGS_LABS_ALLOW_EXTENDED_LOGS = "SETTINGS_LABS_ALLOW_EXTENDED_LOGS"
-        const val SETTINGS_LABS_SPACES_HOME_AS_ORPHAN = "SETTINGS_LABS_SPACES_HOME_AS_ORPHAN"
         const val SETTINGS_LABS_AUTO_REPORT_UISI = "SETTINGS_LABS_AUTO_REPORT_UISI"
         const val SETTINGS_PREF_SPACE_SHOW_ALL_ROOM_IN_HOME = "SETTINGS_PREF_SPACE_SHOW_ALL_ROOM_IN_HOME"
 
@@ -1025,27 +1024,7 @@ class VectorPreferences @Inject constructor(
     }
 
     fun prefSpacesShowAllRoomInHome(): Boolean {
-        val defaultValue = false
-        return when {
-            defaultPrefs.contains(SETTINGS_PREF_SPACE_SHOW_ALL_ROOM_IN_HOME) -> {
-                defaultPrefs.getBoolean(SETTINGS_PREF_SPACE_SHOW_ALL_ROOM_IN_HOME, defaultValue)
-            }
-            defaultPrefs.contains(SETTINGS_LABS_SPACES_HOME_AS_ORPHAN) -> migrateOrphansInSpacesToShowAllInHome()
-            else -> defaultValue
-        }
-    }
-
-    private fun migrateOrphansInSpacesToShowAllInHome(): Boolean {
-        val showAllRoomsInHome = !labsSpacesOnlyOrphansInHome()
-        defaultPrefs.edit {
-            putBoolean(SETTINGS_PREF_SPACE_SHOW_ALL_ROOM_IN_HOME, showAllRoomsInHome)
-            remove(SETTINGS_LABS_SPACES_HOME_AS_ORPHAN)
-        }
-        return showAllRoomsInHome
-    }
-
-    private fun labsSpacesOnlyOrphansInHome(): Boolean {
-        return defaultPrefs.getBoolean(SETTINGS_LABS_SPACES_HOME_AS_ORPHAN, false)
+        return defaultPrefs.getBoolean(SETTINGS_PREF_SPACE_SHOW_ALL_ROOM_IN_HOME, false)
     }
 
     /*