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

Ensure enterprise build only use the application names.

Browse source
This commit is contained in:
Benoit Marty 2025-02-21 11:43:47 +01:00
parent d23efc3053
commit 610c06c1fd
1 changed files with 20 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -73,23 +73,26 @@ object AppModule {
@ApplicationContext context: Context, @ApplicationContext context: Context,
buildType: BuildType, buildType: BuildType,
enterpriseService: EnterpriseService, enterpriseService: EnterpriseService,
) = BuildMeta( ): BuildMeta {
isDebuggable = BuildConfig.DEBUG, val applicationName = ApplicationConfig.APPLICATION_NAME.takeIf { it.isNotEmpty() } ?: context.getString(R.string.app_name)
buildType = buildType, return BuildMeta(
applicationName = ApplicationConfig.APPLICATION_NAME.takeIf { it.isNotEmpty() } ?: context.getString(R.string.app_name), isDebuggable = BuildConfig.DEBUG,
productionApplicationName = ApplicationConfig.PRODUCTION_APPLICATION_NAME, buildType = buildType,
desktopApplicationName = ApplicationConfig.DESKTOP_APPLICATION_NAME, applicationName = applicationName,
applicationId = BuildConfig.APPLICATION_ID, productionApplicationName = if (enterpriseService.isEnterpriseBuild) applicationName else ApplicationConfig.PRODUCTION_APPLICATION_NAME,
isEnterpriseBuild = enterpriseService.isEnterpriseBuild, desktopApplicationName = if (enterpriseService.isEnterpriseBuild) applicationName else ApplicationConfig.DESKTOP_APPLICATION_NAME,
// TODO EAx Config.LOW_PRIVACY_LOG_ENABLE, applicationId = BuildConfig.APPLICATION_ID,
lowPrivacyLoggingEnabled = false, isEnterpriseBuild = enterpriseService.isEnterpriseBuild,
versionName = BuildConfig.VERSION_NAME, // TODO EAx Config.LOW_PRIVACY_LOG_ENABLE,
versionCode = context.getVersionCodeFromManifest(), lowPrivacyLoggingEnabled = false,
gitRevision = BuildConfig.GIT_REVISION, versionName = BuildConfig.VERSION_NAME,
gitBranchName = BuildConfig.GIT_BRANCH_NAME, versionCode = context.getVersionCodeFromManifest(),
flavorDescription = BuildConfig.FLAVOR_DESCRIPTION, gitRevision = BuildConfig.GIT_REVISION,
flavorShortDescription = BuildConfig.SHORT_FLAVOR_DESCRIPTION, gitBranchName = BuildConfig.GIT_BRANCH_NAME,
) flavorDescription = BuildConfig.FLAVOR_DESCRIPTION,
flavorShortDescription = BuildConfig.SHORT_FLAVOR_DESCRIPTION,
)
}
@Provides @Provides
@SingleIn(AppScope::class) @SingleIn(AppScope::class)