Remove FeatureFlag.MarkAsUnread

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListContextMenu.kt

@@ -101,36 +101,34 @@ private fun RoomListModalBottomSheetContent(
                 )
             }
         )
-        if (contextMenu.markAsUnreadFeatureFlagEnabled) {
-            if (contextMenu.hasNewContent) {
-                ListItem(
-                    headlineContent = {
-                        Text(
-                            text = stringResource(id = R.string.screen_roomlist_mark_as_read),
-                            style = MaterialTheme.typography.bodyLarge,
-                        )
-                    },
-                    onClick = onRoomMarkReadClick,
-                    leadingContent = ListItemContent.Icon(
-                        iconSource = IconSource.Vector(CompoundIcons.MarkAsRead())
-                    ),
-                    style = ListItemStyle.Primary,
-                )
-            } else {
-                ListItem(
-                    headlineContent = {
-                        Text(
-                            text = stringResource(id = R.string.screen_roomlist_mark_as_unread),
-                            style = MaterialTheme.typography.bodyLarge,
-                        )
-                    },
-                    onClick = onRoomMarkUnreadClick,
-                    leadingContent = ListItemContent.Icon(
-                        iconSource = IconSource.Vector(CompoundIcons.MarkAsUnread())
-                    ),
-                    style = ListItemStyle.Primary,
-                )
-            }
+        if (contextMenu.hasNewContent) {
+            ListItem(
+                headlineContent = {
+                    Text(
+                        text = stringResource(id = R.string.screen_roomlist_mark_as_read),
+                        style = MaterialTheme.typography.bodyLarge,
+                    )
+                },
+                onClick = onRoomMarkReadClick,
+                leadingContent = ListItemContent.Icon(
+                    iconSource = IconSource.Vector(CompoundIcons.MarkAsRead())
+                ),
+                style = ListItemStyle.Primary,
+            )
+        } else {
+            ListItem(
+                headlineContent = {
+                    Text(
+                        text = stringResource(id = R.string.screen_roomlist_mark_as_unread),
+                        style = MaterialTheme.typography.bodyLarge,
+                    )
+                },
+                onClick = onRoomMarkUnreadClick,
+                leadingContent = ListItemContent.Icon(
+                    iconSource = IconSource.Vector(CompoundIcons.MarkAsUnread())
+                ),
+                style = ListItemStyle.Primary,
+            )
         }
         ListItem(
             headlineContent = {

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListPresenter.kt

@@ -36,8 +36,6 @@ import io.element.android.features.leaveroom.api.LeaveRoomState
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.core.coroutine.mapState
-import io.element.android.libraries.featureflag.api.FeatureFlagService
-import io.element.android.libraries.featureflag.api.FeatureFlags
 import io.element.android.libraries.fullscreenintent.api.FullScreenIntentPermissionsState
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.RoomId
@@ -74,7 +72,6 @@ class RoomListPresenter @Inject constructor(
     private val client: MatrixClient,
     private val leaveRoomPresenter: Presenter<LeaveRoomState>,
     private val roomListDataSource: RoomListDataSource,
-    private val featureFlagService: FeatureFlagService,
     private val filtersPresenter: Presenter<RoomListFiltersState>,
     private val searchPresenter: Presenter<RoomListSearchState>,
     private val sessionPreferencesStore: SessionPreferencesStore,
@@ -244,7 +241,6 @@ class RoomListPresenter @Inject constructor(
             roomName = event.roomSummary.name,
             isDm = event.roomSummary.isDm,
             isFavorite = event.roomSummary.isFavorite,
-            markAsUnreadFeatureFlagEnabled = featureFlagService.isFeatureEnabled(FeatureFlags.MarkAsUnread),
             hasNewContent = event.roomSummary.hasNewContent,
             displayClearRoomCacheAction = appPreferencesStore.isDeveloperModeEnabledFlow().first(),
         )

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListState.kt

@@ -41,7 +41,6 @@ data class RoomListState(
             val roomName: String?,
             val isDm: Boolean,
             val isFavorite: Boolean,
-            val markAsUnreadFeatureFlagEnabled: Boolean,
             val hasNewContent: Boolean,
             val displayClearRoomCacheAction: Boolean,
         ) : ContextMenu

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListStateContextMenuShownProvider.kt

@@ -28,7 +28,6 @@ internal fun aContextMenuShown(
     roomId = RoomId("!aRoom:aDomain"),
     roomName = roomName,
     isDm = isDm,
-    markAsUnreadFeatureFlagEnabled = true,
     hasNewContent = hasNewContent,
     isFavorite = isFavorite,
     displayClearRoomCacheAction = false,

features/home/impl/src/test/kotlin/io/element/android/features/home/impl/roomlist/RoomListPresenterTest.kt

@@ -32,8 +32,6 @@ import io.element.android.libraries.dateformatter.api.DateFormatter
 import io.element.android.libraries.dateformatter.test.FakeDateFormatter
 import io.element.android.libraries.eventformatter.api.RoomLastMessageFormatter
 import io.element.android.libraries.eventformatter.test.FakeRoomLastMessageFormatter
-import io.element.android.libraries.featureflag.api.FeatureFlagService
-import io.element.android.libraries.featureflag.test.FakeFeatureFlagService
 import io.element.android.libraries.fullscreenintent.api.aFullScreenIntentPermissionsState
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.RoomId
@@ -217,7 +215,6 @@ class RoomListPresenterTest {
                             roomName = summary.name,
                             isDm = false,
                             isFavorite = false,
-                            markAsUnreadFeatureFlagEnabled = true,
                             hasNewContent = false,
                             displayClearRoomCacheAction = false,
                         )
@@ -235,7 +232,6 @@ class RoomListPresenterTest {
                             roomName = summary.name,
                             isDm = false,
                             isFavorite = true,
-                            markAsUnreadFeatureFlagEnabled = true,
                             hasNewContent = false,
                             displayClearRoomCacheAction = false,
                         )
@@ -263,7 +259,6 @@ class RoomListPresenterTest {
                             roomName = summary.name,
                             isDm = false,
                             isFavorite = false,
-                            markAsUnreadFeatureFlagEnabled = true,
                             // true here.
                             hasNewContent = false,
                             displayClearRoomCacheAction = true,
@@ -295,7 +290,6 @@ class RoomListPresenterTest {
                         roomName = summary.name,
                         isDm = false,
                         isFavorite = false,
-                        markAsUnreadFeatureFlagEnabled = true,
                         hasNewContent = false,
                         displayClearRoomCacheAction = false,
                     )
@@ -604,7 +598,6 @@ class RoomListPresenterTest {
         dateFormatter: DateFormatter = FakeDateFormatter(),
         roomLastMessageFormatter: RoomLastMessageFormatter = FakeRoomLastMessageFormatter(),
         sessionPreferencesStore: SessionPreferencesStore = InMemorySessionPreferencesStore(),
-        featureFlagService: FeatureFlagService = FakeFeatureFlagService(),
         analyticsService: AnalyticsService = FakeAnalyticsService(),
         filtersPresenter: Presenter<RoomListFiltersState> = Presenter { aRoomListFiltersState() },
         searchPresenter: Presenter<RoomListSearchState> = Presenter { aRoomListSearchState() },
@@ -626,7 +619,6 @@ class RoomListPresenterTest {
             sessionCoroutineScope = backgroundScope,
             dateTimeObserver = FakeDateTimeObserver(),
         ),
-        featureFlagService = featureFlagService,
         searchPresenter = searchPresenter,
         sessionPreferencesStore = sessionPreferencesStore,
         filtersPresenter = filtersPresenter,

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

@@ -21,13 +21,6 @@ enum class FeatureFlags(
     override val defaultValue: (BuildMeta) -> Boolean,
     override val isFinished: Boolean,
 ) : Feature {
-    MarkAsUnread(
-        key = "feature.markAsUnread",
-        title = "Mark as unread",
-        description = "Allow user to mark a room as unread",
-        defaultValue = { true },
-        isFinished = false,
-    ),
     RoomDirectorySearch(
         key = "feature.roomdirectorysearch",
         title = "Room directory search",