From c29587c309b7ce350f086d3814120f5b22add4e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jorge=20Mart=C3=ADn?= Date: Fri, 10 May 2024 11:54:23 +0200 Subject: [PATCH 1/3] Upload app id and clean version to bug reports --- .../features/rageshake/impl/reporter/DefaultBugReporter.kt | 3 +++ 1 file changed, 3 insertions(+) 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 468d9bc1f42..295fa17563d 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) } From d0929ed3eb483293a8057e4c4929acae768a182f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jorge=20Mart=C3=ADn?= Date: Fri, 10 May 2024 11:59:06 +0200 Subject: [PATCH 2/3] Add changelog --- changelog.d/2829.bugfix | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/2829.bugfix diff --git a/changelog.d/2829.bugfix b/changelog.d/2829.bugfix new file mode 100644 index 00000000000..203af1f3610 --- /dev/null +++ b/changelog.d/2829.bugfix @@ -0,0 +1 @@ +Add missing `app_id` and `Version` properties to bug reports. From 48f624d822ac734dd1a58d1785e841b1335405fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jorge=20Mart=C3=ADn?= Date: Fri, 10 May 2024 12:05:08 +0200 Subject: [PATCH 3/3] Fix tests --- .../features/rageshake/impl/reporter/DefaultBugReporterTest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 9d165ea844a..f2c8d0d0a8c 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 } }