Merge pull request #5960 from element-hq/feature/fga/fix_space_ff_disabled

Ensure space feature is enabled

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

@@ -70,12 +70,6 @@ enum class FeatureFlags(
         defaultValue = { false },
         isFinished = false,
     ),
-    Space(
-        key = "feature.space",
-        title = "Spaces",
-        defaultValue = { true },
-        isFinished = true,
-    ),
     SpaceSettings(
         key = "feature.spaceSettings",
         title = "Space settings",

libraries/featureflag/impl/src/main/kotlin/io/element/android/libraries/featureflag/impl/DefaultFeatureFlagService.kt

@@ -25,10 +25,14 @@ class DefaultFeatureFlagService(
     private val featuresProvider: FeaturesProvider,
 ) : FeatureFlagService {
     override fun isFeatureEnabledFlow(feature: Feature): Flow<Boolean> {
-        return providers.filter { it.hasFeature(feature) }
-            .maxByOrNull(FeatureFlagProvider::priority)
-            ?.isFeatureEnabledFlow(feature)
-            ?: flowOf(feature.defaultValue(buildMeta))
+        return if (feature.isFinished) {
+            flowOf(feature.defaultValue(buildMeta))
+        } else {
+            providers.filter { it.hasFeature(feature) }
+                .maxByOrNull(FeatureFlagProvider::priority)
+                ?.isFeatureEnabledFlow(feature)
+                ?: flowOf(feature.defaultValue(buildMeta))
+        }
     }
 
     override suspend fun setFeatureEnabled(feature: Feature, enabled: Boolean): Boolean {