Skip to content

Commit dcb6055

Browse files
committed
Remove FeatureFlag.MediaGallery
1 parent 4f05357 commit dcb6055

File tree

5 files changed

+3
-20
lines changed

5 files changed

+3
-20
lines changed

features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenter.kt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,6 @@ class RoomDetailsPresenter @Inject constructor(
8686

8787
val pinnedMessagesCount by remember { derivedStateOf { roomInfo.pinnedEventIds.size } }
8888

89-
val canShowMediaGallery by remember {
90-
featureFlagService.isFeatureEnabledFlow(FeatureFlags.MediaGallery)
91-
}.collectAsState(false)
92-
9389
LaunchedEffect(Unit) {
9490
room.updateRoomNotificationSettings()
9591
observeNotificationSettings()
@@ -198,7 +194,6 @@ class RoomDetailsPresenter @Inject constructor(
198194
displayRolesAndPermissionsSettings = !isDm && isUserAdmin,
199195
isPublic = joinRule == JoinRule.Public,
200196
heroes = roomInfo.heroes.toPersistentList(),
201-
canShowMediaGallery = canShowMediaGallery,
202197
pinnedMessagesCount = pinnedMessagesCount,
203198
snackbarMessage = snackbarMessage,
204199
canShowKnockRequests = canShowKnockRequests,

features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsState.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ data class RoomDetailsState(
3939
val displayRolesAndPermissionsSettings: Boolean,
4040
val isPublic: Boolean,
4141
val heroes: ImmutableList<MatrixUser>,
42-
val canShowMediaGallery: Boolean,
4342
val pinnedMessagesCount: Int?,
4443
val snackbarMessage: SnackbarMessage?,
4544
val canShowKnockRequests: Boolean,

features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsStateProvider.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ fun aRoomDetailsState(
109109
displayAdminSettings: Boolean = false,
110110
isPublic: Boolean = true,
111111
heroes: List<MatrixUser> = emptyList(),
112-
canShowMediaGallery: Boolean = true,
113112
pinnedMessagesCount: Int? = null,
114113
snackbarMessage: SnackbarMessage? = null,
115114
canShowKnockRequests: Boolean = false,
@@ -139,7 +138,6 @@ fun aRoomDetailsState(
139138
displayRolesAndPermissionsSettings = displayAdminSettings,
140139
isPublic = isPublic,
141140
heroes = heroes.toPersistentList(),
142-
canShowMediaGallery = canShowMediaGallery,
143141
pinnedMessagesCount = pinnedMessagesCount,
144142
snackbarMessage = snackbarMessage,
145143
canShowKnockRequests = canShowKnockRequests,

features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -244,11 +244,9 @@ fun RoomDetailsView(
244244
PollsItem(
245245
openPollHistory = openPollHistory
246246
)
247-
if (state.canShowMediaGallery) {
248-
MediaGalleryItem(
249-
onClick = openMediaGallery
250-
)
251-
}
247+
MediaGalleryItem(
248+
onClick = openMediaGallery
249+
)
252250
}
253251

254252
if (state.roomType is RoomDetailsType.Dm && state.roomMemberDetailsState != null) {

libraries/featureflag/api/src/main/kotlin/io/element/android/libraries/featureflag/api/FeatureFlags.kt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -96,13 +96,6 @@ enum class FeatureFlags(
9696
defaultValue = { true },
9797
isFinished = false,
9898
),
99-
MediaGallery(
100-
key = "feature.media_gallery",
101-
title = "Allow user to open the media gallery",
102-
description = null,
103-
defaultValue = { true },
104-
isFinished = false,
105-
),
10699
PrintLogsToLogcat(
107100
key = "feature.print_logs_to_logcat",
108101
title = "Print logs to logcat",

0 commit comments

Comments
 (0)