Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change default power to invite in private space + setting #4001

Merged
merged 2 commits into from
Sep 15, 2021
Merged

Change default power to invite in private space + setting #4001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c1435f
Change default power to invite in private space + setting
BillCarsonFr Sep 10, 2021
70ebb3a
Code review
BillCarsonFr Sep 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/3951.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
"Non-Admin" user able to invite others to Private Space (by default)
3 changes: 2 additions & 1 deletion ...ndroid/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import org.matrix.android.sdk.api.session.room.model.RoomSummary
import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
import org.matrix.android.sdk.api.session.room.model.create.CreateRoomPreset
import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
import org.matrix.android.sdk.api.session.room.powerlevels.Role
import org.matrix.android.sdk.api.session.space.CreateSpaceParams
import org.matrix.android.sdk.api.session.space.JoinSpaceResult
import org.matrix.android.sdk.api.session.space.Space
Expand Down Expand Up @@ -77,7 +78,7 @@ internal class DefaultSpaceService @Inject constructor(
if (isPublic) {
this.roomAliasName = roomAliasLocalPart
this.powerLevelContentOverride = (powerLevelContentOverride ?: PowerLevelsContent()).copy(
invite = 0
invite = if (isPublic) Role.Default.value else Role.Moderator.value
)
this.preset = CreateRoomPreset.PRESET_PUBLIC_CHAT
this.historyVisibility = RoomHistoryVisibility.WORLD_READABLE
Expand Down
22 changes: 15 additions & 7 deletions vector/src/main/java/im/vector/app/features/roomprofile/permissions/EditablePermission.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,12 @@ import org.matrix.android.sdk.api.session.events.model.EventType
/**
* Change on each permission has an effect on the power level event. Try to sort the effect by category.
*/
sealed class EditablePermission(@StringRes val labelResId: Int) {
sealed class EditablePermission(@StringRes val labelResId: Int, @StringRes val spaceLabelResId: Int = labelResId) {
// Updates `content.events.[eventType]`
open class EventTypeEditablePermission(val eventType: String, @StringRes labelResId: Int) : EditablePermission(labelResId)
open class EventTypeEditablePermission(val eventType: String,
@StringRes labelResId: Int,
@StringRes spaceLabelResId: Int = labelResId
) : EditablePermission(labelResId, spaceLabelResId)

class ModifyWidgets : EventTypeEditablePermission(
// Note: Element Web still use legacy value
Expand All @@ -35,17 +38,20 @@ sealed class EditablePermission(@StringRes val labelResId: Int) {

class ChangeRoomAvatar : EventTypeEditablePermission(
EventType.STATE_ROOM_AVATAR,
R.string.room_permissions_change_room_avatar
R.string.room_permissions_change_room_avatar,
R.string.room_permissions_change_space_avatar
)

class ChangeMainAddressForTheRoom : EventTypeEditablePermission(
EventType.STATE_ROOM_CANONICAL_ALIAS,
R.string.room_permissions_change_main_address_for_the_room
R.string.room_permissions_change_main_address_for_the_room,
R.string.room_permissions_change_main_address_for_the_space
)

class EnableRoomEncryption : EventTypeEditablePermission(
EventType.STATE_ROOM_ENCRYPTION,
R.string.room_permissions_enable_room_encryption
R.string.room_permissions_enable_room_encryption,
R.string.room_permissions_enable_space_encryption
)

class ChangeHistoryVisibility : EventTypeEditablePermission(
Expand All @@ -55,7 +61,8 @@ sealed class EditablePermission(@StringRes val labelResId: Int) {

class ChangeRoomName : EventTypeEditablePermission(
EventType.STATE_ROOM_NAME,
R.string.room_permissions_change_room_name
R.string.room_permissions_change_room_name,
R.string.room_permissions_change_space_name
)

class ChangePermissions : EventTypeEditablePermission(
Expand All @@ -70,7 +77,8 @@ sealed class EditablePermission(@StringRes val labelResId: Int) {

class UpgradeTheRoom : EventTypeEditablePermission(
EventType.STATE_ROOM_TOMBSTONE,
R.string.room_permissions_upgrade_the_room
R.string.room_permissions_upgrade_the_room,
R.string.room_permissions_upgrade_the_space
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess you wanted to write:

R.string.room_permissions_upgrade_the_room,
R.string.room_permissions_upgrade_the_space

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thx, good catch

)

class ChangeTopic : EventTypeEditablePermission(
Expand Down
59 changes: 54 additions & 5 deletions ...src/main/java/im/vector/app/features/roomprofile/permissions/RoomPermissionsController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import im.vector.app.core.resources.StringProvider
import im.vector.app.features.discovery.settingsInfoItem
import im.vector.app.features.form.formAdvancedToggleItem
import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
import org.matrix.android.sdk.api.session.room.model.RoomType
import org.matrix.android.sdk.api.session.room.model.banOrDefault
import org.matrix.android.sdk.api.session.room.model.eventsDefaultOrDefault
import org.matrix.android.sdk.api.session.room.model.inviteOrDefault
Expand Down Expand Up @@ -57,6 +58,13 @@ class RoomPermissionsController @Inject constructor(
EditablePermission.ChangeTopic()
)

private val usefulEditablePermissionsForSpace = listOf(
EditablePermission.ChangeRoomAvatar(),
EditablePermission.ChangeRoomName(),
EditablePermission.ChangeTopic(),
EditablePermission.InviteUsers()
)

private val advancedEditablePermissions = listOf(
EditablePermission.ChangeMainAddressForTheRoom(),

Expand All @@ -79,6 +87,27 @@ class RoomPermissionsController @Inject constructor(
EditablePermission.UpgradeTheRoom()
)

private val advancedEditablePermissionsForSpace = listOf(
EditablePermission.ChangeMainAddressForTheRoom(),

EditablePermission.DefaultRole(),
EditablePermission.KickUsers(),
EditablePermission.BanUsers(),

EditablePermission.SendMessages(),

EditablePermission.RemoveMessagesSentByOthers(),
EditablePermission.NotifyEveryone(),

EditablePermission.ChangeSettings(),
// EditablePermission.ModifyWidgets(),
EditablePermission.ChangeHistoryVisibility(),
EditablePermission.ChangePermissions(),
EditablePermission.SendRoomServerAclEvents(),
// EditablePermission.EnableRoomEncryption(),
EditablePermission.UpgradeTheRoom()
)

init {
setData(null)
}
Expand All @@ -103,13 +132,24 @@ class RoomPermissionsController @Inject constructor(
private fun buildPermissions(data: RoomPermissionsViewState, content: PowerLevelsContent) {
val host = this
val editable = data.actionPermissions.canChangePowerLevels
val isSpace = data.roomSummary.invoke()?.roomType == RoomType.SPACE

settingsInfoItem {
id("notice")
helperText(host.stringProvider.getString(if (editable) R.string.room_permissions_notice else R.string.room_permissions_notice_read_only))
helperText(host.stringProvider.getString(
if (editable) {
if (isSpace) R.string.space_permissions_notice else R.string.room_permissions_notice
} else {
if (isSpace) R.string.space_permissions_notice_read_only else R.string.room_permissions_notice_read_only
}))
}

// Useful permissions
usefulEditablePermissions.forEach { buildPermission(it, content, editable) }
if (isSpace) {
usefulEditablePermissionsForSpace.forEach { buildPermission(it, content, editable, true) }
} else {
usefulEditablePermissions.forEach { buildPermission(it, content, editable, false) }
}

// Toggle
formAdvancedToggleItem {
Expand All @@ -121,15 +161,24 @@ class RoomPermissionsController @Inject constructor(

// Advanced permissions
if (data.showAdvancedPermissions) {
advancedEditablePermissions.forEach { buildPermission(it, content, editable) }
if (isSpace) {
advancedEditablePermissionsForSpace.forEach { buildPermission(it, content, editable, true) }
} else {
advancedEditablePermissions.forEach { buildPermission(it, content, editable, false) }
}
}
}

private fun buildPermission(editablePermission: EditablePermission, content: PowerLevelsContent, editable: Boolean) {
private fun buildPermission(editablePermission: EditablePermission,
content: PowerLevelsContent,
editable: Boolean,
isSpace: Boolean) {
val currentRole = getCurrentRole(editablePermission, content)
buildProfileAction(
id = editablePermission.labelResId.toString(),
title = stringProvider.getString(editablePermission.labelResId),
title = stringProvider.getString(
if (isSpace) editablePermission.spaceLabelResId else editablePermission.labelResId
),
subtitle = roleFormatter.format(currentRole),
divider = true,
editable = editable,
Expand Down
2 changes: 1 addition & 1 deletion vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ class CreateSpaceViewModel @AssistedInject constructor(
)
)
when (result) {
is CreateSpaceTaskResult.Success -> {
is CreateSpaceTaskResult.Success -> {
setState {
copy(creationResult = Success(result.spaceId))
}
Expand Down
7 changes: 6 additions & 1 deletion vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModelTask.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ import org.matrix.android.sdk.api.session.room.model.RoomJoinRulesAllowEntry
import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
import org.matrix.android.sdk.api.session.room.model.create.CreateRoomPreset
import org.matrix.android.sdk.api.session.room.model.create.RestrictedRoomPreset

import org.matrix.android.sdk.api.session.room.powerlevels.Role
import org.matrix.android.sdk.api.session.space.CreateSpaceParams
import timber.log.Timber
import javax.inject.Inject
Expand Down Expand Up @@ -73,7 +75,7 @@ class CreateSpaceViewModelTask @Inject constructor(
if (params.isPublic) {
this.roomAliasName = params.spaceAlias
this.powerLevelContentOverride = (powerLevelContentOverride ?: PowerLevelsContent()).copy(
invite = 0
invite = Role.Default.value
)
this.preset = CreateRoomPreset.PRESET_PUBLIC_CHAT
this.historyVisibility = RoomHistoryVisibility.WORLD_READABLE
Expand All @@ -86,6 +88,9 @@ class CreateSpaceViewModelTask @Inject constructor(
ThreePid.Email(it)
}
)
this.powerLevelContentOverride = (powerLevelContentOverride ?: PowerLevelsContent()).copy(
invite = Role.Moderator.value
)
}
})
} catch (failure: Throwable) {
Expand Down
27 changes: 18 additions & 9 deletions vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ import android.content.Context
import android.content.Intent
import android.os.Bundle
import android.os.Parcelable
import com.google.android.material.appbar.MaterialToolbar
import androidx.core.view.isGone
import androidx.core.view.isVisible
import com.airbnb.mvrx.MvRx
import com.airbnb.mvrx.viewModel
import com.airbnb.mvrx.withState
import com.google.android.material.appbar.MaterialToolbar
import im.vector.app.R
import im.vector.app.core.di.ScreenComponent
import im.vector.app.core.extensions.addFragmentToBackstack
Expand All @@ -40,6 +40,7 @@ import im.vector.app.features.roomdirectory.createroom.CreateRoomArgs
import im.vector.app.features.roomdirectory.createroom.CreateRoomFragment
import im.vector.app.features.roomprofile.RoomProfileArgs
import im.vector.app.features.roomprofile.alias.RoomAliasFragment
import im.vector.app.features.roomprofile.permissions.RoomPermissionsFragment
import kotlinx.parcelize.Parcelize
import javax.inject.Inject

Expand Down Expand Up @@ -98,7 +99,7 @@ class SpaceManageActivity : VectorBaseActivity<ActivitySimpleLoadingBinding>(),
if (isFirstCreation()) {
withState(sharedViewModel) {
when (it.manageType) {
ManageType.AddRooms -> {
ManageType.AddRooms -> {
val simpleName = SpaceAddRoomFragment::class.java.simpleName
if (supportFragmentManager.findFragmentByTag(simpleName) == null) {
supportFragmentManager.commitTransaction {
Expand All @@ -110,7 +111,7 @@ class SpaceManageActivity : VectorBaseActivity<ActivitySimpleLoadingBinding>(),
}
}
}
ManageType.Settings -> {
ManageType.Settings -> {
val simpleName = SpaceSettingsFragment::class.java.simpleName
if (supportFragmentManager.findFragmentByTag(simpleName) == null && args?.spaceId != null) {
supportFragmentManager.commitTransaction {
Expand All @@ -131,23 +132,23 @@ class SpaceManageActivity : VectorBaseActivity<ActivitySimpleLoadingBinding>(),

sharedViewModel.observeViewEvents {
when (it) {
SpaceManagedSharedViewEvents.Finish -> {
SpaceManagedSharedViewEvents.Finish -> {
finish()
}
SpaceManagedSharedViewEvents.HideLoading -> {
SpaceManagedSharedViewEvents.HideLoading -> {
hideWaitingView()
}
SpaceManagedSharedViewEvents.ShowLoading -> {
SpaceManagedSharedViewEvents.ShowLoading -> {
showWaitingView()
}
SpaceManagedSharedViewEvents.NavigateToCreateRoom -> {
SpaceManagedSharedViewEvents.NavigateToCreateRoom -> {
addFragmentToBackstack(
R.id.simpleFragmentContainer,
CreateRoomFragment::class.java,
CreateRoomArgs("", parentSpaceId = args?.spaceId)
)
}
SpaceManagedSharedViewEvents.NavigateToManageRooms -> {
SpaceManagedSharedViewEvents.NavigateToManageRooms -> {
args?.spaceId?.let { spaceId ->
addFragmentToBackstack(
R.id.simpleFragmentContainer,
Expand All @@ -156,7 +157,7 @@ class SpaceManageActivity : VectorBaseActivity<ActivitySimpleLoadingBinding>(),
)
}
}
SpaceManagedSharedViewEvents.NavigateToAliasSettings -> {
SpaceManagedSharedViewEvents.NavigateToAliasSettings -> {
args?.spaceId?.let { spaceId ->
addFragmentToBackstack(
R.id.simpleFragmentContainer,
Expand All @@ -165,6 +166,14 @@ class SpaceManageActivity : VectorBaseActivity<ActivitySimpleLoadingBinding>(),
)
}
}
SpaceManagedSharedViewEvents.NavigateToPermissionSettings -> {
args?.spaceId?.let { spaceId ->
addFragmentToBackstack(
R.id.simpleFragmentContainer, RoomPermissionsFragment::class.java,
RoomProfileArgs(spaceId)
)
}
}
}
}
}
Expand Down
13 changes: 7 additions & 6 deletions vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageSharedViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,16 @@ class SpaceManageSharedViewModel @AssistedInject constructor(

override fun handle(action: SpaceManagedSharedAction) {
when (action) {
SpaceManagedSharedAction.HandleBack -> {
SpaceManagedSharedAction.HandleBack -> {
// for now finish
_viewEvents.post(SpaceManagedSharedViewEvents.Finish)
}
SpaceManagedSharedAction.HideLoading -> _viewEvents.post(SpaceManagedSharedViewEvents.HideLoading)
SpaceManagedSharedAction.ShowLoading -> _viewEvents.post(SpaceManagedSharedViewEvents.ShowLoading)
SpaceManagedSharedAction.CreateRoom -> _viewEvents.post(SpaceManagedSharedViewEvents.NavigateToCreateRoom)
SpaceManagedSharedAction.ManageRooms -> _viewEvents.post(SpaceManagedSharedViewEvents.NavigateToManageRooms)
SpaceManagedSharedAction.OpenSpaceAliasesSettings -> _viewEvents.post(SpaceManagedSharedViewEvents.NavigateToAliasSettings)
SpaceManagedSharedAction.HideLoading -> _viewEvents.post(SpaceManagedSharedViewEvents.HideLoading)
SpaceManagedSharedAction.ShowLoading -> _viewEvents.post(SpaceManagedSharedViewEvents.ShowLoading)
SpaceManagedSharedAction.CreateRoom -> _viewEvents.post(SpaceManagedSharedViewEvents.NavigateToCreateRoom)
SpaceManagedSharedAction.ManageRooms -> _viewEvents.post(SpaceManagedSharedViewEvents.NavigateToManageRooms)
SpaceManagedSharedAction.OpenSpaceAliasesSettings -> _viewEvents.post(SpaceManagedSharedViewEvents.NavigateToAliasSettings)
SpaceManagedSharedAction.OpenSpacePermissionSettings -> _viewEvents.post(SpaceManagedSharedViewEvents.NavigateToPermissionSettings)
}
}
}
1 change: 1 addition & 0 deletions vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManagedSharedAction.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,5 @@ sealed class SpaceManagedSharedAction : VectorViewModelAction {
object CreateRoom : SpaceManagedSharedAction()
object ManageRooms : SpaceManagedSharedAction()
object OpenSpaceAliasesSettings : SpaceManagedSharedAction()
object OpenSpacePermissionSettings : SpaceManagedSharedAction()
}
1 change: 1 addition & 0 deletions vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManagedSharedViewEvents.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,5 @@ sealed class SpaceManagedSharedViewEvents : VectorViewEvents {
object NavigateToCreateRoom : SpaceManagedSharedViewEvents()
object NavigateToManageRooms : SpaceManagedSharedViewEvents()
object NavigateToAliasSettings : SpaceManagedSharedViewEvents()
object NavigateToPermissionSettings : SpaceManagedSharedViewEvents()
}
14 changes: 12 additions & 2 deletions vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ class SpaceSettingsController @Inject constructor(
fun onManageRooms()
fun setIsPublic(public: Boolean)
fun onRoomAliasesClicked()
fun onRoomPermissionsClicked()
}

var callback: Callback? = null
Expand Down Expand Up @@ -134,7 +135,7 @@ class SpaceSettingsController @Inject constructor(
id = "manage_rooms",
title = stringProvider.getString(R.string.space_settings_manage_rooms),
// subtitle = data.getJoinRuleWording(stringProvider),
divider = vectorPreferences.developerMode() || isPublic,
divider = true,
editable = data.actionPermissions.canAddChildren,
action = {
if (data.actionPermissions.canAddChildren) callback?.onManageRooms()
Expand All @@ -146,12 +147,21 @@ class SpaceSettingsController @Inject constructor(
id = "alias",
title = stringProvider.getString(R.string.space_settings_alias_title),
subtitle = stringProvider.getString(R.string.space_settings_alias_subtitle),
divider = vectorPreferences.developerMode(),
divider = true,
editable = true,
action = { callback?.onRoomAliasesClicked() }
)
}

buildProfileAction(
id = "permissions",
title = stringProvider.getString(R.string.space_settings_permissions_title),
subtitle = stringProvider.getString(R.string.space_settings_permissions_subtitle),
divider = vectorPreferences.developerMode(),
editable = true,
action = { callback?.onRoomPermissionsClicked() }
)

if (vectorPreferences.developerMode()) {
buildProfileAction(
id = "dev_tools",
Expand Down
Loading