diff --git a/vector/build.gradle b/vector/build.gradle index 2ac8a64a7b..597d86b457 100644 --- a/vector/build.gradle +++ b/vector/build.gradle @@ -132,16 +132,9 @@ android { versionName "${versionMajor}.${versionMinor}.${versionPatch}-sonar" buildConfigField "String", "GIT_REVISION", "\"${gitRevision()}\"" - resValue "string", "git_revision", "\"${gitRevision()}\"" - buildConfigField "String", "GIT_REVISION_DATE", "\"${gitRevisionDate()}\"" - resValue "string", "git_revision_date", "\"${gitRevisionDate()}\"" - buildConfigField "String", "GIT_BRANCH_NAME", "\"${gitBranchName()}\"" - resValue "string", "git_branch_name", "\"${gitBranchName()}\"" - buildConfigField "String", "BUILD_NUMBER", "\"${buildNumber}\"" - resValue "string", "build_number", "\"${buildNumber}\"" buildConfigField "im.vector.app.features.VectorFeatures.OnboardingVariant", "ONBOARDING_VARIANT", "im.vector.app.features.VectorFeatures.OnboardingVariant.FTUE_AUTH" @@ -233,7 +226,6 @@ android { applicationIdSuffix ".debug" resValue "string", "app_name", "Element dbg" - resValue "bool", "debug_mode", "true" buildConfigField "boolean", "LOW_PRIVACY_LOG_ENABLE", "false" // Set to true if you want to enable strict mode in debug buildConfigField "boolean", "ENABLE_STRICT_MODE_LOGS", "false" @@ -244,7 +236,6 @@ android { release { resValue "string", "app_name", "Element" - resValue "bool", "debug_mode", "false" buildConfigField "boolean", "LOW_PRIVACY_LOG_ENABLE", "false" buildConfigField "boolean", "ENABLE_STRICT_MODE_LOGS", "false" diff --git a/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt b/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt index b6454b89e4..6434ba60f2 100755 --- a/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt +++ b/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt @@ -271,7 +271,7 @@ class BugReporter @Inject constructor( .addFormDataPart("can_contact", canContact.toString()) .addFormDataPart("device_id", deviceId) .addFormDataPart("version", versionProvider.getVersion(longFormat = true, useBuildNumber = false)) - .addFormDataPart("branch_name", context.getString(R.string.git_branch_name)) + .addFormDataPart("branch_name", BuildConfig.GIT_BRANCH_NAME) .addFormDataPart("matrix_sdk_version", Matrix.getSdkVersion()) .addFormDataPart("olm_version", olmVersion) .addFormDataPart("device", Build.MODEL.trim()) @@ -289,7 +289,7 @@ class BugReporter @Inject constructor( } } - val buildNumber = context.getString(R.string.build_number) + val buildNumber = BuildConfig.BUILD_NUMBER if (buildNumber.isNotEmpty() && buildNumber != "0") { builder.addFormDataPart("build_number", buildNumber) } @@ -329,7 +329,7 @@ class BugReporter @Inject constructor( // add some github labels builder.addFormDataPart("label", BuildConfig.VERSION_NAME) builder.addFormDataPart("label", BuildConfig.FLAVOR_DESCRIPTION) - builder.addFormDataPart("label", context.getString(R.string.git_branch_name)) + builder.addFormDataPart("label", BuildConfig.GIT_BRANCH_NAME) // Special for Element builder.addFormDataPart("label", "[Element]")