Skip to content

Commit ec8c2e9

Browse files
authored
Merge pull request #4335 from element-hq/feature/fga/create_room_override_history_visibility
change(create room) : use history visibility "invited"
2 parents 908fc43 + 8e68490 commit ec8c2e9

File tree

3 files changed

+6
-0
lines changed

3 files changed

+6
-0
lines changed

features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomPresenter.kt

+2
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import io.element.android.libraries.matrix.api.core.RoomId
3131
import io.element.android.libraries.matrix.api.createroom.CreateRoomParameters
3232
import io.element.android.libraries.matrix.api.createroom.RoomPreset
3333
import io.element.android.libraries.matrix.api.room.alias.RoomAliasHelper
34+
import io.element.android.libraries.matrix.api.room.history.RoomHistoryVisibility
3435
import io.element.android.libraries.matrix.api.roomdirectory.RoomVisibility
3536
import io.element.android.libraries.matrix.ui.media.AvatarAction
3637
import io.element.android.libraries.matrix.ui.room.address.RoomAddressValidity
@@ -175,6 +176,7 @@ class ConfigureRoomPresenter @Inject constructor(
175176
isEncrypted = config.roomVisibility is RoomVisibilityState.Private,
176177
isDirect = false,
177178
visibility = RoomVisibility.Private,
179+
historyVisibilityOverride = RoomHistoryVisibility.Invited,
178180
preset = RoomPreset.PRIVATE_CHAT,
179181
invite = config.invites.map { it.userId },
180182
avatar = avatarUrl,

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/createroom/CreateRoomParameters.kt

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
package io.element.android.libraries.matrix.api.createroom
99

1010
import io.element.android.libraries.matrix.api.core.UserId
11+
import io.element.android.libraries.matrix.api.room.history.RoomHistoryVisibility
1112
import io.element.android.libraries.matrix.api.room.join.JoinRule
1213
import io.element.android.libraries.matrix.api.roomdirectory.RoomVisibility
1314
import java.util.Optional
@@ -22,5 +23,6 @@ data class CreateRoomParameters(
2223
val invite: List<UserId>? = null,
2324
val avatar: String? = null,
2425
val joinRuleOverride: JoinRule? = null,
26+
val historyVisibilityOverride: RoomHistoryVisibility? = null,
2527
val roomAliasName: Optional<String> = Optional.empty(),
2628
)

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt

+2
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ import io.element.android.libraries.matrix.impl.room.RoomSyncSubscriber
6161
import io.element.android.libraries.matrix.impl.room.RustRoomFactory
6262
import io.element.android.libraries.matrix.impl.room.RustRoomPreview
6363
import io.element.android.libraries.matrix.impl.room.TimelineEventTypeFilterFactory
64+
import io.element.android.libraries.matrix.impl.room.history.map
6465
import io.element.android.libraries.matrix.impl.room.join.map
6566
import io.element.android.libraries.matrix.impl.roomdirectory.RustRoomDirectoryService
6667
import io.element.android.libraries.matrix.impl.roomdirectory.map
@@ -328,6 +329,7 @@ class RustMatrixClient(
328329
}
329330
),
330331
joinRuleOverride = createRoomParams.joinRuleOverride?.map(),
332+
historyVisibilityOverride = createRoomParams.historyVisibilityOverride?.map(),
331333
canonicalAlias = createRoomParams.roomAliasName.getOrNull(),
332334
)
333335
val roomId = RoomId(innerClient.createRoom(rustParams))

0 commit comments

Comments
 (0)