From 31796d9248d3c35b8af4c381d9db34115b2e4590 Mon Sep 17 00:00:00 2001
From: Yoan Pintas <yoan@pintas.bzh>
Date: Thu, 14 Sep 2023 08:30:08 +0000
Subject: [PATCH] Update appname in crash logs (#969)

---
 changelog.d/969.misc                                      | 1 +
 .../java/im/vector/app/core/resources/AppNameProvider.kt  | 2 +-
 .../features/rageshake/VectorUncaughtExceptionHandler.kt  | 8 +++++---
 3 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 changelog.d/969.misc

diff --git a/changelog.d/969.misc b/changelog.d/969.misc
new file mode 100644
index 0000000000..33f7bee009
--- /dev/null
+++ b/changelog.d/969.misc
@@ -0,0 +1 @@
+Update appname in crash logs
\ No newline at end of file
diff --git a/vector/src/main/java/im/vector/app/core/resources/AppNameProvider.kt b/vector/src/main/java/im/vector/app/core/resources/AppNameProvider.kt
index a25862f3a8..2686e489bf 100644
--- a/vector/src/main/java/im/vector/app/core/resources/AppNameProvider.kt
+++ b/vector/src/main/java/im/vector/app/core/resources/AppNameProvider.kt
@@ -40,7 +40,7 @@ class DefaultAppNameProvider @Inject constructor(private val context: Context) :
             appName
         } catch (e: Exception) {
             Timber.e(e, "## AppNameProvider() : failed")
-            "ElementAndroid"
+            "TchapAndroid"
         }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/rageshake/VectorUncaughtExceptionHandler.kt b/vector/src/main/java/im/vector/app/features/rageshake/VectorUncaughtExceptionHandler.kt
index d3174631e8..6d6ecd9edc 100644
--- a/vector/src/main/java/im/vector/app/features/rageshake/VectorUncaughtExceptionHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/rageshake/VectorUncaughtExceptionHandler.kt
@@ -20,6 +20,7 @@ import android.content.SharedPreferences
 import android.os.Build
 import androidx.core.content.edit
 import im.vector.app.core.di.DefaultPreferences
+import im.vector.app.core.resources.AppNameProvider
 import im.vector.app.core.resources.VersionCodeProvider
 import im.vector.app.features.version.VersionProvider
 import org.matrix.android.sdk.api.Matrix
@@ -36,6 +37,7 @@ class VectorUncaughtExceptionHandler @Inject constructor(
         private val bugReporter: BugReporter,
         private val versionProvider: VersionProvider,
         private val versionCodeProvider: VersionCodeProvider,
+        private val appNameProvider: AppNameProvider,
 ) : Thread.UncaughtExceptionHandler {
 
     // key to save the crash status
@@ -67,12 +69,12 @@ class VectorUncaughtExceptionHandler @Inject constructor(
             putBoolean(PREFS_CRASH_KEY, true)
         }
         val b = StringBuilder()
-        val appName = "Element" // TODO Matrix.getApplicationName()
+        val appName = appNameProvider.getAppName()
 
-        b.append(appName + " Build : " + versionCodeProvider.getVersionCode() + "\n")
+        b.append("$appName Build : ${versionCodeProvider.getVersionCode()}\n")
         b.append("$appName Version : ${versionProvider.getVersion(longFormat = true)}\n")
         b.append("SDK Version : ${Matrix.getSdkVersion()}\n")
-        b.append("Phone : " + Build.MODEL.trim() + " (" + Build.VERSION.INCREMENTAL + " " + Build.VERSION.RELEASE + " " + Build.VERSION.CODENAME + ")\n")
+        b.append("Phone : ${Build.MODEL.trim()} (${Build.VERSION.INCREMENTAL} ${Build.VERSION.RELEASE} ${Build.VERSION.CODENAME})\n")
 
         b.append("Memory statuses \n")