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

Add isEnterpriseBuild to BuildMeta

Browse source
This commit is contained in:
Benoit Marty 2024-06-13 11:14:53 +02:00 • committed by Benoit Marty
parent 03491b81e7
commit ff78512b78
4 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -24,6 +24,7 @@ import com.squareup.anvil.annotations.ContributesTo
import dagger.Module import dagger.Module
import dagger.Provides import dagger.Provides
import io.element.android.appconfig.ApplicationConfig import io.element.android.appconfig.ApplicationConfig
import io.element.android.features.enterprise.api.EnterpriseService
import io.element.android.features.messages.impl.timeline.components.customreaction.DefaultEmojibaseProvider import io.element.android.features.messages.impl.timeline.components.customreaction.DefaultEmojibaseProvider
import io.element.android.features.messages.impl.timeline.components.customreaction.EmojibaseProvider import io.element.android.features.messages.impl.timeline.components.customreaction.EmojibaseProvider
import io.element.android.libraries.androidutils.system.getVersionCodeFromManifest import io.element.android.libraries.androidutils.system.getVersionCodeFromManifest
@ -77,13 +78,18 @@ object AppModule {
@Provides @Provides
@SingleIn(AppScope::class) @SingleIn(AppScope::class)
fun providesBuildMeta(@ApplicationContext context: Context, buildType: BuildType) = BuildMeta( fun providesBuildMeta(
@ApplicationContext context: Context,
buildType: BuildType,
enterpriseService: EnterpriseService,
) = BuildMeta(
isDebuggable = BuildConfig.DEBUG, isDebuggable = BuildConfig.DEBUG,
buildType = buildType, buildType = buildType,
applicationName = ApplicationConfig.APPLICATION_NAME.takeIf { it.isNotEmpty() } ?: context.getString(R.string.app_name), applicationName = ApplicationConfig.APPLICATION_NAME.takeIf { it.isNotEmpty() } ?: context.getString(R.string.app_name),
productionApplicationName = ApplicationConfig.PRODUCTION_APPLICATION_NAME, productionApplicationName = ApplicationConfig.PRODUCTION_APPLICATION_NAME,
desktopApplicationName = ApplicationConfig.DESKTOP_APPLICATION_NAME, desktopApplicationName = ApplicationConfig.DESKTOP_APPLICATION_NAME,
applicationId = BuildConfig.APPLICATION_ID, applicationId = BuildConfig.APPLICATION_ID,
isEnterpriseBuild = enterpriseService.isEnterpriseBuild,
// TODO EAx Config.LOW_PRIVACY_LOG_ENABLE, // TODO EAx Config.LOW_PRIVACY_LOG_ENABLE,
lowPrivacyLoggingEnabled = false, lowPrivacyLoggingEnabled = false,
versionName = BuildConfig.VERSION_NAME, versionName = BuildConfig.VERSION_NAME,

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

@ -23,6 +23,7 @@ data class BuildMeta(
val productionApplicationName: String, val productionApplicationName: String,
val desktopApplicationName: String, val desktopApplicationName: String,
val applicationId: String, val applicationId: String,
val isEnterpriseBuild: Boolean,
val lowPrivacyLoggingEnabled: Boolean, val lowPrivacyLoggingEnabled: Boolean,
val versionName: String, val versionName: String,
val versionCode: Long, val versionCode: Long,

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

@ -26,6 +26,7 @@ fun aBuildMeta(
productionApplicationName: String = applicationName, productionApplicationName: String = applicationName,
desktopApplicationName: String = applicationName, desktopApplicationName: String = applicationName,
applicationId: String = "", applicationId: String = "",
isEnterpriseBuild: Boolean = false,
lowPrivacyLoggingEnabled: Boolean = true, lowPrivacyLoggingEnabled: Boolean = true,
versionName: String = "", versionName: String = "",
versionCode: Long = 0, versionCode: Long = 0,
@ -40,6 +41,7 @@ fun aBuildMeta(
productionApplicationName = productionApplicationName, productionApplicationName = productionApplicationName,
desktopApplicationName = desktopApplicationName, desktopApplicationName = desktopApplicationName,
applicationId = applicationId, applicationId = applicationId,
isEnterpriseBuild = isEnterpriseBuild,
lowPrivacyLoggingEnabled = lowPrivacyLoggingEnabled, lowPrivacyLoggingEnabled = lowPrivacyLoggingEnabled,
versionName = versionName, versionName = versionName,
versionCode = versionCode, versionCode = versionCode,

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

@ -36,6 +36,7 @@ object Singleton {
productionApplicationName = "EAX-Minimal", productionApplicationName = "EAX-Minimal",
desktopApplicationName = "EAX-Minimal-Desktop", desktopApplicationName = "EAX-Minimal-Desktop",
applicationId = "io.element.android.samples.minimal", applicationId = "io.element.android.samples.minimal",
isEnterpriseBuild = false,
lowPrivacyLoggingEnabled = false, lowPrivacyLoggingEnabled = false,
versionName = "0.1.0", versionName = "0.1.0",
versionCode = 1, versionCode = 1,