Upload app id and clean version to bug reports (#2829)

* Upload app id and clean version to bug reports

* Add changelog

Author: jmartinesp

changelog.d/2829.bugfix

@@ -0,0 +1 @@
+Add missing `app_id` and `Version` properties to bug reports.

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)
                     }

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
     }
 }