From 075510c425372116be7ee0ef908eeee43d7c3ed6 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 10 Apr 2024 11:39:38 +0200
Subject: [PATCH] Add `desktopApplicationName` to BuildMeta.

---
 .../io/element/android/x/di/AppModule.kt      |  2 ++
 .../android/libraries/core/meta/BuildMeta.kt  |  1 +
 .../libraries/matrix/test/core/BuildMeta.kt   | 24 ++++++++++---------
 .../android/samples/minimal/Singleton.kt      |  1 +
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/app/src/main/kotlin/io/element/android/x/di/AppModule.kt b/app/src/main/kotlin/io/element/android/x/di/AppModule.kt
index 47a2c373ad..5c57dc3519 100644
--- a/app/src/main/kotlin/io/element/android/x/di/AppModule.kt
+++ b/app/src/main/kotlin/io/element/android/x/di/AppModule.kt
@@ -80,6 +80,8 @@ object AppModule {
         isDebuggable = BuildConfig.DEBUG,
         buildType = buildType,
         applicationName = context.getString(R.string.app_name),
+        // Use the same name for desktop and mobile for now
+        desktopApplicationName = context.getString(R.string.app_name),
         applicationId = BuildConfig.APPLICATION_ID,
         // TODO EAx Config.LOW_PRIVACY_LOG_ENABLE,
         lowPrivacyLoggingEnabled = false,
diff --git a/libraries/core/src/main/kotlin/io/element/android/libraries/core/meta/BuildMeta.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/meta/BuildMeta.kt
index cac30e02e4..051a5dcf85 100644
--- a/libraries/core/src/main/kotlin/io/element/android/libraries/core/meta/BuildMeta.kt
+++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/meta/BuildMeta.kt
@@ -20,6 +20,7 @@ data class BuildMeta(
     val buildType: BuildType,
     val isDebuggable: Boolean,
     val applicationName: String,
+    val desktopApplicationName: String,
     val applicationId: String,
     val lowPrivacyLoggingEnabled: Boolean,
     val versionName: String,
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/core/BuildMeta.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/core/BuildMeta.kt
index f3a704ddc5..c23e5e82c3 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/core/BuildMeta.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/core/BuildMeta.kt
@@ -23,6 +23,7 @@ fun aBuildMeta(
     buildType: BuildType = BuildType.DEBUG,
     isDebuggable: Boolean = true,
     applicationName: String = "",
+    desktopApplicationName: String = applicationName,
     applicationId: String = "",
     lowPrivacyLoggingEnabled: Boolean = true,
     versionName: String = "",
@@ -32,15 +33,16 @@ fun aBuildMeta(
     flavorDescription: String = "",
     flavorShortDescription: String = "",
 ) = BuildMeta(
-    buildType,
-    isDebuggable,
-    applicationName,
-    applicationId,
-    lowPrivacyLoggingEnabled,
-    versionName,
-    versionCode,
-    gitRevision,
-    gitBranchName,
-    flavorDescription,
-    flavorShortDescription
+    buildType = buildType,
+    isDebuggable = isDebuggable,
+    applicationName = applicationName,
+    desktopApplicationName = desktopApplicationName,
+    applicationId = applicationId,
+    lowPrivacyLoggingEnabled = lowPrivacyLoggingEnabled,
+    versionName = versionName,
+    versionCode = versionCode,
+    gitRevision = gitRevision,
+    gitBranchName = gitBranchName,
+    flavorDescription = flavorDescription,
+    flavorShortDescription = flavorShortDescription
 )
diff --git a/samples/minimal/src/main/kotlin/io/element/android/samples/minimal/Singleton.kt b/samples/minimal/src/main/kotlin/io/element/android/samples/minimal/Singleton.kt
index 06e8fb02f4..17c744bb41 100644
--- a/samples/minimal/src/main/kotlin/io/element/android/samples/minimal/Singleton.kt
+++ b/samples/minimal/src/main/kotlin/io/element/android/samples/minimal/Singleton.kt
@@ -33,6 +33,7 @@ object Singleton {
         isDebuggable = true,
         buildType = BuildType.DEBUG,
         applicationName = "EAX-Minimal",
+        desktopApplicationName = "EAX-Minimal-Desktop",
         applicationId = "io.element.android.samples.minimal",
         lowPrivacyLoggingEnabled = false,
         versionName = "0.1.0",