diff --git a/app/src/main/kotlin/io/element/android/x/ElementXApplication.kt b/app/src/main/kotlin/io/element/android/x/ElementXApplication.kt index a1168f4efb..76cf15e660 100644 --- a/app/src/main/kotlin/io/element/android/x/ElementXApplication.kt +++ b/app/src/main/kotlin/io/element/android/x/ElementXApplication.kt @@ -21,6 +21,7 @@ import androidx.startup.AppInitializer import io.element.android.libraries.di.DaggerComponentOwner import io.element.android.x.di.AppComponent import io.element.android.x.di.DaggerAppComponent +import io.element.android.x.info.logApplicationInfo import io.element.android.x.initializer.CrashInitializer import io.element.android.x.initializer.MatrixInitializer import io.element.android.x.initializer.TimberInitializer @@ -40,5 +41,6 @@ class ElementXApplication : Application(), DaggerComponentOwner { initializeComponent(TimberInitializer::class.java) initializeComponent(MatrixInitializer::class.java) } + logApplicationInfo() } } diff --git a/app/src/main/kotlin/io/element/android/x/info/Logs.kt b/app/src/main/kotlin/io/element/android/x/info/Logs.kt new file mode 100644 index 0000000000..882746d029 --- /dev/null +++ b/app/src/main/kotlin/io/element/android/x/info/Logs.kt @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2023 New Vector Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.element.android.x.info + +import io.element.android.x.BuildConfig +import timber.log.Timber +import java.text.SimpleDateFormat +import java.util.* + +fun logApplicationInfo() { + val appVersion = buildString { + append(BuildConfig.VERSION_NAME) + append(" (") + append(BuildConfig.VERSION_CODE) + append(") - ") + append(BuildConfig.BUILD_TYPE) + } + // TODO Get SDK version somehow + val sdkVersion = "SDK VERSION (TODO)" + val date = SimpleDateFormat("MM-dd HH:mm:ss.SSSZ", Locale.US).format(Date()) + + Timber.d("----------------------------------------------------------------") + Timber.d("----------------------------------------------------------------") + Timber.d(" Application version: $appVersion") + Timber.d(" SDK version: $sdkVersion") + Timber.d(" Local time: $date") + Timber.d("----------------------------------------------------------------") + Timber.d("----------------------------------------------------------------\n\n\n\n") +} diff --git a/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/reporter/BugReporterMultipartBody.java b/features/rageshake/src/main/java/io/element/android/features/rageshake/reporter/BugReporterMultipartBody.java similarity index 100% rename from features/rageshake/src/main/kotlin/io/element/android/features/rageshake/reporter/BugReporterMultipartBody.java rename to features/rageshake/src/main/java/io/element/android/features/rageshake/reporter/BugReporterMultipartBody.java diff --git a/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/reporter/BugReporter.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/reporter/BugReporter.kt index 3e495d613f..82e777ab43 100755 --- a/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/reporter/BugReporter.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/reporter/BugReporter.kt @@ -235,10 +235,10 @@ class BugReporter @Inject constructor( if (!mIsCancelled) { val text = when (reportType) { - ReportType.BUG_REPORT -> "[ElementX] $bugDescription" - ReportType.SUGGESTION -> "[ElementX] [Suggestion] $bugDescription" - ReportType.SPACE_BETA_FEEDBACK -> "[ElementX] [spaces-feedback] $bugDescription" - ReportType.THREADS_BETA_FEEDBACK -> "[ElementX] [threads-feedback] $bugDescription" + ReportType.BUG_REPORT -> bugDescription + ReportType.SUGGESTION -> "[Suggestion] $bugDescription" + ReportType.SPACE_BETA_FEEDBACK -> "[spaces-feedback] $bugDescription" + ReportType.THREADS_BETA_FEEDBACK -> "[threads-feedback] $bugDescription" ReportType.AUTO_UISI_SENDER, ReportType.AUTO_UISI -> bugDescription } @@ -298,9 +298,6 @@ class BugReporter @Inject constructor( // builder.addFormDataPart("label", buildMeta.flavorDescription) // builder.addFormDataPart("label", buildMeta.gitBranchName) - // Special for ElementX - builder.addFormDataPart("label", "[ElementX]") - // Possible values for BuildConfig.BUILD_TYPE: "debug", "nightly", "release". // builder.addFormDataPart("label", BuildConfig.BUILD_TYPE) diff --git a/features/rageshake/src/main/res/values/strings.xml b/features/rageshake/src/main/res/values/strings.xml index 846f0ca048..48eff44d57 100644 --- a/features/rageshake/src/main/res/values/strings.xml +++ b/features/rageshake/src/main/res/values/strings.xml @@ -19,7 +19,7 @@ https://riot.im/bugreports/submit - riot-android + element-x-android element-auto-uisi