filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

renaming login version to variants to better describe the different flows

Browse Source
This commit is contained in:
Adam Brown 2021-12-08 11:54:21 +00:00
parent dae2e9988f
commit fd0e1e44c4
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vector/build.gradle
View File

@ -140,7 +140,7 @@ android {
buildConfigField "String", "BUILD_NUMBER", "\"${buildNumber}\"" buildConfigField "String", "BUILD_NUMBER", "\"${buildNumber}\""
resValue "string", "build_number", "\"${buildNumber}\"" resValue "string", "build_number", "\"${buildNumber}\""
buildConfigField "im.vector.app.features.VectorFeatures.LoginVersion", "LOGIN_VERSION", "im.vector.app.features.VectorFeatures.LoginVersion.V1" buildConfigField "im.vector.app.features.VectorFeatures.LoginVariant", "LOGIN_VARIANT", "im.vector.app.features.VectorFeatures.LoginVariant.LEGACY"
buildConfigField "im.vector.app.features.crypto.keysrequest.OutboundSessionKeySharingStrategy", "outboundSessionKeySharingStrategy", "im.vector.app.features.crypto.keysrequest.OutboundSessionKeySharingStrategy.WhenTyping" buildConfigField "im.vector.app.features.crypto.keysrequest.OutboundSessionKeySharingStrategy", "outboundSessionKeySharingStrategy", "im.vector.app.features.crypto.keysrequest.OutboundSessionKeySharingStrategy.WhenTyping"

4
vector/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt
View File

@ -28,8 +28,8 @@ class DebugFeaturesStateFactory @Inject constructor(
return FeaturesState(listOf( return FeaturesState(listOf(
createEnumFeature( createEnumFeature(
label = "Login version", label = "Login version",
selection = debugFeatures.loginVersion(), selection = debugFeatures.loginVariant(),
default = defaultFeatures.loginVersion() default = defaultFeatures.loginVariant()
) )
)) ))
} }

4
vector/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt
View File

@ -38,8 +38,8 @@ class DebugVectorFeatures(
private val dataStore = context.dataStore private val dataStore = context.dataStore
override fun loginVersion(): VectorFeatures.LoginVersion { override fun loginVariant(): VectorFeatures.LoginVariant {
return readPreferences().getEnum<VectorFeatures.LoginVersion>() ?: vectorFeatures.loginVersion() return readPreferences().getEnum<VectorFeatures.LoginVariant>() ?: vectorFeatures.loginVariant()
} }
fun <T : Enum<T>> hasEnumOverride(type: KClass<T>) = readPreferences().containsEnum(type) fun <T : Enum<T>> hasEnumOverride(type: KClass<T>) = readPreferences().containsEnum(type)

10
vector/src/main/java/im/vector/app/features/VectorFeatures.kt
View File

@ -20,11 +20,11 @@ import im.vector.app.BuildConfig
interface VectorFeatures { interface VectorFeatures {
fun loginVersion(): LoginVersion fun loginVariant(): LoginVariant
enum class LoginVersion { enum class LoginVariant {
V1, LEGACY,
V2 FTUE_WIP
} }
enum class NotificationSettingsVersion { enum class NotificationSettingsVersion {
@ -34,5 +34,5 @@ interface VectorFeatures {
} }
class DefaultVectorFeatures : VectorFeatures { class DefaultVectorFeatures : VectorFeatures {
override fun loginVersion(): VectorFeatures.LoginVersion = BuildConfig.LOGIN_VERSION override fun loginVariant(): VectorFeatures.LoginVariant = BuildConfig.LOGIN_VARIANT
} }

12
vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
View File

@ -110,18 +110,18 @@ class DefaultNavigator @Inject constructor(
) : Navigator { ) : Navigator {
override fun openLogin(context: Context, loginConfig: LoginConfig?, flags: Int) { override fun openLogin(context: Context, loginConfig: LoginConfig?, flags: Int) {
val intent = when (features.loginVersion()) { val intent = when (features.loginVariant()) {
VectorFeatures.LoginVersion.V1 -> LoginActivity.newIntent(context, loginConfig) VectorFeatures.LoginVariant.LEGACY -> LoginActivity.newIntent(context, loginConfig)
VectorFeatures.LoginVersion.V2 -> LoginActivity2.newIntent(context, loginConfig) VectorFeatures.LoginVariant.FTUE_WIP -> LoginActivity2.newIntent(context, loginConfig)
} }
intent.addFlags(flags) intent.addFlags(flags)
context.startActivity(intent) context.startActivity(intent)
} }
override fun loginSSORedirect(context: Context, data: Uri?) { override fun loginSSORedirect(context: Context, data: Uri?) {
val intent = when (features.loginVersion()) { val intent = when (features.loginVariant()) {
VectorFeatures.LoginVersion.V1 -> LoginActivity.redirectIntent(context, data) VectorFeatures.LoginVariant.LEGACY -> LoginActivity.redirectIntent(context, data)
VectorFeatures.LoginVersion.V2 -> LoginActivity2.redirectIntent(context, data) VectorFeatures.LoginVariant.FTUE_WIP -> LoginActivity2.redirectIntent(context, data)
} }
context.startActivity(intent) context.startActivity(intent)
} }