Skip to content

Commit 6266b20

Browse files
committed
removing legacy migration flag from 12 months ago
1 parent bdc3704 commit 6266b20

File tree

1 file changed

+1
-22
lines changed

1 file changed

+1
-22
lines changed

vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,6 @@ class VectorPreferences @Inject constructor(
158158
private const val SETTINGS_ENABLE_SEND_VOICE_FEATURE_PREFERENCE_KEY = "SETTINGS_ENABLE_SEND_VOICE_FEATURE_PREFERENCE_KEY"
159159

160160
const val SETTINGS_LABS_ALLOW_EXTENDED_LOGS = "SETTINGS_LABS_ALLOW_EXTENDED_LOGS"
161-
const val SETTINGS_LABS_SPACES_HOME_AS_ORPHAN = "SETTINGS_LABS_SPACES_HOME_AS_ORPHAN"
162161
const val SETTINGS_LABS_AUTO_REPORT_UISI = "SETTINGS_LABS_AUTO_REPORT_UISI"
163162
const val SETTINGS_PREF_SPACE_SHOW_ALL_ROOM_IN_HOME = "SETTINGS_PREF_SPACE_SHOW_ALL_ROOM_IN_HOME"
164163

@@ -1025,27 +1024,7 @@ class VectorPreferences @Inject constructor(
10251024
}
10261025

10271026
fun prefSpacesShowAllRoomInHome(): Boolean {
1028-
val defaultValue = false
1029-
return when {
1030-
defaultPrefs.contains(SETTINGS_PREF_SPACE_SHOW_ALL_ROOM_IN_HOME) -> {
1031-
defaultPrefs.getBoolean(SETTINGS_PREF_SPACE_SHOW_ALL_ROOM_IN_HOME, defaultValue)
1032-
}
1033-
defaultPrefs.contains(SETTINGS_LABS_SPACES_HOME_AS_ORPHAN) -> migrateOrphansInSpacesToShowAllInHome()
1034-
else -> defaultValue
1035-
}
1036-
}
1037-
1038-
private fun migrateOrphansInSpacesToShowAllInHome(): Boolean {
1039-
val showAllRoomsInHome = !labsSpacesOnlyOrphansInHome()
1040-
defaultPrefs.edit {
1041-
putBoolean(SETTINGS_PREF_SPACE_SHOW_ALL_ROOM_IN_HOME, showAllRoomsInHome)
1042-
remove(SETTINGS_LABS_SPACES_HOME_AS_ORPHAN)
1043-
}
1044-
return showAllRoomsInHome
1045-
}
1046-
1047-
private fun labsSpacesOnlyOrphansInHome(): Boolean {
1048-
return defaultPrefs.getBoolean(SETTINGS_LABS_SPACES_HOME_AS_ORPHAN, false)
1027+
return defaultPrefs.getBoolean(SETTINGS_PREF_SPACE_SHOW_ALL_ROOM_IN_HOME, false)
10491028
}
10501029

10511030
/*

0 commit comments

Comments
 (0)