Browse Source

Add `desktopApplicationName` to BuildMeta.

pull/2686/head
Benoit Marty 5 months ago committed by Benoit Marty
parent
commit
075510c425
  1. 2
      app/src/main/kotlin/io/element/android/x/di/AppModule.kt
  2. 1
      libraries/core/src/main/kotlin/io/element/android/libraries/core/meta/BuildMeta.kt
  3. 24
      libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/core/BuildMeta.kt
  4. 1
      samples/minimal/src/main/kotlin/io/element/android/samples/minimal/Singleton.kt

2
app/src/main/kotlin/io/element/android/x/di/AppModule.kt

@ -80,6 +80,8 @@ object AppModule { @@ -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,

1
libraries/core/src/main/kotlin/io/element/android/libraries/core/meta/BuildMeta.kt

@ -20,6 +20,7 @@ data class BuildMeta( @@ -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,

24
libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/core/BuildMeta.kt

@ -23,6 +23,7 @@ fun aBuildMeta( @@ -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( @@ -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
)

1
samples/minimal/src/main/kotlin/io/element/android/samples/minimal/Singleton.kt

@ -33,6 +33,7 @@ object Singleton { @@ -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",

Loading…
Cancel
Save