mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-10-25 12:17:25 +03:00
Code Issues Projects Releases Packages Wiki Activity

Latest cleanup before merging to develop

Browse source
This commit is contained in:
Benoit Marty 2021-04-28 16:55:09 +02:00
parent 8c1afbaa66
commit b2e6b3f0db
2 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
View file

@ -144,24 +144,22 @@ class RoomSettingsController @Inject constructor(
} }
private fun RoomSettingsViewState.getJoinRuleWording(): String { private fun RoomSettingsViewState.getJoinRuleWording(): String {
val joinRule = newRoomJoinRules.newJoinRules ?: currentRoomJoinRules return when (val joinRule = newRoomJoinRules.newJoinRules ?: currentRoomJoinRules) {
val resId = when (joinRule) { RoomJoinRules.INVITE -> {
RoomJoinRules.INVITE -> { stringProvider.getString(R.string.room_settings_room_access_private_title)
R.string.room_settings_room_access_private_title to null
} }
RoomJoinRules.PUBLIC -> { RoomJoinRules.PUBLIC -> {
R.string.room_settings_room_access_public_title to null stringProvider.getString(R.string.room_settings_room_access_public_title)
} }
RoomJoinRules.KNOCK -> { RoomJoinRules.KNOCK -> {
R.string.room_settings_room_access_entry_knock to null stringProvider.getString(R.string.room_settings_room_access_entry_knock)
} }
RoomJoinRules.RESTRICTED -> { RoomJoinRules.RESTRICTED -> {
R.string.room_settings_room_access_restricted_title to null stringProvider.getString(R.string.room_settings_room_access_restricted_title)
} }
else -> { else -> {
R.string.room_settings_room_access_entry_unknown to joinRule.value stringProvider.getString(R.string.room_settings_room_access_entry_unknown, joinRule.value)
} }
} }
return if (resId.second == null) stringProvider.getString(resId.first) else stringProvider.getString(resId.first, resId.second)
} }
} }

2
vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt
View file

@ -72,7 +72,7 @@ class SharedPreferencesUiStateRepository @Inject constructor(
} }
override fun storeGroupingMethod(isSpace: Boolean, sessionId: String) { override fun storeGroupingMethod(isSpace: Boolean, sessionId: String) {
sharedPreferences.edit(true) { sharedPreferences.edit {
putBoolean("$KEY_SELECTED_METHOD@$sessionId", isSpace) putBoolean("$KEY_SELECTED_METHOD@$sessionId", isSpace)
} }
} }