Remove FeatureFlag.PinnedEvents

Author: bmarty

features/messages/api/src/main/kotlin/io/element/android/features/messages/api/pinned/IsPinnedMessagesFeatureEnabled.kt

@@ -18,7 +18,6 @@ import com.squareup.anvil.annotations.ContributesBinding
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
-import io.element.android.features.messages.api.pinned.IsPinnedMessagesFeatureEnabled
 import io.element.android.features.messages.impl.UserEventPermissions
 import io.element.android.features.messages.impl.actionlist.model.TimelineItemAction
 import io.element.android.features.messages.impl.actionlist.model.TimelineItemActionComparator
@@ -62,7 +61,6 @@ class DefaultActionListPresenter @AssistedInject constructor(
     @Assisted
     private val postProcessor: TimelineItemActionPostProcessor,
     private val appPreferencesStore: AppPreferencesStore,
-    private val isPinnedMessagesFeatureEnabled: IsPinnedMessagesFeatureEnabled,
     private val room: BaseRoom,
     private val userSendFailureFactory: VerifiedUserSendFailureFactory,
     private val featureFlagService: FeatureFlagService,
@@ -87,7 +85,6 @@ class DefaultActionListPresenter @AssistedInject constructor(
         val isDeveloperModeEnabled by remember {
             appPreferencesStore.isDeveloperModeEnabledFlow()
         }.collectAsState(initial = false)
-        val isPinnedEventsEnabled = isPinnedMessagesFeatureEnabled()
         val pinnedEventIds by remember {
             room.roomInfoFlow.map { it.pinnedEventIds }
         }.collectAsState(initial = persistentListOf())
@@ -99,7 +96,6 @@ class DefaultActionListPresenter @AssistedInject constructor(
                     timelineItem = event.event,
                     usersEventPermissions = event.userEventPermissions,
                     isDeveloperModeEnabled = isDeveloperModeEnabled,
-                    isPinnedEventsEnabled = isPinnedEventsEnabled,
                     pinnedEventIds = pinnedEventIds,
                     target = target,
                 )
@@ -116,7 +112,6 @@ class DefaultActionListPresenter @AssistedInject constructor(
         timelineItem: TimelineItem.Event,
         usersEventPermissions: UserEventPermissions,
         isDeveloperModeEnabled: Boolean,
-        isPinnedEventsEnabled: Boolean,
         pinnedEventIds: ImmutableList<EventId>,
         target: MutableState<ActionListState.Target>
     ) = launch {
@@ -126,7 +121,6 @@ class DefaultActionListPresenter @AssistedInject constructor(
             timelineItem = timelineItem,
             usersEventPermissions = usersEventPermissions,
             isDeveloperModeEnabled = isDeveloperModeEnabled,
-            isPinnedEventsEnabled = isPinnedEventsEnabled,
             isEventPinned = pinnedEventIds.contains(timelineItem.eventId),
         )
 
@@ -154,7 +148,6 @@ class DefaultActionListPresenter @AssistedInject constructor(
         timelineItem: TimelineItem.Event,
         usersEventPermissions: UserEventPermissions,
         isDeveloperModeEnabled: Boolean,
-        isPinnedEventsEnabled: Boolean,
         isEventPinned: Boolean,
     ): List<TimelineItemAction> {
         val canRedact = timelineItem.isMine && usersEventPermissions.canRedactOwn || !timelineItem.isMine && usersEventPermissions.canRedactOther
@@ -189,7 +182,7 @@ class DefaultActionListPresenter @AssistedInject constructor(
             if (canRedact && timelineItem.content is TimelineItemPollContent && !timelineItem.content.isEnded) {
                 add(TimelineItemAction.EndPoll)
             }
-            val canPinUnpin = isPinnedEventsEnabled && usersEventPermissions.canPinUnpin && timelineItem.isRemote
+            val canPinUnpin = usersEventPermissions.canPinUnpin && timelineItem.isRemote
             if (canPinUnpin) {
                 if (isEventPinned) {
                     add(TimelineItemAction.Unpin)

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenter.kt

@@ -12,8 +12,6 @@ import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.core.coroutine.mapState
 import io.element.android.libraries.di.RoomScope
 import io.element.android.libraries.di.SingleIn
-import io.element.android.libraries.featureflag.api.FeatureFlagService
-import io.element.android.libraries.featureflag.api.FeatureFlags
 import io.element.android.libraries.matrix.api.room.CreateTimelineParams
 import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.sync.SyncService
@@ -23,7 +21,6 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
@@ -35,7 +32,6 @@ import javax.inject.Inject
 class PinnedEventsTimelineProvider @Inject constructor(
     private val room: JoinedRoom,
     private val syncService: SyncService,
-    private val featureFlagService: FeatureFlagService,
     private val dispatchers: CoroutineDispatchers,
 ) : TimelineProvider {
     private val _timelineStateFlow: MutableStateFlow<AsyncData<Timeline>> =
@@ -66,20 +62,10 @@ class PinnedEventsTimelineProvider @Inject constructor(
     }
 
     private suspend fun onActive() = coroutineScope {
-        combine(
-            featureFlagService.isFeatureEnabledFlow(FeatureFlags.PinnedEvents),
-            syncService.syncState,
-        ) { isEnabled, _ ->
+        syncService.syncState.onEach {
             // do not use syncState here as data can be loaded from cache, it's just to trigger retry if needed
-            isEnabled
+            loadTimelineIfNeeded()
         }
-            .onEach { isFeatureEnabled ->
-                if (isFeatureEnabled) {
-                    loadTimelineIfNeeded()
-                } else {
-                    resetTimeline()
-                }
-            }
             .launchIn(this)
     }