Revert to the SessionEnterpriseService approach

features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomExtension.kt

@@ -1,14 +0,0 @@
-/*
- * Copyright (c) 2026 Element Creations Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.features.createroom.impl.configureroom
-
-/** Lets a build-specific implementation adjust what the configure room screen offers. */
-interface ConfigureRoomExtension {
-    /** Whether the public join rule may be offered. */
-    suspend fun isPublicAccessAllowed(): Boolean
-}

features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomPresenter.kt

@@ -76,7 +76,6 @@ class ConfigureRoomPresenter(
     private val roomAliasHelper: RoomAliasHelper,
     private val mediaOptimizationConfigProvider: MediaOptimizationConfigProvider,
     private val sessionEnterpriseService: SessionEnterpriseService,
-    private val configureRoomExtension: ConfigureRoomExtension,
 ) : Presenter<ConfigureRoomState> {
     @AssistedFactory
     interface Factory {
@@ -94,8 +93,8 @@ class ConfigureRoomPresenter(
         val isKnockFeatureEnabled by remember {
             featureFlagService.isFeatureEnabledFlow(FeatureFlags.Knock)
         }.collectAsState(initial = false)
-        val isPublicAccessAllowed by produceState(true) {
-            value = configureRoomExtension.isPublicAccessAllowed()
+        val arePublicRoomsDisabled by produceState(false) {
+            value = sessionEnterpriseService.arePublicRoomsDisabledByHomeserver()
         }
         val roomAddressValidity = remember {
             mutableStateOf<RoomAddressValidity>(RoomAddressValidity.Unknown)
@@ -150,13 +149,13 @@ class ConfigureRoomPresenter(
         // 1. If we are creating a space.
         // 2. If it has a parent space.
         // 3. If knocking is enabled.
-        // 4. If public access is allowed.
+        // 4. If the homeserver forbids public rooms.
         val parentSpace = createRoomConfig.parentSpace
-        val availableJoinRules = remember(parentSpace, isSpace, isKnockFeatureEnabled, isPublicAccessAllowed) {
+        val availableJoinRules = remember(parentSpace, isSpace, isKnockFeatureEnabled, arePublicRoomsDisabled) {
             when {
                 isSpace && parentSpace != null -> TODO("Adding a space to a parent space is not supported yet! How did you get here?")
                 parentSpace == null || parentSpace.joinRule == JoinRule.Public -> listOfNotNull(
-                    JoinRuleItem.PublicVisibility.Public.takeIf { isPublicAccessAllowed },
+                    JoinRuleItem.PublicVisibility.Public.takeIf { !arePublicRoomsDisabled },
                     JoinRuleItem.PublicVisibility.AskToJoin.takeIf { !isSpace && isKnockFeatureEnabled },
                     JoinRuleItem.PrivateVisibility.Private,
                 ).toImmutableList()

features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/NoopConfigureRoomExtension.kt

@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2026 Element Creations Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.features.createroom.impl.configureroom
-
-import dev.zacsweers.metro.ContributesBinding
-import io.element.android.libraries.di.SessionScope
-
-@ContributesBinding(SessionScope::class)
-class NoopConfigureRoomExtension : ConfigureRoomExtension {
-    override suspend fun isPublicAccessAllowed(): Boolean = true
-}

features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/ConfigureRoomPresenterTest.kt

@@ -18,7 +18,6 @@ import io.element.android.features.createroom.impl.configureroom.ConfigureRoomSt
 import io.element.android.features.createroom.impl.configureroom.CreateRoomConfig
 import io.element.android.features.createroom.impl.configureroom.CreateRoomConfigStore
 import io.element.android.features.createroom.impl.configureroom.JoinRuleItem
-import io.element.android.features.createroom.impl.configureroom.NoopConfigureRoomExtension
 import io.element.android.features.createroom.impl.configureroom.RoomAddress
 import io.element.android.features.createroom.impl.configureroom.RoomVisibilityState
 import io.element.android.features.enterprise.test.FakeSessionEnterpriseService
@@ -58,6 +57,7 @@ import io.element.android.libraries.previewutils.room.aSpaceRoom
 import io.element.android.services.analytics.api.AnalyticsService
 import io.element.android.services.analytics.test.FakeAnalyticsService
 import io.element.android.tests.testutils.WarmUpRule
+import io.element.android.tests.testutils.consumeItemsUntilPredicate
 import io.element.android.tests.testutils.lambda.lambdaRecorder
 import io.element.android.tests.testutils.lambda.matching
 import io.element.android.tests.testutils.robolectric.RobolectricTest
@@ -523,7 +523,10 @@ class ConfigureRoomPresenterTest : RobolectricTest() {
 
     @Test
     fun `present - creating a private room when encryption is disabled by the HS creates it unencrypted`() = runTest {
-        val sessionEnterpriseService = FakeSessionEnterpriseService(isEncryptionDisabledResult = { true })
+        val sessionEnterpriseService = FakeSessionEnterpriseService(
+            isEncryptionDisabledResult = { true },
+            arePublicRoomsDisabledResult = { false },
+        )
         val createRoomLambda = lambdaRecorder<CreateRoomParameters, Result<RoomId>> { Result.success(A_ROOM_ID) }
         val matrixClient = createMatrixClient().apply {
             createRoomResult = createRoomLambda
@@ -545,6 +548,38 @@ class ConfigureRoomPresenterTest : RobolectricTest() {
         }
     }
 
+    @Test
+    fun `present - when public rooms are disabled by the HS, the public join rule is not available`() = runTest {
+        val presenter = createConfigureRoomPresenter(
+            sessionEnterpriseService = FakeSessionEnterpriseService(
+                isEncryptionDisabledResult = { false },
+                arePublicRoomsDisabledResult = { true },
+            ),
+        )
+        presenter.test {
+            val expectedJoinRules = listOf(JoinRuleItem.PublicVisibility.AskToJoin, JoinRuleItem.PrivateVisibility.Private)
+            val state = consumeItemsUntilPredicate { it.availableJoinRules == expectedJoinRules }.last()
+            assertThat(state.availableJoinRules).containsExactlyElementsIn(expectedJoinRules).inOrder()
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
+    @Test
+    fun `present - when public rooms are disabled by the HS, only the private join rule is available for a space`() = runTest {
+        val presenter = createConfigureRoomPresenter(
+            isSpace = true,
+            sessionEnterpriseService = FakeSessionEnterpriseService(
+                isEncryptionDisabledResult = { false },
+                arePublicRoomsDisabledResult = { true },
+            ),
+        )
+        presenter.test {
+            val state = consumeItemsUntilPredicate { it.availableJoinRules == listOf(JoinRuleItem.PrivateVisibility.Private) }.last()
+            assertThat(state.config.visibilityState).isEqualTo(RoomVisibilityState.Private(JoinRuleItem.PrivateVisibility.Private))
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
     private suspend fun TurbineTestContext<ConfigureRoomState>.initialState(): ConfigureRoomState {
         skipItems(1)
         return awaitItem()
@@ -580,7 +615,10 @@ class ConfigureRoomPresenterTest : RobolectricTest() {
         permissionsPresenter: PermissionsPresenter = FakePermissionsPresenter(),
         isKnockFeatureEnabled: Boolean = true,
         mediaOptimizationConfigProvider: FakeMediaOptimizationConfigProvider = FakeMediaOptimizationConfigProvider(),
-        sessionEnterpriseService: FakeSessionEnterpriseService = FakeSessionEnterpriseService(isEncryptionDisabledResult = { false }),
+        sessionEnterpriseService: FakeSessionEnterpriseService = FakeSessionEnterpriseService(
+            isEncryptionDisabledResult = { false },
+            arePublicRoomsDisabledResult = { false },
+        ),
     ) = ConfigureRoomPresenter(
         isSpace = isSpace,
         initialParentSpaceId = initialParenSpaceId,
@@ -596,6 +634,5 @@ class ConfigureRoomPresenterTest : RobolectricTest() {
         ),
         mediaOptimizationConfigProvider = mediaOptimizationConfigProvider,
         sessionEnterpriseService = sessionEnterpriseService,
-        configureRoomExtension = NoopConfigureRoomExtension(),
     )
 }