From 1f4b2d3ef3a11d11625ba40d797257fdb4dfd4cc Mon Sep 17 00:00:00 2001 From: Jorge Martin Espinosa Date: Fri, 10 May 2024 12:15:33 +0200 Subject: [PATCH] Upload app id and clean version to bug reports (#2829) * Upload app id and clean version to bug reports * Add changelog --- changelog.d/2829.bugfix | 1 + .../features/rageshake/impl/reporter/DefaultBugReporter.kt | 3 +++ .../features/rageshake/impl/reporter/DefaultBugReporterTest.kt | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 changelog.d/2829.bugfix diff --git a/changelog.d/2829.bugfix b/changelog.d/2829.bugfix new file mode 100644 index 0000000000..203af1f361 --- /dev/null +++ b/changelog.d/2829.bugfix @@ -0,0 +1 @@ +Add missing `app_id` and `Version` properties to bug reports. diff --git a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporter.kt b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporter.kt index 468d9bc1f4..295fa17563 100755 --- a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporter.kt +++ b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporter.kt @@ -161,6 +161,9 @@ class DefaultBugReporter @Inject constructor( .addFormDataPart("sdk_sha", sdkMetadata.sdkGitSha) .addFormDataPart("local_time", LocalDateTime.now().format(DateTimeFormatter.ISO_DATE_TIME)) .addFormDataPart("utc_time", LocalDateTime.ofInstant(Instant.now(), ZoneOffset.UTC).format(DateTimeFormatter.ISO_DATE_TIME)) + .addFormDataPart("app_id", buildMeta.applicationId) + // Nightly versions have a custom version name suffix that we should remove for the bug report + .addFormDataPart("Version", buildMeta.versionName.replace("-nightly", "")) currentTracingFilter?.let { builder.addFormDataPart("tracing_filter", it) } 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 9d165ea844..f2c8d0d0a8 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 @@ -154,6 +154,6 @@ class DefaultBugReporterTest { } companion object { - private const val EXPECTED_NUMBER_OF_PROGRESS_VALUE = 15 + private const val EXPECTED_NUMBER_OF_PROGRESS_VALUE = 17 } }