Sulkta-OSS/element-x-ada
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Ensure space feature is enabled
This commit is contained in:
ganfra 2026-01-05 11:30:37 +01:00 • committed by GitHub
commit 094b4c8c0f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
28 changed files with 57 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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",

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

@ -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 {