Merge pull request #5139 from element-hq/feature/bma/rageshakeConfigStep2

 Let enterprise build be able to override (or disable) the bug report URL.

Author: bmarty

app/src/main/kotlin/io/element/android/x/ElementXApplication.kt

@@ -9,8 +9,6 @@ package io.element.android.x
 
 import android.app.Application
 import androidx.startup.AppInitializer
-import io.element.android.appconfig.RageshakeConfig
-import io.element.android.appconfig.isEnabled
 import io.element.android.features.cachecleaner.api.CacheCleanerInitializer
 import io.element.android.libraries.di.DaggerComponentOwner
 import io.element.android.x.di.AppComponent
@@ -25,9 +23,7 @@ class ElementXApplication : Application(), DaggerComponentOwner {
     override fun onCreate() {
         super.onCreate()
         AppInitializer.getInstance(this).apply {
-            if (RageshakeConfig.isEnabled) {
-                initializeComponent(CrashInitializer::class.java)
-            }
+            initializeComponent(CrashInitializer::class.java)
             initializeComponent(PlatformInitializer::class.java)
             initializeComponent(CacheCleanerInitializer::class.java)
         }

appconfig/src/main/kotlin/io/element/android/appconfig/RageshakeConfig.kt

@@ -25,9 +25,3 @@ object RageshakeConfig {
      */
     const val MAX_LOG_UPLOAD_SIZE = 50 * 1024 * 1024L
 }
-
-/**
- * Whether the rageshake feature is enabled.
- */
-val RageshakeConfig.isEnabled: Boolean
-    get() = BUG_REPORT_URL.isNotEmpty() && BUG_REPORT_APP_NAME.isNotEmpty()

appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt

@@ -47,6 +47,7 @@ import io.element.android.appnav.room.RoomFlowNode
 import io.element.android.appnav.room.RoomNavigationTarget
 import io.element.android.appnav.room.joined.JoinedRoomLoadedFlowNode
 import io.element.android.features.createroom.api.CreateRoomEntryPoint
+import io.element.android.features.enterprise.api.SessionEnterpriseService
 import io.element.android.features.ftue.api.FtueEntryPoint
 import io.element.android.features.ftue.api.state.FtueService
 import io.element.android.features.ftue.api.state.FtueState
@@ -127,6 +128,7 @@ class LoggedInFlowNode @AssistedInject constructor(
     private val logoutEntryPoint: LogoutEntryPoint,
     private val incomingVerificationEntryPoint: IncomingVerificationEntryPoint,
     private val mediaPreviewConfigMigration: MediaPreviewConfigMigration,
+    private val sessionEnterpriseService: SessionEnterpriseService,
     private val networkMonitor: NetworkMonitor,
     snackbarDispatcher: SnackbarDispatcher,
 ) : BaseFlowNode<LoggedInFlowNode.NavTarget>(
@@ -185,7 +187,9 @@ class LoggedInFlowNode @AssistedInject constructor(
 
     override fun onBuilt() {
         super.onBuilt()
-
+        lifecycleScope.launch {
+            sessionEnterpriseService.init()
+        }
         lifecycle.subscribe(
             onCreate = {
                 appNavigationStateService.onNavigateToSession(id, matrixClient.sessionId)

enterprise

@@ -0,0 +1,16 @@
+/*
+ * Copyright 2025 New Vector 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.enterprise.api
+
+sealed interface BugReportUrl {
+    data object UseDefault : BugReportUrl
+    data object Disabled : BugReportUrl
+    data class Custom(
+        val url: String,
+    ) : BugReportUrl
+}

features/enterprise/api/src/main/kotlin/io/element/android/features/enterprise/api/BugReportUrl.kt

@@ -9,6 +9,7 @@ package io.element.android.features.enterprise.api
 
 import io.element.android.compound.tokens.generated.SemanticColors
 import io.element.android.libraries.matrix.api.core.SessionId
+import kotlinx.coroutines.flow.Flow
 
 interface EnterpriseService {
     val isEnterpriseBuild: Boolean
@@ -22,6 +23,8 @@ interface EnterpriseService {
     fun firebasePushGateway(): String?
     fun unifiedPushDefaultPushGateway(): String?
 
+    val bugReportUrlFlow: Flow<BugReportUrl>
+
     companion object {
         const val ANY_ACCOUNT_PROVIDER = "*"
     }

features/enterprise/api/src/main/kotlin/io/element/android/features/enterprise/api/EnterpriseService.kt

@@ -9,4 +9,6 @@ package io.element.android.features.enterprise.api
 
 interface SessionEnterpriseService {
     suspend fun isElementCallAvailable(): Boolean
+
+    suspend fun init()
 }

features/enterprise/api/src/main/kotlin/io/element/android/features/enterprise/api/SessionEnterpriseService.kt

@@ -11,9 +11,11 @@ import com.squareup.anvil.annotations.ContributesBinding
 import io.element.android.compound.tokens.generated.SemanticColors
 import io.element.android.compound.tokens.generated.compoundColorsDark
 import io.element.android.compound.tokens.generated.compoundColorsLight
+import io.element.android.features.enterprise.api.BugReportUrl
 import io.element.android.features.enterprise.api.EnterpriseService
 import io.element.android.libraries.di.AppScope
 import io.element.android.libraries.matrix.api.core.SessionId
+import kotlinx.coroutines.flow.flowOf
 import javax.inject.Inject
 
 @ContributesBinding(AppScope::class)
@@ -31,4 +33,6 @@ class DefaultEnterpriseService @Inject constructor() : EnterpriseService {
 
     override fun firebasePushGateway(): String? = null
     override fun unifiedPushDefaultPushGateway(): String? = null
+
+    override val bugReportUrlFlow = flowOf(BugReportUrl.UseDefault)
 }

features/enterprise/impl/src/main/kotlin/io/element/android/features/enterprise/impl/DefaultEnterpriseService.kt

@@ -14,5 +14,6 @@ import javax.inject.Inject
 
 @ContributesBinding(SessionScope::class)
 class DefaultSessionEnterpriseService @Inject constructor() : SessionEnterpriseService {
+    override suspend fun init() = Unit
     override suspend fun isElementCallAvailable(): Boolean = true
 }

features/enterprise/impl/src/main/kotlin/io/element/android/features/enterprise/impl/DefaultSessionEnterpriseService.kt

@@ -8,10 +8,14 @@
 package io.element.android.features.enterprise.test
 
 import io.element.android.compound.tokens.generated.SemanticColors
+import io.element.android.features.enterprise.api.BugReportUrl
 import io.element.android.features.enterprise.api.EnterpriseService
 import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.tests.testutils.lambda.lambdaError
 import io.element.android.tests.testutils.simulateLongTask
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
 
 class FakeEnterpriseService(
     override val isEnterpriseBuild: Boolean = false,
@@ -51,7 +55,6 @@ class FakeEnterpriseService(
         return unifiedPushDefaultPushGatewayResult()
     }
 
-    companion object {
-        const val A_FAKE_HOMESERVER = "a_fake_homeserver"
-    }
+    val bugReportUrlMutableFlow = MutableStateFlow<BugReportUrl>(BugReportUrl.UseDefault)
+    override val bugReportUrlFlow: Flow<BugReportUrl> = bugReportUrlMutableFlow.asStateFlow()
 }