Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Add desktopApplicationName to BuildMeta.

Browse source
This commit is contained in:
Benoit Marty 2024-04-10 11:39:38 +02:00 • committed by Benoit Marty
parent d9957a4d25
commit 3ffa168774
4 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -80,6 +80,8 @@ object AppModule {
isDebuggable = BuildConfig.DEBUG, isDebuggable = BuildConfig.DEBUG,
buildType = buildType, buildType = buildType,
applicationName = context.getString(R.string.app_name), 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, applicationId = BuildConfig.APPLICATION_ID,
// TODO EAx Config.LOW_PRIVACY_LOG_ENABLE, // TODO EAx Config.LOW_PRIVACY_LOG_ENABLE,
lowPrivacyLoggingEnabled = false, lowPrivacyLoggingEnabled = false,

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

@ -20,6 +20,7 @@ data class BuildMeta(
val buildType: BuildType, val buildType: BuildType,
val isDebuggable: Boolean, val isDebuggable: Boolean,
val applicationName: String, val applicationName: String,
val desktopApplicationName: String,
val applicationId: String, val applicationId: String,
val lowPrivacyLoggingEnabled: Boolean, val lowPrivacyLoggingEnabled: Boolean,
val versionName: String, val versionName: String,

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

@ -23,6 +23,7 @@ fun aBuildMeta(
buildType: BuildType = BuildType.DEBUG, buildType: BuildType = BuildType.DEBUG,
isDebuggable: Boolean = true, isDebuggable: Boolean = true,
applicationName: String = "", applicationName: String = "",
desktopApplicationName: String = applicationName,
applicationId: String = "", applicationId: String = "",
lowPrivacyLoggingEnabled: Boolean = true, lowPrivacyLoggingEnabled: Boolean = true,
versionName: String = "", versionName: String = "",
@ -32,15 +33,16 @@ fun aBuildMeta(
flavorDescription: String = "", flavorDescription: String = "",
flavorShortDescription: String = "", flavorShortDescription: String = "",
) = BuildMeta( ) = BuildMeta(
buildType, buildType = buildType,
isDebuggable, isDebuggable = isDebuggable,
applicationName, applicationName = applicationName,
applicationId, desktopApplicationName = desktopApplicationName,
lowPrivacyLoggingEnabled, applicationId = applicationId,
versionName, lowPrivacyLoggingEnabled = lowPrivacyLoggingEnabled,
versionCode, versionName = versionName,
gitRevision, versionCode = versionCode,
gitBranchName, gitRevision = gitRevision,
flavorDescription, gitBranchName = gitBranchName,
flavorShortDescription flavorDescription = flavorDescription,
flavorShortDescription = flavorShortDescription
) )

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

@ -33,6 +33,7 @@ object Singleton {
isDebuggable = true, isDebuggable = true,
buildType = BuildType.DEBUG, buildType = BuildType.DEBUG,
applicationName = "EAX-Minimal", applicationName = "EAX-Minimal",
desktopApplicationName = "EAX-Minimal-Desktop",
applicationId = "io.element.android.samples.minimal", applicationId = "io.element.android.samples.minimal",
lowPrivacyLoggingEnabled = false, lowPrivacyLoggingEnabled = false,
versionName = "0.1.0", versionName = "0.1.0",