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

Fix providing the Sentry SDK DSN in Element Pro when no analytic modules are enabled

Browse source
This commit is contained in:
Jorge Martín 2025-11-28 16:42:36 +01:00 • committed by Jorge Martin Espinosa
parent 6c82393bcb
commit 890b6111ea
5 changed files with 77 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/kotlin/io/element/android/x/di/AppBindings.kt
View file

@ -17,6 +17,7 @@ import io.element.android.features.lockscreen.api.LockScreenService
import io.element.android.features.rageshake.api.reporter.BugReporter
import io.element.android.libraries.core.meta.BuildMeta
import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatcher
import io.element.android.libraries.di.annotations.SentrySdkDsn
import io.element.android.libraries.featureflag.api.FeatureFlagService
import io.element.android.libraries.matrix.api.platform.InitPlatformService
import io.element.android.libraries.matrix.api.tracing.TracingService
@ -48,4 +49,7 @@ interface AppBindings {
fun featureFlagService(): FeatureFlagService
fun buildMeta(): BuildMeta
@SentrySdkDsn
fun sentrySdkDsn(): String?
}

3
app/src/main/kotlin/io/element/android/x/initializer/PlatformInitializer.kt
View file

@ -15,7 +15,6 @@ import io.element.android.features.rageshake.api.logs.createWriteToFilesConfigur
import io.element.android.libraries.architecture.bindings
import io.element.android.libraries.featureflag.api.FeatureFlags
import io.element.android.libraries.matrix.api.tracing.TracingConfiguration
import io.element.android.services.analyticsproviders.sentry.SentryConfig
import io.element.android.x.di.AppBindings
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.runBlocking
@ -39,7 +38,7 @@ class PlatformInitializer : Initializer<Unit> {
logLevel = logLevel,
extraTargets = listOf(ELEMENT_X_TARGET),
traceLogPacks = runBlocking { preferencesStore.getTracingLogPacksFlow().first() },
sdkSentryDsn = SentryConfig.SDK_DSN.takeIf { it.isNotBlank() },
sdkSentryDsn = appBindings.sentrySdkDsn()?.takeIf { it.isNotBlank() },
)
bugReporter.setCurrentTracingLogLevel(logLevel.name)
platformService.init(tracingConfiguration)