filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code review

Browse Source
This commit is contained in:
Valere 2021-09-15 09:30:40 +02:00
parent 2c1435f08c
commit 70ebb3a3f2
6 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
View File

@ -78,7 +78,7 @@ internal class DefaultSpaceService @Inject constructor(
if (isPublic) { if (isPublic) {
this.roomAliasName = roomAliasLocalPart this.roomAliasName = roomAliasLocalPart
this.powerLevelContentOverride = (powerLevelContentOverride ?: PowerLevelsContent()).copy( this.powerLevelContentOverride = (powerLevelContentOverride ?: PowerLevelsContent()).copy(
invite = if (isPublic) 0 else Role.Moderator.value invite = if (isPublic) Role.Default.value else Role.Moderator.value
) )
this.preset = CreateRoomPreset.PRESET_PUBLIC_CHAT this.preset = CreateRoomPreset.PRESET_PUBLIC_CHAT
this.historyVisibility = RoomHistoryVisibility.WORLD_READABLE this.historyVisibility = RoomHistoryVisibility.WORLD_READABLE

1
vector/src/main/java/im/vector/app/features/roomprofile/permissions/EditablePermission.kt
View File

@ -77,6 +77,7 @@ sealed class EditablePermission(@StringRes val labelResId: Int, @StringRes val s
class UpgradeTheRoom : EventTypeEditablePermission( class UpgradeTheRoom : EventTypeEditablePermission(
EventType.STATE_ROOM_TOMBSTONE, EventType.STATE_ROOM_TOMBSTONE,
R.string.room_permissions_upgrade_the_room,
R.string.room_permissions_upgrade_the_space R.string.room_permissions_upgrade_the_space
) )

2
vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModelTask.kt
View File

@ -75,7 +75,7 @@ class CreateSpaceViewModelTask @Inject constructor(
if (params.isPublic) { if (params.isPublic) {
this.roomAliasName = params.spaceAlias this.roomAliasName = params.spaceAlias
this.powerLevelContentOverride = (powerLevelContentOverride ?: PowerLevelsContent()).copy( this.powerLevelContentOverride = (powerLevelContentOverride ?: PowerLevelsContent()).copy(
invite = 0 invite = Role.Default.value
) )
this.preset = CreateRoomPreset.PRESET_PUBLIC_CHAT this.preset = CreateRoomPreset.PRESET_PUBLIC_CHAT
this.historyVisibility = RoomHistoryVisibility.WORLD_READABLE this.historyVisibility = RoomHistoryVisibility.WORLD_READABLE

14
vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageSharedViewModel.kt
View File

@ -48,16 +48,16 @@ class SpaceManageSharedViewModel @AssistedInject constructor(
override fun handle(action: SpaceManagedSharedAction) { override fun handle(action: SpaceManagedSharedAction) {
when (action) { when (action) {
SpaceManagedSharedAction.HandleBack -> { SpaceManagedSharedAction.HandleBack -> {
// for now finish // for now finish
_viewEvents.post(SpaceManagedSharedViewEvents.Finish) _viewEvents.post(SpaceManagedSharedViewEvents.Finish)
} }
SpaceManagedSharedAction.HideLoading -> _viewEvents.post(SpaceManagedSharedViewEvents.HideLoading) SpaceManagedSharedAction.HideLoading -> _viewEvents.post(SpaceManagedSharedViewEvents.HideLoading)
SpaceManagedSharedAction.ShowLoading -> _viewEvents.post(SpaceManagedSharedViewEvents.ShowLoading) SpaceManagedSharedAction.ShowLoading -> _viewEvents.post(SpaceManagedSharedViewEvents.ShowLoading)
SpaceManagedSharedAction.CreateRoom -> _viewEvents.post(SpaceManagedSharedViewEvents.NavigateToCreateRoom) SpaceManagedSharedAction.CreateRoom -> _viewEvents.post(SpaceManagedSharedViewEvents.NavigateToCreateRoom)
SpaceManagedSharedAction.ManageRooms -> _viewEvents.post(SpaceManagedSharedViewEvents.NavigateToManageRooms) SpaceManagedSharedAction.ManageRooms -> _viewEvents.post(SpaceManagedSharedViewEvents.NavigateToManageRooms)
SpaceManagedSharedAction.OpenSpaceAliasesSettings -> _viewEvents.post(SpaceManagedSharedViewEvents.NavigateToAliasSettings) SpaceManagedSharedAction.OpenSpaceAliasesSettings -> _viewEvents.post(SpaceManagedSharedViewEvents.NavigateToAliasSettings)
SpaceManagedSharedAction.OpenRoomPermissionSettings -> _viewEvents.post(SpaceManagedSharedViewEvents.NavigateToPermissionSettings) SpaceManagedSharedAction.OpenSpacePermissionSettings -> _viewEvents.post(SpaceManagedSharedViewEvents.NavigateToPermissionSettings)
} }
} }
} }

2
vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManagedSharedAction.kt
View File

@ -25,5 +25,5 @@ sealed class SpaceManagedSharedAction : VectorViewModelAction {
object CreateRoom : SpaceManagedSharedAction() object CreateRoom : SpaceManagedSharedAction()
object ManageRooms : SpaceManagedSharedAction() object ManageRooms : SpaceManagedSharedAction()
object OpenSpaceAliasesSettings : SpaceManagedSharedAction() object OpenSpaceAliasesSettings : SpaceManagedSharedAction()
object OpenRoomPermissionSettings : SpaceManagedSharedAction() object OpenSpacePermissionSettings : SpaceManagedSharedAction()
} }

2
vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsFragment.kt
View File

@ -238,7 +238,7 @@ class SpaceSettingsFragment @Inject constructor(
} }
override fun onRoomPermissionsClicked() { override fun onRoomPermissionsClicked() {
sharedViewModel.handle(SpaceManagedSharedAction.OpenRoomPermissionSettings) sharedViewModel.handle(SpaceManagedSharedAction.OpenSpacePermissionSettings)
} }
override fun onImageReady(uri: Uri?) { override fun onImageReady(uri: Uri?) {