Skip to content

Fix default encrypted for restricted #4083

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

Merged
bmarty merged 2 commits into from
Oct 1, 2021
Merged

Fix default encrypted for restricted #4083

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
97dc07f
Fix default encrypted for restricted
BillCarsonFr Sep 27, 2021
2605433
Code review
BillCarsonFr Sep 30, 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/4045.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Align new room encryption default to Web
4 changes: 3 additions & 1 deletion vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import im.vector.app.features.form.formEditTextItem
import im.vector.app.features.form.formEditableAvatarItem
import im.vector.app.features.form.formSubmitButtonItem
import im.vector.app.features.form.formSwitchItem
import org.matrix.android.sdk.api.extensions.orFalse
import org.matrix.android.sdk.api.session.room.failure.CreateRoomFailure
import org.matrix.android.sdk.api.session.room.model.RoomJoinRules
import javax.inject.Inject
Expand Down Expand Up @@ -165,7 +166,8 @@ class CreateRoomController @Inject constructor(
host.stringProvider.getString(R.string.create_room_encryption_description)
}
)
switchChecked(viewState.isEncrypted)

switchChecked(viewState.isEncrypted ?: viewState.defaultEncrypted[viewState.roomJoinRules].orFalse())

listener { value ->
host.listener?.setIsEncrypted(value)
Expand Down
5 changes: 3 additions & 2 deletions vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,9 @@ class CreateRoomFragment @Inject constructor(
}

override fun selectVisibility() = withState(viewModel) { state ->

val allowed = if (state.supportsRestricted) {
// If restricted is supported and the user is in the context of a parent space
// then show restricted option.
val allowed = if (state.supportsRestricted && state.parentSpaceId != null) {
Copy link
Contributor

@ouchadam ouchadam Sep 28, 2021

Choose a reason for hiding this comment

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

NIT: if we wanted to avoid using separate branches for appending to the list (and potentially be more kotlin idiomatic) we could use

listOfNotNull

val list = listOfNotNull(
        INVITE,
        PUBLIC,
        RESTRICTED.takeIf { state.supportsRestricted && state.parentSpaceId != null }
)

or buildList

val list = buildList {
    add(INVITE)
    add(PUBLIC)
    if (state.supportsRestricted && state.parentSpaceId != null) {
        add(RESTRICTED)
    }
}

Copy link
Member Author

@BillCarsonFr BillCarsonFr Sep 29, 2021

Choose a reason for hiding this comment

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

AS is telling me that it's experimental

Copy link
Contributor

@ouchadam ouchadam Sep 29, 2021

Choose a reason for hiding this comment

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

ah my bad, I totally forgot that buildList is still experimental

listOf(RoomJoinRules.INVITE, RoomJoinRules.PUBLIC, RoomJoinRules.RESTRICTED)
} else {
listOf(RoomJoinRules.INVITE, RoomJoinRules.PUBLIC)
Expand Down
17 changes: 14 additions & 3 deletions vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import im.vector.app.features.settings.VectorPreferences
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import org.matrix.android.sdk.api.MatrixPatterns.getDomain
import org.matrix.android.sdk.api.extensions.orFalse
import org.matrix.android.sdk.api.extensions.tryOrNull
import org.matrix.android.sdk.api.raw.RawService
import org.matrix.android.sdk.api.session.Session
Expand Down Expand Up @@ -109,8 +110,13 @@ class CreateRoomViewModel @AssistedInject constructor(@Assisted private val init

setState {
copy(
isEncrypted = RoomJoinRules.INVITE == roomJoinRules && adminE2EByDefault,
hsAdminHasDisabledE2E = !adminE2EByDefault
hsAdminHasDisabledE2E = !adminE2EByDefault,
defaultEncrypted = mapOf(
RoomJoinRules.INVITE to adminE2EByDefault,
RoomJoinRules.PUBLIC to false,
RoomJoinRules.RESTRICTED to adminE2EByDefault
)

)
}
}
Expand Down Expand Up @@ -286,7 +292,12 @@ class CreateRoomViewModel @AssistedInject constructor(@Assisted private val init
disableFederation = state.disableFederation

// Encryption
if (state.isEncrypted) {
val shouldEncrypt = when (state.roomJoinRules) {
// we ignore the isEncrypted for public room as the switch is hidden in this case
RoomJoinRules.PUBLIC -> false
else -> state.isEncrypted ?: state.defaultEncrypted[state.roomJoinRules].orFalse()
}
if (shouldEncrypt) {
enableEncryption()
}
}
Expand Down
3 changes: 2 additions & 1 deletion vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ data class CreateRoomViewState(
val roomName: String = "",
val roomTopic: String = "",
val roomJoinRules: RoomJoinRules = RoomJoinRules.INVITE,
val isEncrypted: Boolean = false,
val isEncrypted: Boolean? = null,
val defaultEncrypted: Map<RoomJoinRules, Boolean> = emptyMap(),
val showAdvanced: Boolean = false,
val disableFederation: Boolean = false,
val homeServerName: String = "",
Expand Down