diff --git a/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporterTest.kt b/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporterTest.kt index 14c01c5dc8..8d48220ab5 100755 --- a/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporterTest.kt +++ b/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporterTest.kt @@ -148,7 +148,7 @@ class DefaultBugReporterTest { systemClock = FakeSystemClock(), coroutineDispatchers = testCoroutineDispatchers(), okHttpClient = { OkHttpClient.Builder().build() }, - userAgentProvider = DefaultUserAgentProvider(buildMeta), + userAgentProvider = DefaultUserAgentProvider(buildMeta, FakeSdkMetadata("123456789")), sessionStore = InMemorySessionStore(), buildMeta = buildMeta, bugReporterUrlProvider = { server.url("/") }, diff --git a/libraries/network/build.gradle.kts b/libraries/network/build.gradle.kts index f2c62188f9..521823b23d 100644 --- a/libraries/network/build.gradle.kts +++ b/libraries/network/build.gradle.kts @@ -37,6 +37,7 @@ dependencies { implementation(libs.dagger) implementation(projects.libraries.core) implementation(projects.libraries.di) + implementation(projects.libraries.matrix.api) implementation(platform(libs.network.okhttp.bom)) implementation(libs.network.okhttp) implementation(libs.network.okhttp.logging) diff --git a/libraries/network/src/main/kotlin/io/element/android/libraries/network/useragent/DefaultUserAgentProvider.kt b/libraries/network/src/main/kotlin/io/element/android/libraries/network/useragent/DefaultUserAgentProvider.kt index 7b0b5bedcc..da4f248fbf 100644 --- a/libraries/network/src/main/kotlin/io/element/android/libraries/network/useragent/DefaultUserAgentProvider.kt +++ b/libraries/network/src/main/kotlin/io/element/android/libraries/network/useragent/DefaultUserAgentProvider.kt @@ -21,12 +21,14 @@ import com.squareup.anvil.annotations.ContributesBinding import io.element.android.libraries.core.meta.BuildMeta import io.element.android.libraries.di.AppScope import io.element.android.libraries.di.SingleIn +import io.element.android.libraries.matrix.api.SdkMetadata import javax.inject.Inject @SingleIn(AppScope::class) @ContributesBinding(AppScope::class) class DefaultUserAgentProvider @Inject constructor( private val buildMeta: BuildMeta, + private val sdkMeta: SdkMetadata, ) : UserAgentProvider { private val userAgent: String by lazy { buildUserAgent() } @@ -34,7 +36,7 @@ class DefaultUserAgentProvider @Inject constructor( /** * Create an user agent with the application version. - * Ex: Element X/1.5.0 (Xiaomi Mi 9T; Android 11; RKQ1.200826.002; Sdk 0.1.0) + * Ex: Element X/1.5.0 (Xiaomi Mi 9T; Android 11; RKQ1.200826.002; Sdk c344b155c) */ private fun buildUserAgent(): String { val appName = buildMeta.applicationName @@ -43,7 +45,7 @@ class DefaultUserAgentProvider @Inject constructor( val deviceModel = Build.MODEL val androidVersion = Build.VERSION.RELEASE val deviceBuildId = Build.DISPLAY - val matrixSdkVersion = "TODO" + val matrixSdkVersion = sdkMeta.sdkGitSha return buildString { append(appName)