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

Rename ElementX to Element X. Only for user facing value. In the doc I prefer to keep ElementX.

Browse source
This commit is contained in:
Benoit Marty 2023-06-27 16:37:17 +02:00 • committed by Benoit Marty
parent 6174a36d66
commit f84b2ebbb0
4 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/build.gradle.kts
View file

@ -92,13 +92,13 @@ android {
buildTypes { buildTypes {
named("debug") { named("debug") {
resValue("string", "app_name", "ElementX dbg") resValue("string", "app_name", "Element X dbg")
applicationIdSuffix = ".debug" applicationIdSuffix = ".debug"
signingConfig = signingConfigs.getByName("debug") signingConfig = signingConfigs.getByName("debug")
} }
named("release") { named("release") {
resValue("string", "app_name", "ElementX") resValue("string", "app_name", "Element X")
signingConfig = signingConfigs.getByName("debug") signingConfig = signingConfigs.getByName("debug")
postprocessing { postprocessing {
@ -115,7 +115,7 @@ android {
initWith(release) initWith(release)
applicationIdSuffix = ".nightly" applicationIdSuffix = ".nightly"
versionNameSuffix = "-nightly" versionNameSuffix = "-nightly"
resValue("string", "app_name", "ElementX nightly") resValue("string", "app_name", "Element X nightly")
matchingFallbacks += listOf("release") matchingFallbacks += listOf("release")
signingConfig = signingConfigs.getByName("nightly") signingConfig = signingConfigs.getByName("nightly")

2
features/analytics/api/src/main/kotlin/io/element/android/features/analytics/api/preferences/AnalyticsPreferencesStateProvider.kt
View file

@ -26,7 +26,7 @@ open class AnalyticsPreferencesStateProvider : PreviewParameterProvider<Analytic
} }
fun aAnalyticsPreferencesState() = AnalyticsPreferencesState( fun aAnalyticsPreferencesState() = AnalyticsPreferencesState(
applicationName = "ElementX", applicationName = "Element X",
isEnabled = false, isEnabled = false,
eventSink = {} eventSink = {}
) )

4
features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInStateProvider.kt
View file

@ -17,8 +17,6 @@
package io.element.android.features.analytics.impl package io.element.android.features.analytics.impl
import androidx.compose.ui.tooling.preview.PreviewParameterProvider import androidx.compose.ui.tooling.preview.PreviewParameterProvider
import io.element.android.libraries.architecture.Async
import io.element.android.libraries.core.meta.BuildMeta
import javax.inject.Inject import javax.inject.Inject
open class AnalyticsOptInStateProvider @Inject constructor( open class AnalyticsOptInStateProvider @Inject constructor(
@ -30,6 +28,6 @@ open class AnalyticsOptInStateProvider @Inject constructor(
} }
fun aAnalyticsOptInState() = AnalyticsOptInState( fun aAnalyticsOptInState() = AnalyticsOptInState(
applicationName = "ElementX", applicationName = "Element X",
eventSink = {} eventSink = {}
) )

2
libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/RustMatrixAuthenticationService.kt
View file

@ -116,7 +116,7 @@ class RustMatrixAuthenticationService @Inject constructor(
override suspend fun login(username: String, password: String): Result<SessionId> = override suspend fun login(username: String, password: String): Result<SessionId> =
withContext(coroutineDispatchers.io) { withContext(coroutineDispatchers.io) {
runCatching { runCatching {
val client = authService.login(username, password, "ElementX Android", null) val client = authService.login(username, password, "Element X Android", null)
val sessionData = client.use { it.session().toSessionData() } val sessionData = client.use { it.session().toSessionData() }
sessionStore.storeData(sessionData) sessionStore.storeData(sessionData)
SessionId(sessionData.userId) SessionId(sessionData.userId)