mirror of
https://github.com/SchildiChat/SchildiChat-android.git
synced 2024-11-22 01:15:54 +03:00
renaming the ftue domain to onboarding and ftue to ftue auth
This commit is contained in:
Adam Brown
parent
1e5c057223
commit
98078da13d
17 changed files with 232 additions and 209 deletions
|
|
@ -140,7 +140,7 @@ android {
|
|||
buildConfigField "String", "BUILD_NUMBER", "\"${buildNumber}\""
|
||||
resValue "string", "build_number", "\"${buildNumber}\""
|
||||
|
||||
buildConfigField "im.vector.app.features.VectorFeatures.LoginVariant", "LOGIN_VARIANT", "im.vector.app.features.VectorFeatures.LoginVariant.LEGACY"
|
||||
buildConfigField "im.vector.app.features.VectorFeatures.OnboardingVariant", "ONBOARDING_VARIANT", "im.vector.app.features.VectorFeatures.OnboardingVariant.LEGACY"
|
||||
|
||||
buildConfigField "im.vector.app.features.crypto.keysrequest.OutboundSessionKeySharingStrategy", "outboundSessionKeySharingStrategy", "im.vector.app.features.crypto.keysrequest.OutboundSessionKeySharingStrategy.WhenTyping"
|
||||
|
||||
|
|
|
|||
|
|
@ -27,9 +27,9 @@ class DebugFeaturesStateFactory @Inject constructor(
|
|||
fun create(): FeaturesState {
|
||||
return FeaturesState(listOf(
|
||||
createEnumFeature(
|
||||
label = "Login version",
|
||||
selection = debugFeatures.loginVariant(),
|
||||
default = defaultFeatures.loginVariant()
|
||||
label = "Onboarding variant",
|
||||
selection = debugFeatures.onboardingVariant(),
|
||||
default = defaultFeatures.onboardingVariant()
|
||||
)
|
||||
))
|
||||
}
|
||||
|
|
|
|||
|
|
@ -38,8 +38,8 @@ class DebugVectorFeatures(
|
|||
|
||||
private val dataStore = context.dataStore
|
||||
|
||||
override fun loginVariant(): VectorFeatures.LoginVariant {
|
||||
return readPreferences().getEnum<VectorFeatures.LoginVariant>() ?: vectorFeatures.loginVariant()
|
||||
override fun onboardingVariant(): VectorFeatures.OnboardingVariant {
|
||||
return readPreferences().getEnum<VectorFeatures.OnboardingVariant>() ?: vectorFeatures.onboardingVariant()
|
||||
}
|
||||
|
||||
fun <T : Enum<T>> hasEnumOverride(type: KClass<T>) = readPreferences().containsEnum(type)
|
||||
|
|
|
|||
|
|
@ -137,7 +137,7 @@
|
|||
android:windowSoftInputMode="adjustResize" />
|
||||
|
||||
<activity
|
||||
android:name=".features.ftue.FTUEActivity"
|
||||
android:name=".features.onboarding.OnboardingActivity"
|
||||
android:launchMode="singleTask"
|
||||
android:windowSoftInputMode="adjustResize" />
|
||||
|
||||
|
|
|
|||
|
|
@ -37,7 +37,6 @@ import im.vector.app.features.crypto.verification.emoji.VerificationEmojiCodeVie
|
|||
import im.vector.app.features.devtools.RoomDevToolViewModel
|
||||
import im.vector.app.features.discovery.DiscoverySettingsViewModel
|
||||
import im.vector.app.features.discovery.change.SetIdentityServerViewModel
|
||||
import im.vector.app.features.ftue.FTUEViewModel
|
||||
import im.vector.app.features.home.HomeActivityViewModel
|
||||
import im.vector.app.features.home.HomeDetailViewModel
|
||||
import im.vector.app.features.home.PromoteRestrictedViewModel
|
||||
|
|
@ -58,6 +57,7 @@ import im.vector.app.features.login.LoginViewModel
|
|||
import im.vector.app.features.login2.LoginViewModel2
|
||||
import im.vector.app.features.login2.created.AccountCreatedViewModel
|
||||
import im.vector.app.features.matrixto.MatrixToBottomSheetViewModel
|
||||
import im.vector.app.features.onboarding.OnboardingViewModel
|
||||
import im.vector.app.features.poll.create.CreatePollViewModel
|
||||
import im.vector.app.features.rageshake.BugReportViewModel
|
||||
import im.vector.app.features.reactions.EmojiSearchResultViewModel
|
||||
|
|
@ -450,8 +450,8 @@ interface MavericksViewModelModule {
|
|||
|
||||
@Binds
|
||||
@IntoMap
|
||||
@MavericksViewModelKey(FTUEViewModel::class)
|
||||
fun ftueViewModelFactory(factory: FTUEViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
|
||||
@MavericksViewModelKey(OnboardingViewModel::class)
|
||||
fun ftueViewModelFactory(factory: OnboardingViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
|
||||
|
||||
@Binds
|
||||
@IntoMap
|
||||
|
|
|
|||
|
|
@ -20,12 +20,12 @@ import im.vector.app.BuildConfig
|
|||
|
||||
interface VectorFeatures {
|
||||
|
||||
fun loginVariant(): LoginVariant
|
||||
fun onboardingVariant(): OnboardingVariant
|
||||
|
||||
enum class LoginVariant {
|
||||
enum class OnboardingVariant {
|
||||
LEGACY,
|
||||
FTUE,
|
||||
FTUE_WIP
|
||||
LOGIN_2,
|
||||
FTUE_AUTH
|
||||
}
|
||||
|
||||
enum class NotificationSettingsVersion {
|
||||
|
|
@ -35,5 +35,5 @@ interface VectorFeatures {
|
|||
}
|
||||
|
||||
class DefaultVectorFeatures : VectorFeatures {
|
||||
override fun loginVariant(): VectorFeatures.LoginVariant = BuildConfig.LOGIN_VARIANT
|
||||
override fun onboardingVariant(): VectorFeatures.OnboardingVariant = BuildConfig.ONBOARDING_VARIANT
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,12 +34,12 @@ import im.vector.app.core.resources.ColorProvider
|
|||
import im.vector.app.databinding.DialogBaseEditTextBinding
|
||||
import im.vector.app.databinding.FragmentLoginAccountCreatedBinding
|
||||
import im.vector.app.features.displayname.getBestName
|
||||
import im.vector.app.features.ftue.FTUEActivity
|
||||
import im.vector.app.features.home.AvatarRenderer
|
||||
import im.vector.app.features.home.room.detail.timeline.helper.MatrixItemColorProvider
|
||||
import im.vector.app.features.login2.AbstractLoginFragment2
|
||||
import im.vector.app.features.login2.LoginAction2
|
||||
import im.vector.app.features.login2.LoginViewState2
|
||||
import im.vector.app.features.onboarding.OnboardingActivity
|
||||
import org.matrix.android.sdk.api.util.MatrixItem
|
||||
import java.util.UUID
|
||||
import javax.inject.Inject
|
||||
|
|
@ -130,7 +130,7 @@ class AccountCreatedFragment @Inject constructor(
|
|||
|
||||
private fun invalidateState(state: AccountCreatedViewState) {
|
||||
// Ugly hack...
|
||||
(activity as? FTUEActivity)?.setIsLoading(state.isLoading)
|
||||
(activity as? OnboardingActivity)?.setIsLoading(state.isLoading)
|
||||
|
||||
views.loginAccountCreatedSubtitle.text = getString(R.string.login_account_created_subtitle, state.userId)
|
||||
|
||||
|
|
|
|||
|
|
@ -38,6 +38,7 @@ import im.vector.app.core.error.fatalError
|
|||
import im.vector.app.core.platform.VectorBaseActivity
|
||||
import im.vector.app.core.utils.toast
|
||||
import im.vector.app.features.VectorFeatures
|
||||
import im.vector.app.features.VectorFeatures.OnboardingVariant
|
||||
import im.vector.app.features.analytics.ui.consent.AnalyticsOptInActivity
|
||||
import im.vector.app.features.call.conference.JitsiCallViewModel
|
||||
import im.vector.app.features.call.conference.VectorJitsiActivity
|
||||
|
|
@ -51,7 +52,6 @@ import im.vector.app.features.crypto.verification.SupportedVerificationMethodsPr
|
|||
import im.vector.app.features.crypto.verification.VerificationBottomSheet
|
||||
import im.vector.app.features.debug.DebugMenuActivity
|
||||
import im.vector.app.features.devtools.RoomDevToolActivity
|
||||
import im.vector.app.features.ftue.FTUEActivity
|
||||
import im.vector.app.features.home.room.detail.RoomDetailActivity
|
||||
import im.vector.app.features.home.room.detail.RoomDetailArgs
|
||||
import im.vector.app.features.home.room.detail.search.SearchActivity
|
||||
|
|
@ -64,6 +64,7 @@ import im.vector.app.features.matrixto.MatrixToBottomSheet
|
|||
import im.vector.app.features.media.AttachmentData
|
||||
import im.vector.app.features.media.BigImageViewerActivity
|
||||
import im.vector.app.features.media.VectorAttachmentViewerActivity
|
||||
import im.vector.app.features.onboarding.OnboardingActivity
|
||||
import im.vector.app.features.pin.PinActivity
|
||||
import im.vector.app.features.pin.PinArgs
|
||||
import im.vector.app.features.pin.PinMode
|
||||
|
|
@ -111,20 +112,20 @@ class DefaultNavigator @Inject constructor(
|
|||
) : Navigator {
|
||||
|
||||
override fun openLogin(context: Context, loginConfig: LoginConfig?, flags: Int) {
|
||||
val intent = when (features.loginVariant()) {
|
||||
VectorFeatures.LoginVariant.LEGACY -> LoginActivity.newIntent(context, loginConfig)
|
||||
VectorFeatures.LoginVariant.FTUE,
|
||||
VectorFeatures.LoginVariant.FTUE_WIP -> FTUEActivity.newIntent(context, loginConfig)
|
||||
val intent = when (features.onboardingVariant()) {
|
||||
OnboardingVariant.LEGACY -> LoginActivity.newIntent(context, loginConfig)
|
||||
OnboardingVariant.LOGIN_2,
|
||||
OnboardingVariant.FTUE_AUTH -> OnboardingActivity.newIntent(context, loginConfig)
|
||||
}
|
||||
intent.addFlags(flags)
|
||||
context.startActivity(intent)
|
||||
}
|
||||
|
||||
override fun loginSSORedirect(context: Context, data: Uri?) {
|
||||
val intent = when (features.loginVariant()) {
|
||||
VectorFeatures.LoginVariant.LEGACY -> LoginActivity.redirectIntent(context, data)
|
||||
VectorFeatures.LoginVariant.FTUE,
|
||||
VectorFeatures.LoginVariant.FTUE_WIP -> FTUEActivity.redirectIntent(context, data)
|
||||
val intent = when (features.onboardingVariant()) {
|
||||
OnboardingVariant.LEGACY -> LoginActivity.redirectIntent(context, data)
|
||||
OnboardingVariant.LOGIN_2,
|
||||
OnboardingVariant.FTUE_AUTH -> OnboardingActivity.redirectIntent(context, data)
|
||||
}
|
||||
context.startActivity(intent)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package im.vector.app.features.ftue
|
||||
package im.vector.app.features.onboarding
|
||||
|
||||
import android.content.Intent
|
||||
import android.view.View
|
||||
|
|
@ -72,12 +72,12 @@ import org.matrix.android.sdk.api.extensions.tryOrNull
|
|||
private const val FRAGMENT_REGISTRATION_STAGE_TAG = "FRAGMENT_REGISTRATION_STAGE_TAG"
|
||||
private const val FRAGMENT_LOGIN_TAG = "FRAGMENT_LOGIN_TAG"
|
||||
|
||||
class FTUEWipVariant(
|
||||
class Login2Variant(
|
||||
private val views: ActivityLoginBinding,
|
||||
private val loginViewModel: LoginViewModel2,
|
||||
private val activity: VectorBaseActivity<ActivityLoginBinding>,
|
||||
private val supportFragmentManager: FragmentManager
|
||||
) : FTUEVariant {
|
||||
) : OnboardingVariant {
|
||||
|
||||
private val enterAnim = R.anim.enter_fade_in
|
||||
private val exitAnim = R.anim.exit_fade_out
|
||||
|
|
@ -112,7 +112,7 @@ class FTUEWipVariant(
|
|||
}
|
||||
|
||||
// Get config extra
|
||||
val loginConfig = activity.intent.getParcelableExtra<LoginConfig?>(FTUEActivity.EXTRA_CONFIG)
|
||||
val loginConfig = activity.intent.getParcelableExtra<LoginConfig?>(OnboardingActivity.EXTRA_CONFIG)
|
||||
if (isFirstCreation) {
|
||||
// TODO Check this
|
||||
loginViewModel.handle(LoginAction2.InitWith(loginConfig))
|
||||
|
|
@ -14,7 +14,7 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package im.vector.app.features.ftue
|
||||
package im.vector.app.features.onboarding
|
||||
|
||||
import im.vector.app.core.platform.VectorViewModelAction
|
||||
import im.vector.app.features.login.LoginConfig
|
||||
|
|
@ -25,23 +25,23 @@ import org.matrix.android.sdk.api.auth.data.SsoIdentityProvider
|
|||
import org.matrix.android.sdk.api.auth.registration.RegisterThreePid
|
||||
import org.matrix.android.sdk.internal.network.ssl.Fingerprint
|
||||
|
||||
sealed class FTUEAction : VectorViewModelAction {
|
||||
data class OnGetStarted(val resetLoginConfig: Boolean) : FTUEAction()
|
||||
sealed class OnboardingAction : VectorViewModelAction {
|
||||
data class OnGetStarted(val resetLoginConfig: Boolean) : OnboardingAction()
|
||||
|
||||
data class UpdateServerType(val serverType: ServerType) : FTUEAction()
|
||||
data class UpdateHomeServer(val homeServerUrl: String) : FTUEAction()
|
||||
data class UpdateSignMode(val signMode: SignMode) : FTUEAction()
|
||||
data class LoginWithToken(val loginToken: String) : FTUEAction()
|
||||
data class WebLoginSuccess(val credentials: Credentials) : FTUEAction()
|
||||
data class InitWith(val loginConfig: LoginConfig?) : FTUEAction()
|
||||
data class ResetPassword(val email: String, val newPassword: String) : FTUEAction()
|
||||
object ResetPasswordMailConfirmed : FTUEAction()
|
||||
data class UpdateServerType(val serverType: ServerType) : OnboardingAction()
|
||||
data class UpdateHomeServer(val homeServerUrl: String) : OnboardingAction()
|
||||
data class UpdateSignMode(val signMode: SignMode) : OnboardingAction()
|
||||
data class LoginWithToken(val loginToken: String) : OnboardingAction()
|
||||
data class WebLoginSuccess(val credentials: Credentials) : OnboardingAction()
|
||||
data class InitWith(val loginConfig: LoginConfig?) : OnboardingAction()
|
||||
data class ResetPassword(val email: String, val newPassword: String) : OnboardingAction()
|
||||
object ResetPasswordMailConfirmed : OnboardingAction()
|
||||
|
||||
// Login or Register, depending on the signMode
|
||||
data class LoginOrRegister(val username: String, val password: String, val initialDeviceName: String) : FTUEAction()
|
||||
data class LoginOrRegister(val username: String, val password: String, val initialDeviceName: String) : OnboardingAction()
|
||||
|
||||
// Register actions
|
||||
open class RegisterAction : FTUEAction()
|
||||
open class RegisterAction : OnboardingAction()
|
||||
|
||||
data class AddThreePid(val threePid: RegisterThreePid) : RegisterAction()
|
||||
object SendAgainThreePid : RegisterAction()
|
||||
|
|
@ -57,7 +57,7 @@ sealed class FTUEAction : VectorViewModelAction {
|
|||
object RegisterDummy : RegisterAction()
|
||||
|
||||
// Reset actions
|
||||
open class ResetAction : FTUEAction()
|
||||
open class ResetAction : OnboardingAction()
|
||||
|
||||
object ResetHomeServerType : ResetAction()
|
||||
object ResetHomeServerUrl : ResetAction()
|
||||
|
|
@ -66,14 +66,14 @@ sealed class FTUEAction : VectorViewModelAction {
|
|||
object ResetResetPassword : ResetAction()
|
||||
|
||||
// Homeserver history
|
||||
object ClearHomeServerHistory : FTUEAction()
|
||||
object ClearHomeServerHistory : OnboardingAction()
|
||||
|
||||
// For the soft logout case
|
||||
data class SetupSsoForSessionRecovery(val homeServerUrl: String,
|
||||
val deviceId: String,
|
||||
val ssoIdentityProviders: List<SsoIdentityProvider>?) : FTUEAction()
|
||||
val ssoIdentityProviders: List<SsoIdentityProvider>?) : OnboardingAction()
|
||||
|
||||
data class PostViewEvent(val viewEvent: FTUEViewEvents) : FTUEAction()
|
||||
data class PostViewEvent(val viewEvent: OnboardingViewEvents) : OnboardingAction()
|
||||
|
||||
data class UserAcceptCertificate(val fingerprint: Fingerprint) : FTUEAction()
|
||||
data class UserAcceptCertificate(val fingerprint: Fingerprint) : OnboardingAction()
|
||||
}
|
||||
|
|
@ -14,7 +14,7 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package im.vector.app.features.ftue
|
||||
package im.vector.app.features.onboarding
|
||||
|
||||
import android.content.Context
|
||||
import android.content.Intent
|
||||
|
|
@ -31,13 +31,13 @@ import im.vector.app.features.pin.UnlockedActivity
|
|||
import javax.inject.Inject
|
||||
|
||||
@AndroidEntryPoint
|
||||
class FTUEActivity : VectorBaseActivity<ActivityLoginBinding>(), ToolbarConfigurable, UnlockedActivity {
|
||||
class OnboardingActivity : VectorBaseActivity<ActivityLoginBinding>(), ToolbarConfigurable, UnlockedActivity {
|
||||
|
||||
private val ftueVariant by lifecycleAwareLazy {
|
||||
ftueVariantFactory.create(this, ftueViewModel = lazyViewModel(), loginViewModel2 = lazyViewModel())
|
||||
private val onboardingVariant by lifecycleAwareLazy {
|
||||
onboardingVariantFactory.create(this, onboardingViewModel = lazyViewModel(), loginViewModel2 = lazyViewModel())
|
||||
}
|
||||
|
||||
@Inject lateinit var ftueVariantFactory: FTUEVariantFactory
|
||||
@Inject lateinit var onboardingVariantFactory: OnboardingVariantFactory
|
||||
|
||||
override fun getBinding() = ActivityLoginBinding.inflate(layoutInflater)
|
||||
|
||||
|
|
@ -49,37 +49,31 @@ class FTUEActivity : VectorBaseActivity<ActivityLoginBinding>(), ToolbarConfigur
|
|||
|
||||
override fun onNewIntent(intent: Intent?) {
|
||||
super.onNewIntent(intent)
|
||||
ftueVariant.onNewIntent(intent)
|
||||
onboardingVariant.onNewIntent(intent)
|
||||
}
|
||||
|
||||
override fun initUiAndData() {
|
||||
ftueVariant.initUiAndData(isFirstCreation())
|
||||
onboardingVariant.initUiAndData(isFirstCreation())
|
||||
}
|
||||
|
||||
// Hack for AccountCreatedFragment
|
||||
fun setIsLoading(isLoading: Boolean) {
|
||||
ftueVariant.setIsLoading(isLoading)
|
||||
onboardingVariant.setIsLoading(isLoading)
|
||||
}
|
||||
|
||||
companion object {
|
||||
const val EXTRA_CONFIG = "EXTRA_CONFIG"
|
||||
|
||||
fun newIntent(context: Context, loginConfig: LoginConfig?): Intent {
|
||||
return Intent(context, FTUEActivity::class.java).apply {
|
||||
return Intent(context, OnboardingActivity::class.java).apply {
|
||||
putExtra(EXTRA_CONFIG, loginConfig)
|
||||
}
|
||||
}
|
||||
|
||||
fun redirectIntent(context: Context, data: Uri?): Intent {
|
||||
return Intent(context, FTUEActivity::class.java).apply {
|
||||
return Intent(context, OnboardingActivity::class.java).apply {
|
||||
setData(data)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
interface FTUEVariant {
|
||||
fun onNewIntent(intent: Intent?)
|
||||
fun initUiAndData(isFirstCreation: Boolean)
|
||||
fun setIsLoading(isLoading: Boolean)
|
||||
}
|
||||
|
|
@ -14,7 +14,7 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package im.vector.app.features.ftue
|
||||
package im.vector.app.features.onboarding
|
||||
|
||||
import android.content.Intent
|
||||
import android.view.View
|
||||
|
|
@ -66,12 +66,12 @@ import org.matrix.android.sdk.api.extensions.tryOrNull
|
|||
private const val FRAGMENT_REGISTRATION_STAGE_TAG = "FRAGMENT_REGISTRATION_STAGE_TAG"
|
||||
private const val FRAGMENT_LOGIN_TAG = "FRAGMENT_LOGIN_TAG"
|
||||
|
||||
class DefaultFTUEVariant(
|
||||
class OnboardingAuthVariant(
|
||||
private val views: ActivityLoginBinding,
|
||||
private val ftueViewModel: FTUEViewModel,
|
||||
private val onboardingViewModel: OnboardingViewModel,
|
||||
private val activity: VectorBaseActivity<ActivityLoginBinding>,
|
||||
private val supportFragmentManager: FragmentManager
|
||||
) : FTUEVariant {
|
||||
) : OnboardingVariant {
|
||||
|
||||
private val enterAnim = R.anim.enter_fade_in
|
||||
private val exitAnim = R.anim.exit_fade_out
|
||||
|
|
@ -99,16 +99,16 @@ class DefaultFTUEVariant(
|
|||
}
|
||||
|
||||
with(activity) {
|
||||
ftueViewModel.onEach {
|
||||
onboardingViewModel.onEach {
|
||||
updateWithState(it)
|
||||
}
|
||||
ftueViewModel.observeViewEvents { handleLoginViewEvents(it) }
|
||||
onboardingViewModel.observeViewEvents { handleLoginViewEvents(it) }
|
||||
}
|
||||
|
||||
// Get config extra
|
||||
val loginConfig = activity.intent.getParcelableExtra<LoginConfig?>(FTUEActivity.EXTRA_CONFIG)
|
||||
val loginConfig = activity.intent.getParcelableExtra<LoginConfig?>(OnboardingActivity.EXTRA_CONFIG)
|
||||
if (isFirstCreation) {
|
||||
ftueViewModel.handle(FTUEAction.InitWith(loginConfig))
|
||||
onboardingViewModel.handle(OnboardingAction.InitWith(loginConfig))
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -120,17 +120,17 @@ class DefaultFTUEVariant(
|
|||
activity.addFragment(views.loginFragmentContainer, LoginSplashFragment::class.java)
|
||||
}
|
||||
|
||||
private fun handleLoginViewEvents(ftueViewEvents: FTUEViewEvents) {
|
||||
when (ftueViewEvents) {
|
||||
is FTUEViewEvents.RegistrationFlowResult -> {
|
||||
private fun handleLoginViewEvents(onboardingViewEvents: OnboardingViewEvents) {
|
||||
when (onboardingViewEvents) {
|
||||
is OnboardingViewEvents.RegistrationFlowResult -> {
|
||||
// Check that all flows are supported by the application
|
||||
if (ftueViewEvents.flowResult.missingStages.any { !it.isSupported() }) {
|
||||
if (onboardingViewEvents.flowResult.missingStages.any { !it.isSupported() }) {
|
||||
// Display a popup to propose use web fallback
|
||||
onRegistrationStageNotSupported()
|
||||
} else {
|
||||
if (ftueViewEvents.isRegistrationStarted) {
|
||||
if (onboardingViewEvents.isRegistrationStarted) {
|
||||
// Go on with registration flow
|
||||
handleRegistrationNavigation(ftueViewEvents.flowResult)
|
||||
handleRegistrationNavigation(onboardingViewEvents.flowResult)
|
||||
} else {
|
||||
// First ask for login and password
|
||||
// I add a tag to indicate that this fragment is a registration stage.
|
||||
|
|
@ -143,7 +143,7 @@ class DefaultFTUEVariant(
|
|||
}
|
||||
}
|
||||
}
|
||||
is FTUEViewEvents.OutdatedHomeserver -> {
|
||||
is OnboardingViewEvents.OutdatedHomeserver -> {
|
||||
MaterialAlertDialogBuilder(activity)
|
||||
.setTitle(R.string.login_error_outdated_homeserver_title)
|
||||
.setMessage(R.string.login_error_outdated_homeserver_warning_content)
|
||||
|
|
@ -151,7 +151,7 @@ class DefaultFTUEVariant(
|
|||
.show()
|
||||
Unit
|
||||
}
|
||||
is FTUEViewEvents.OpenServerSelection ->
|
||||
is OnboardingViewEvents.OpenServerSelection ->
|
||||
activity.addFragmentToBackstack(views.loginFragmentContainer,
|
||||
LoginServerSelectionFragment::class.java,
|
||||
option = { ft ->
|
||||
|
|
@ -163,63 +163,63 @@ class DefaultFTUEVariant(
|
|||
// TODO Disabled because it provokes a flickering
|
||||
// ft.setCustomAnimations(enterAnim, exitAnim, popEnterAnim, popExitAnim)
|
||||
})
|
||||
is FTUEViewEvents.OnServerSelectionDone -> onServerSelectionDone(ftueViewEvents)
|
||||
is FTUEViewEvents.OnSignModeSelected -> onSignModeSelected(ftueViewEvents)
|
||||
is FTUEViewEvents.OnLoginFlowRetrieved ->
|
||||
is OnboardingViewEvents.OnServerSelectionDone -> onServerSelectionDone(onboardingViewEvents)
|
||||
is OnboardingViewEvents.OnSignModeSelected -> onSignModeSelected(onboardingViewEvents)
|
||||
is OnboardingViewEvents.OnLoginFlowRetrieved ->
|
||||
activity.addFragmentToBackstack(views.loginFragmentContainer,
|
||||
LoginSignUpSignInSelectionFragment::class.java,
|
||||
option = commonOption)
|
||||
is FTUEViewEvents.OnWebLoginError -> onWebLoginError(ftueViewEvents)
|
||||
is FTUEViewEvents.OnForgetPasswordClicked ->
|
||||
is OnboardingViewEvents.OnWebLoginError -> onWebLoginError(onboardingViewEvents)
|
||||
is OnboardingViewEvents.OnForgetPasswordClicked ->
|
||||
activity.addFragmentToBackstack(views.loginFragmentContainer,
|
||||
LoginResetPasswordFragment::class.java,
|
||||
option = commonOption)
|
||||
is FTUEViewEvents.OnResetPasswordSendThreePidDone -> {
|
||||
is OnboardingViewEvents.OnResetPasswordSendThreePidDone -> {
|
||||
supportFragmentManager.popBackStack(FRAGMENT_LOGIN_TAG, POP_BACK_STACK_EXCLUSIVE)
|
||||
activity.addFragmentToBackstack(views.loginFragmentContainer,
|
||||
LoginResetPasswordMailConfirmationFragment::class.java,
|
||||
option = commonOption)
|
||||
}
|
||||
is FTUEViewEvents.OnResetPasswordMailConfirmationSuccess -> {
|
||||
is OnboardingViewEvents.OnResetPasswordMailConfirmationSuccess -> {
|
||||
supportFragmentManager.popBackStack(FRAGMENT_LOGIN_TAG, POP_BACK_STACK_EXCLUSIVE)
|
||||
activity.addFragmentToBackstack(views.loginFragmentContainer,
|
||||
LoginResetPasswordSuccessFragment::class.java,
|
||||
option = commonOption)
|
||||
}
|
||||
is FTUEViewEvents.OnResetPasswordMailConfirmationSuccessDone -> {
|
||||
is OnboardingViewEvents.OnResetPasswordMailConfirmationSuccessDone -> {
|
||||
// Go back to the login fragment
|
||||
supportFragmentManager.popBackStack(FRAGMENT_LOGIN_TAG, POP_BACK_STACK_EXCLUSIVE)
|
||||
}
|
||||
is FTUEViewEvents.OnSendEmailSuccess -> {
|
||||
is OnboardingViewEvents.OnSendEmailSuccess -> {
|
||||
// Pop the enter email Fragment
|
||||
supportFragmentManager.popBackStack(FRAGMENT_REGISTRATION_STAGE_TAG, FragmentManager.POP_BACK_STACK_INCLUSIVE)
|
||||
activity.addFragmentToBackstack(views.loginFragmentContainer,
|
||||
LoginWaitForEmailFragment::class.java,
|
||||
LoginWaitForEmailFragmentArgument(ftueViewEvents.email),
|
||||
LoginWaitForEmailFragmentArgument(onboardingViewEvents.email),
|
||||
tag = FRAGMENT_REGISTRATION_STAGE_TAG,
|
||||
option = commonOption)
|
||||
}
|
||||
is FTUEViewEvents.OnSendMsisdnSuccess -> {
|
||||
is OnboardingViewEvents.OnSendMsisdnSuccess -> {
|
||||
// Pop the enter Msisdn Fragment
|
||||
supportFragmentManager.popBackStack(FRAGMENT_REGISTRATION_STAGE_TAG, FragmentManager.POP_BACK_STACK_INCLUSIVE)
|
||||
activity.addFragmentToBackstack(views.loginFragmentContainer,
|
||||
LoginGenericTextInputFormFragment::class.java,
|
||||
LoginGenericTextInputFormFragmentArgument(TextInputFormFragmentMode.ConfirmMsisdn, true, ftueViewEvents.msisdn),
|
||||
LoginGenericTextInputFormFragmentArgument(TextInputFormFragmentMode.ConfirmMsisdn, true, onboardingViewEvents.msisdn),
|
||||
tag = FRAGMENT_REGISTRATION_STAGE_TAG,
|
||||
option = commonOption)
|
||||
}
|
||||
is FTUEViewEvents.Failure,
|
||||
is FTUEViewEvents.Loading ->
|
||||
is OnboardingViewEvents.Failure,
|
||||
is OnboardingViewEvents.Loading ->
|
||||
// This is handled by the Fragments
|
||||
Unit
|
||||
}.exhaustive
|
||||
}
|
||||
|
||||
private fun updateWithState(ftueViewState: FTUEViewState) {
|
||||
if (ftueViewState.isUserLogged()) {
|
||||
private fun updateWithState(onboardingViewState: OnboardingViewState) {
|
||||
if (onboardingViewState.isUserLogged()) {
|
||||
val intent = HomeActivity.newIntent(
|
||||
activity,
|
||||
accountCreation = ftueViewState.signMode == SignMode.SignUp
|
||||
accountCreation = onboardingViewState.signMode == SignMode.SignUp
|
||||
)
|
||||
activity.startActivity(intent)
|
||||
activity.finish()
|
||||
|
|
@ -227,10 +227,10 @@ class DefaultFTUEVariant(
|
|||
}
|
||||
|
||||
// Loading
|
||||
views.loginLoading.isVisible = ftueViewState.isLoading()
|
||||
views.loginLoading.isVisible = onboardingViewState.isLoading()
|
||||
}
|
||||
|
||||
private fun onWebLoginError(onWebLoginError: FTUEViewEvents.OnWebLoginError) {
|
||||
private fun onWebLoginError(onWebLoginError: OnboardingViewEvents.OnWebLoginError) {
|
||||
// Pop the backstack
|
||||
supportFragmentManager.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE)
|
||||
|
||||
|
|
@ -242,7 +242,7 @@ class DefaultFTUEVariant(
|
|||
.show()
|
||||
}
|
||||
|
||||
private fun onServerSelectionDone(loginViewEvents: FTUEViewEvents.OnServerSelectionDone) {
|
||||
private fun onServerSelectionDone(loginViewEvents: OnboardingViewEvents.OnServerSelectionDone) {
|
||||
when (loginViewEvents.serverType) {
|
||||
ServerType.MatrixOrg -> Unit // In this case, we wait for the login flow
|
||||
ServerType.EMS,
|
||||
|
|
@ -253,7 +253,7 @@ class DefaultFTUEVariant(
|
|||
}
|
||||
}
|
||||
|
||||
private fun onSignModeSelected(loginViewEvents: FTUEViewEvents.OnSignModeSelected) = withState(ftueViewModel) { state ->
|
||||
private fun onSignModeSelected(loginViewEvents: OnboardingViewEvents.OnSignModeSelected) = withState(onboardingViewModel) { state ->
|
||||
// state.signMode could not be ready yet. So use value from the ViewEvent
|
||||
when (loginViewEvents.signMode) {
|
||||
SignMode.Unknown -> error("Sign mode has to be set before calling this method")
|
||||
|
|
@ -286,7 +286,7 @@ class DefaultFTUEVariant(
|
|||
override fun onNewIntent(intent: Intent?) {
|
||||
intent?.data
|
||||
?.let { tryOrNull { it.getQueryParameter("loginToken") } }
|
||||
?.let { ftueViewModel.handle(FTUEAction.LoginWithToken(it)) }
|
||||
?.let { onboardingViewModel.handle(OnboardingAction.LoginWithToken(it)) }
|
||||
}
|
||||
|
||||
private fun onRegistrationStageNotSupported() {
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
/*
|
||||
* Copyright (c) 2021 New Vector Ltd
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package im.vector.app.features.onboarding
|
||||
|
||||
import android.content.Intent
|
||||
|
||||
interface OnboardingVariant {
|
||||
fun onNewIntent(intent: Intent?)
|
||||
fun initUiAndData(isFirstCreation: Boolean)
|
||||
fun setIsLoading(isLoading: Boolean)
|
||||
}
|
||||
|
|
@ -14,25 +14,28 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package im.vector.app.features.ftue
|
||||
package im.vector.app.features.onboarding
|
||||
|
||||
import im.vector.app.features.VectorFeatures
|
||||
import im.vector.app.features.login2.LoginViewModel2
|
||||
import javax.inject.Inject
|
||||
|
||||
class FTUEVariantFactory @Inject constructor(
|
||||
class OnboardingVariantFactory @Inject constructor(
|
||||
private val vectorFeatures: VectorFeatures,
|
||||
) {
|
||||
|
||||
fun create(activity: FTUEActivity, ftueViewModel: Lazy<FTUEViewModel>, loginViewModel2: Lazy<LoginViewModel2>) = when (vectorFeatures.loginVariant()) {
|
||||
VectorFeatures.LoginVariant.LEGACY -> error("Legacy is not supported by the FTUE")
|
||||
VectorFeatures.LoginVariant.FTUE -> DefaultFTUEVariant(
|
||||
fun create(activity: OnboardingActivity,
|
||||
onboardingViewModel: Lazy<OnboardingViewModel>,
|
||||
loginViewModel2: Lazy<LoginViewModel2>
|
||||
) = when (vectorFeatures.onboardingVariant()) {
|
||||
VectorFeatures.OnboardingVariant.LEGACY -> error("Legacy is not supported by the FTUE")
|
||||
VectorFeatures.OnboardingVariant.FTUE_AUTH -> OnboardingAuthVariant(
|
||||
views = activity.getBinding(),
|
||||
ftueViewModel = ftueViewModel.value,
|
||||
onboardingViewModel = onboardingViewModel.value,
|
||||
activity = activity,
|
||||
supportFragmentManager = activity.supportFragmentManager
|
||||
)
|
||||
VectorFeatures.LoginVariant.FTUE_WIP -> FTUEWipVariant(
|
||||
VectorFeatures.OnboardingVariant.LOGIN_2 -> Login2Variant(
|
||||
views = activity.getBinding(),
|
||||
loginViewModel = loginViewModel2.value,
|
||||
activity = activity,
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
*
|
||||
*/
|
||||
|
||||
package im.vector.app.features.ftue
|
||||
package im.vector.app.features.onboarding
|
||||
|
||||
import im.vector.app.core.platform.VectorViewEvents
|
||||
import im.vector.app.features.login.ServerType
|
||||
|
|
@ -25,26 +25,26 @@ import org.matrix.android.sdk.api.auth.registration.FlowResult
|
|||
/**
|
||||
* Transient events for Login
|
||||
*/
|
||||
sealed class FTUEViewEvents : VectorViewEvents {
|
||||
data class Loading(val message: CharSequence? = null) : FTUEViewEvents()
|
||||
data class Failure(val throwable: Throwable) : FTUEViewEvents()
|
||||
sealed class OnboardingViewEvents : VectorViewEvents {
|
||||
data class Loading(val message: CharSequence? = null) : OnboardingViewEvents()
|
||||
data class Failure(val throwable: Throwable) : OnboardingViewEvents()
|
||||
|
||||
data class RegistrationFlowResult(val flowResult: FlowResult, val isRegistrationStarted: Boolean) : FTUEViewEvents()
|
||||
object OutdatedHomeserver : FTUEViewEvents()
|
||||
data class RegistrationFlowResult(val flowResult: FlowResult, val isRegistrationStarted: Boolean) : OnboardingViewEvents()
|
||||
object OutdatedHomeserver : OnboardingViewEvents()
|
||||
|
||||
// Navigation event
|
||||
|
||||
object OpenServerSelection : FTUEViewEvents()
|
||||
data class OnServerSelectionDone(val serverType: ServerType) : FTUEViewEvents()
|
||||
object OnLoginFlowRetrieved : FTUEViewEvents()
|
||||
data class OnSignModeSelected(val signMode: SignMode) : FTUEViewEvents()
|
||||
object OnForgetPasswordClicked : FTUEViewEvents()
|
||||
object OnResetPasswordSendThreePidDone : FTUEViewEvents()
|
||||
object OnResetPasswordMailConfirmationSuccess : FTUEViewEvents()
|
||||
object OnResetPasswordMailConfirmationSuccessDone : FTUEViewEvents()
|
||||
object OpenServerSelection : OnboardingViewEvents()
|
||||
data class OnServerSelectionDone(val serverType: ServerType) : OnboardingViewEvents()
|
||||
object OnLoginFlowRetrieved : OnboardingViewEvents()
|
||||
data class OnSignModeSelected(val signMode: SignMode) : OnboardingViewEvents()
|
||||
object OnForgetPasswordClicked : OnboardingViewEvents()
|
||||
object OnResetPasswordSendThreePidDone : OnboardingViewEvents()
|
||||
object OnResetPasswordMailConfirmationSuccess : OnboardingViewEvents()
|
||||
object OnResetPasswordMailConfirmationSuccessDone : OnboardingViewEvents()
|
||||
|
||||
data class OnSendEmailSuccess(val email: String) : FTUEViewEvents()
|
||||
data class OnSendMsisdnSuccess(val msisdn: String) : FTUEViewEvents()
|
||||
data class OnSendEmailSuccess(val email: String) : OnboardingViewEvents()
|
||||
data class OnSendMsisdnSuccess(val msisdn: String) : OnboardingViewEvents()
|
||||
|
||||
data class OnWebLoginError(val errorCode: Int, val description: String, val failingUrl: String) : FTUEViewEvents()
|
||||
data class OnWebLoginError(val errorCode: Int, val description: String, val failingUrl: String) : OnboardingViewEvents()
|
||||
}
|
||||
|
|
@ -14,7 +14,7 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package im.vector.app.features.ftue
|
||||
package im.vector.app.features.onboarding
|
||||
|
||||
import android.content.Context
|
||||
import android.net.Uri
|
||||
|
|
@ -63,8 +63,8 @@ import java.util.concurrent.CancellationException
|
|||
/**
|
||||
*
|
||||
*/
|
||||
class FTUEViewModel @AssistedInject constructor(
|
||||
@Assisted initialState: FTUEViewState,
|
||||
class OnboardingViewModel @AssistedInject constructor(
|
||||
@Assisted initialState: OnboardingViewState,
|
||||
private val applicationContext: Context,
|
||||
private val authenticationService: AuthenticationService,
|
||||
private val activeSessionHolder: ActiveSessionHolder,
|
||||
|
|
@ -72,14 +72,14 @@ class FTUEViewModel @AssistedInject constructor(
|
|||
private val reAuthHelper: ReAuthHelper,
|
||||
private val stringProvider: StringProvider,
|
||||
private val homeServerHistoryService: HomeServerHistoryService
|
||||
) : VectorViewModel<FTUEViewState, FTUEAction, FTUEViewEvents>(initialState) {
|
||||
) : VectorViewModel<OnboardingViewState, OnboardingAction, OnboardingViewEvents>(initialState) {
|
||||
|
||||
@AssistedFactory
|
||||
interface Factory : MavericksAssistedViewModelFactory<FTUEViewModel, FTUEViewState> {
|
||||
override fun create(initialState: FTUEViewState): FTUEViewModel
|
||||
interface Factory : MavericksAssistedViewModelFactory<OnboardingViewModel, OnboardingViewState> {
|
||||
override fun create(initialState: OnboardingViewState): OnboardingViewModel
|
||||
}
|
||||
|
||||
companion object : MavericksViewModelFactory<FTUEViewModel, FTUEViewState> by hiltMavericksViewModelFactory()
|
||||
companion object : MavericksViewModelFactory<OnboardingViewModel, OnboardingViewState> by hiltMavericksViewModelFactory()
|
||||
|
||||
init {
|
||||
getKnownCustomHomeServersUrls()
|
||||
|
|
@ -92,7 +92,7 @@ class FTUEViewModel @AssistedInject constructor(
|
|||
}
|
||||
|
||||
// Store the last action, to redo it after user has trusted the untrusted certificate
|
||||
private var lastAction: FTUEAction? = null
|
||||
private var lastAction: OnboardingAction? = null
|
||||
private var currentHomeServerConnectionConfig: HomeServerConnectionConfig? = null
|
||||
|
||||
private val matrixOrgUrl = stringProvider.getString(R.string.matrix_org_server_url).ensureTrailingSlash()
|
||||
|
|
@ -119,28 +119,28 @@ class FTUEViewModel @AssistedInject constructor(
|
|||
field = value
|
||||
}
|
||||
|
||||
override fun handle(action: FTUEAction) {
|
||||
override fun handle(action: OnboardingAction) {
|
||||
when (action) {
|
||||
is FTUEAction.OnGetStarted -> handleOnGetStarted(action)
|
||||
is FTUEAction.UpdateServerType -> handleUpdateServerType(action)
|
||||
is FTUEAction.UpdateSignMode -> handleUpdateSignMode(action)
|
||||
is FTUEAction.InitWith -> handleInitWith(action)
|
||||
is FTUEAction.UpdateHomeServer -> handleUpdateHomeserver(action).also { lastAction = action }
|
||||
is FTUEAction.LoginOrRegister -> handleLoginOrRegister(action).also { lastAction = action }
|
||||
is FTUEAction.LoginWithToken -> handleLoginWithToken(action)
|
||||
is FTUEAction.WebLoginSuccess -> handleWebLoginSuccess(action)
|
||||
is FTUEAction.ResetPassword -> handleResetPassword(action)
|
||||
is FTUEAction.ResetPasswordMailConfirmed -> handleResetPasswordMailConfirmed()
|
||||
is FTUEAction.RegisterAction -> handleRegisterAction(action)
|
||||
is FTUEAction.ResetAction -> handleResetAction(action)
|
||||
is FTUEAction.SetupSsoForSessionRecovery -> handleSetupSsoForSessionRecovery(action)
|
||||
is FTUEAction.UserAcceptCertificate -> handleUserAcceptCertificate(action)
|
||||
FTUEAction.ClearHomeServerHistory -> handleClearHomeServerHistory()
|
||||
is FTUEAction.PostViewEvent -> _viewEvents.post(action.viewEvent)
|
||||
is OnboardingAction.OnGetStarted -> handleOnGetStarted(action)
|
||||
is OnboardingAction.UpdateServerType -> handleUpdateServerType(action)
|
||||
is OnboardingAction.UpdateSignMode -> handleUpdateSignMode(action)
|
||||
is OnboardingAction.InitWith -> handleInitWith(action)
|
||||
is OnboardingAction.UpdateHomeServer -> handleUpdateHomeserver(action).also { lastAction = action }
|
||||
is OnboardingAction.LoginOrRegister -> handleLoginOrRegister(action).also { lastAction = action }
|
||||
is OnboardingAction.LoginWithToken -> handleLoginWithToken(action)
|
||||
is OnboardingAction.WebLoginSuccess -> handleWebLoginSuccess(action)
|
||||
is OnboardingAction.ResetPassword -> handleResetPassword(action)
|
||||
is OnboardingAction.ResetPasswordMailConfirmed -> handleResetPasswordMailConfirmed()
|
||||
is OnboardingAction.RegisterAction -> handleRegisterAction(action)
|
||||
is OnboardingAction.ResetAction -> handleResetAction(action)
|
||||
is OnboardingAction.SetupSsoForSessionRecovery -> handleSetupSsoForSessionRecovery(action)
|
||||
is OnboardingAction.UserAcceptCertificate -> handleUserAcceptCertificate(action)
|
||||
OnboardingAction.ClearHomeServerHistory -> handleClearHomeServerHistory()
|
||||
is OnboardingAction.PostViewEvent -> _viewEvents.post(action.viewEvent)
|
||||
}.exhaustive
|
||||
}
|
||||
|
||||
private fun handleOnGetStarted(action: FTUEAction.OnGetStarted) {
|
||||
private fun handleOnGetStarted(action: OnboardingAction.OnGetStarted) {
|
||||
if (action.resetLoginConfig) {
|
||||
loginConfig = null
|
||||
}
|
||||
|
|
@ -152,25 +152,25 @@ class FTUEViewModel @AssistedInject constructor(
|
|||
if (homeServerConnectionConfig == null) {
|
||||
// Url is invalid, in this case, just use the regular flow
|
||||
Timber.w("Url from config url was invalid: $configUrl")
|
||||
_viewEvents.post(FTUEViewEvents.OpenServerSelection)
|
||||
_viewEvents.post(OnboardingViewEvents.OpenServerSelection)
|
||||
} else {
|
||||
getLoginFlow(homeServerConnectionConfig, ServerType.Other)
|
||||
}
|
||||
} else {
|
||||
_viewEvents.post(FTUEViewEvents.OpenServerSelection)
|
||||
_viewEvents.post(OnboardingViewEvents.OpenServerSelection)
|
||||
}
|
||||
}
|
||||
|
||||
private fun handleUserAcceptCertificate(action: FTUEAction.UserAcceptCertificate) {
|
||||
private fun handleUserAcceptCertificate(action: OnboardingAction.UserAcceptCertificate) {
|
||||
// It happens when we get the login flow, or during direct authentication.
|
||||
// So alter the homeserver config and retrieve again the login flow
|
||||
when (val finalLastAction = lastAction) {
|
||||
is FTUEAction.UpdateHomeServer -> {
|
||||
is OnboardingAction.UpdateHomeServer -> {
|
||||
currentHomeServerConnectionConfig
|
||||
?.let { it.copy(allowedFingerprints = it.allowedFingerprints + action.fingerprint) }
|
||||
?.let { getLoginFlow(it) }
|
||||
}
|
||||
is FTUEAction.LoginOrRegister ->
|
||||
is OnboardingAction.LoginOrRegister ->
|
||||
handleDirectLogin(
|
||||
finalLastAction,
|
||||
HomeServerConnectionConfig.Builder()
|
||||
|
|
@ -192,7 +192,7 @@ class FTUEViewModel @AssistedInject constructor(
|
|||
getKnownCustomHomeServersUrls()
|
||||
}
|
||||
|
||||
private fun handleLoginWithToken(action: FTUEAction.LoginWithToken) {
|
||||
private fun handleLoginWithToken(action: OnboardingAction.LoginWithToken) {
|
||||
val safeLoginWizard = loginWizard
|
||||
|
||||
if (safeLoginWizard == null) {
|
||||
|
|
@ -212,7 +212,7 @@ class FTUEViewModel @AssistedInject constructor(
|
|||
try {
|
||||
safeLoginWizard.loginWithToken(action.loginToken)
|
||||
} catch (failure: Throwable) {
|
||||
_viewEvents.post(FTUEViewEvents.Failure(failure))
|
||||
_viewEvents.post(OnboardingViewEvents.Failure(failure))
|
||||
setState {
|
||||
copy(
|
||||
asyncLoginAction = Fail(failure)
|
||||
|
|
@ -225,7 +225,7 @@ class FTUEViewModel @AssistedInject constructor(
|
|||
}
|
||||
}
|
||||
|
||||
private fun handleSetupSsoForSessionRecovery(action: FTUEAction.SetupSsoForSessionRecovery) {
|
||||
private fun handleSetupSsoForSessionRecovery(action: OnboardingAction.SetupSsoForSessionRecovery) {
|
||||
setState {
|
||||
copy(
|
||||
signMode = SignMode.SignIn,
|
||||
|
|
@ -237,20 +237,20 @@ class FTUEViewModel @AssistedInject constructor(
|
|||
}
|
||||
}
|
||||
|
||||
private fun handleRegisterAction(action: FTUEAction.RegisterAction) {
|
||||
private fun handleRegisterAction(action: OnboardingAction.RegisterAction) {
|
||||
when (action) {
|
||||
is FTUEAction.CaptchaDone -> handleCaptchaDone(action)
|
||||
is FTUEAction.AcceptTerms -> handleAcceptTerms()
|
||||
is FTUEAction.RegisterDummy -> handleRegisterDummy()
|
||||
is FTUEAction.AddThreePid -> handleAddThreePid(action)
|
||||
is FTUEAction.SendAgainThreePid -> handleSendAgainThreePid()
|
||||
is FTUEAction.ValidateThreePid -> handleValidateThreePid(action)
|
||||
is FTUEAction.CheckIfEmailHasBeenValidated -> handleCheckIfEmailHasBeenValidated(action)
|
||||
is FTUEAction.StopEmailValidationCheck -> handleStopEmailValidationCheck()
|
||||
is OnboardingAction.CaptchaDone -> handleCaptchaDone(action)
|
||||
is OnboardingAction.AcceptTerms -> handleAcceptTerms()
|
||||
is OnboardingAction.RegisterDummy -> handleRegisterDummy()
|
||||
is OnboardingAction.AddThreePid -> handleAddThreePid(action)
|
||||
is OnboardingAction.SendAgainThreePid -> handleSendAgainThreePid()
|
||||
is OnboardingAction.ValidateThreePid -> handleValidateThreePid(action)
|
||||
is OnboardingAction.CheckIfEmailHasBeenValidated -> handleCheckIfEmailHasBeenValidated(action)
|
||||
is OnboardingAction.StopEmailValidationCheck -> handleStopEmailValidationCheck()
|
||||
}
|
||||
}
|
||||
|
||||
private fun handleCheckIfEmailHasBeenValidated(action: FTUEAction.CheckIfEmailHasBeenValidated) {
|
||||
private fun handleCheckIfEmailHasBeenValidated(action: OnboardingAction.CheckIfEmailHasBeenValidated) {
|
||||
// We do not want the common progress bar to be displayed, so we do not change asyncRegistration value in the state
|
||||
currentJob = executeRegistrationStep(withLoading = false) {
|
||||
it.checkIfEmailHasBeenValidated(action.delayMillis)
|
||||
|
|
@ -261,7 +261,7 @@ class FTUEViewModel @AssistedInject constructor(
|
|||
currentJob = null
|
||||
}
|
||||
|
||||
private fun handleValidateThreePid(action: FTUEAction.ValidateThreePid) {
|
||||
private fun handleValidateThreePid(action: OnboardingAction.ValidateThreePid) {
|
||||
currentJob = executeRegistrationStep {
|
||||
it.handleValidateThreePid(action.code)
|
||||
}
|
||||
|
|
@ -284,7 +284,7 @@ class FTUEViewModel @AssistedInject constructor(
|
|||
*/
|
||||
} catch (failure: Throwable) {
|
||||
if (failure !is CancellationException) {
|
||||
_viewEvents.post(FTUEViewEvents.Failure(failure))
|
||||
_viewEvents.post(OnboardingViewEvents.Failure(failure))
|
||||
}
|
||||
null
|
||||
}
|
||||
|
|
@ -303,13 +303,13 @@ class FTUEViewModel @AssistedInject constructor(
|
|||
}
|
||||
}
|
||||
|
||||
private fun handleAddThreePid(action: FTUEAction.AddThreePid) {
|
||||
private fun handleAddThreePid(action: OnboardingAction.AddThreePid) {
|
||||
setState { copy(asyncRegistration = Loading()) }
|
||||
currentJob = viewModelScope.launch {
|
||||
try {
|
||||
registrationWizard?.addThreePid(action.threePid)
|
||||
} catch (failure: Throwable) {
|
||||
_viewEvents.post(FTUEViewEvents.Failure(failure))
|
||||
_viewEvents.post(OnboardingViewEvents.Failure(failure))
|
||||
}
|
||||
setState {
|
||||
copy(
|
||||
|
|
@ -325,7 +325,7 @@ class FTUEViewModel @AssistedInject constructor(
|
|||
try {
|
||||
registrationWizard?.sendAgainThreePid()
|
||||
} catch (failure: Throwable) {
|
||||
_viewEvents.post(FTUEViewEvents.Failure(failure))
|
||||
_viewEvents.post(OnboardingViewEvents.Failure(failure))
|
||||
}
|
||||
setState {
|
||||
copy(
|
||||
|
|
@ -347,7 +347,7 @@ class FTUEViewModel @AssistedInject constructor(
|
|||
}
|
||||
}
|
||||
|
||||
private fun handleRegisterWith(action: FTUEAction.LoginOrRegister) {
|
||||
private fun handleRegisterWith(action: OnboardingAction.LoginOrRegister) {
|
||||
reAuthHelper.data = action.password
|
||||
currentJob = executeRegistrationStep {
|
||||
it.createAccount(
|
||||
|
|
@ -358,25 +358,25 @@ class FTUEViewModel @AssistedInject constructor(
|
|||
}
|
||||
}
|
||||
|
||||
private fun handleCaptchaDone(action: FTUEAction.CaptchaDone) {
|
||||
private fun handleCaptchaDone(action: OnboardingAction.CaptchaDone) {
|
||||
currentJob = executeRegistrationStep {
|
||||
it.performReCaptcha(action.captchaResponse)
|
||||
}
|
||||
}
|
||||
|
||||
private fun handleResetAction(action: FTUEAction.ResetAction) {
|
||||
private fun handleResetAction(action: OnboardingAction.ResetAction) {
|
||||
// Cancel any request
|
||||
currentJob = null
|
||||
|
||||
when (action) {
|
||||
FTUEAction.ResetHomeServerType -> {
|
||||
OnboardingAction.ResetHomeServerType -> {
|
||||
setState {
|
||||
copy(
|
||||
serverType = ServerType.Unknown
|
||||
)
|
||||
}
|
||||
}
|
||||
FTUEAction.ResetHomeServerUrl -> {
|
||||
OnboardingAction.ResetHomeServerUrl -> {
|
||||
viewModelScope.launch {
|
||||
authenticationService.reset()
|
||||
setState {
|
||||
|
|
@ -391,7 +391,7 @@ class FTUEViewModel @AssistedInject constructor(
|
|||
}
|
||||
}
|
||||
}
|
||||
FTUEAction.ResetSignMode -> {
|
||||
OnboardingAction.ResetSignMode -> {
|
||||
setState {
|
||||
copy(
|
||||
asyncHomeServerLoginFlowRequest = Uninitialized,
|
||||
|
|
@ -401,7 +401,7 @@ class FTUEViewModel @AssistedInject constructor(
|
|||
)
|
||||
}
|
||||
}
|
||||
FTUEAction.ResetLogin -> {
|
||||
OnboardingAction.ResetLogin -> {
|
||||
viewModelScope.launch {
|
||||
authenticationService.cancelPendingLoginOrRegistration()
|
||||
setState {
|
||||
|
|
@ -412,7 +412,7 @@ class FTUEViewModel @AssistedInject constructor(
|
|||
}
|
||||
}
|
||||
}
|
||||
FTUEAction.ResetResetPassword -> {
|
||||
OnboardingAction.ResetResetPassword -> {
|
||||
setState {
|
||||
copy(
|
||||
asyncResetPassword = Uninitialized,
|
||||
|
|
@ -424,7 +424,7 @@ class FTUEViewModel @AssistedInject constructor(
|
|||
}
|
||||
}
|
||||
|
||||
private fun handleUpdateSignMode(action: FTUEAction.UpdateSignMode) {
|
||||
private fun handleUpdateSignMode(action: OnboardingAction.UpdateSignMode) {
|
||||
setState {
|
||||
copy(
|
||||
signMode = action.signMode
|
||||
|
|
@ -434,12 +434,12 @@ class FTUEViewModel @AssistedInject constructor(
|
|||
when (action.signMode) {
|
||||
SignMode.SignUp -> startRegistrationFlow()
|
||||
SignMode.SignIn -> startAuthenticationFlow()
|
||||
SignMode.SignInWithMatrixId -> _viewEvents.post(FTUEViewEvents.OnSignModeSelected(SignMode.SignInWithMatrixId))
|
||||
SignMode.SignInWithMatrixId -> _viewEvents.post(OnboardingViewEvents.OnSignModeSelected(SignMode.SignInWithMatrixId))
|
||||
SignMode.Unknown -> Unit
|
||||
}
|
||||
}
|
||||
|
||||
private fun handleUpdateServerType(action: FTUEAction.UpdateServerType) {
|
||||
private fun handleUpdateServerType(action: OnboardingAction.UpdateServerType) {
|
||||
setState {
|
||||
copy(
|
||||
serverType = action.serverType
|
||||
|
|
@ -450,20 +450,20 @@ class FTUEViewModel @AssistedInject constructor(
|
|||
ServerType.Unknown -> Unit /* Should not happen */
|
||||
ServerType.MatrixOrg ->
|
||||
// Request login flow here
|
||||
handle(FTUEAction.UpdateHomeServer(matrixOrgUrl))
|
||||
handle(OnboardingAction.UpdateHomeServer(matrixOrgUrl))
|
||||
ServerType.EMS,
|
||||
ServerType.Other -> _viewEvents.post(FTUEViewEvents.OnServerSelectionDone(action.serverType))
|
||||
ServerType.Other -> _viewEvents.post(OnboardingViewEvents.OnServerSelectionDone(action.serverType))
|
||||
}.exhaustive
|
||||
}
|
||||
|
||||
private fun handleInitWith(action: FTUEAction.InitWith) {
|
||||
private fun handleInitWith(action: OnboardingAction.InitWith) {
|
||||
loginConfig = action.loginConfig
|
||||
|
||||
// If there is a pending email validation continue on this step
|
||||
try {
|
||||
if (registrationWizard?.isRegistrationStarted == true) {
|
||||
currentThreePid?.let {
|
||||
handle(FTUEAction.PostViewEvent(FTUEViewEvents.OnSendEmailSuccess(it)))
|
||||
handle(OnboardingAction.PostViewEvent(OnboardingViewEvents.OnSendEmailSuccess(it)))
|
||||
}
|
||||
}
|
||||
} catch (e: Throwable) {
|
||||
|
|
@ -472,7 +472,7 @@ class FTUEViewModel @AssistedInject constructor(
|
|||
}
|
||||
}
|
||||
|
||||
private fun handleResetPassword(action: FTUEAction.ResetPassword) {
|
||||
private fun handleResetPassword(action: OnboardingAction.ResetPassword) {
|
||||
val safeLoginWizard = loginWizard
|
||||
|
||||
if (safeLoginWizard == null) {
|
||||
|
|
@ -509,7 +509,7 @@ class FTUEViewModel @AssistedInject constructor(
|
|||
)
|
||||
}
|
||||
|
||||
_viewEvents.post(FTUEViewEvents.OnResetPasswordSendThreePidDone)
|
||||
_viewEvents.post(OnboardingViewEvents.OnResetPasswordSendThreePidDone)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -550,12 +550,12 @@ class FTUEViewModel @AssistedInject constructor(
|
|||
)
|
||||
}
|
||||
|
||||
_viewEvents.post(FTUEViewEvents.OnResetPasswordMailConfirmationSuccess)
|
||||
_viewEvents.post(OnboardingViewEvents.OnResetPasswordMailConfirmationSuccess)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private fun handleLoginOrRegister(action: FTUEAction.LoginOrRegister) = withState { state ->
|
||||
private fun handleLoginOrRegister(action: OnboardingAction.LoginOrRegister) = withState { state ->
|
||||
when (state.signMode) {
|
||||
SignMode.Unknown -> error("Developer error, invalid sign mode")
|
||||
SignMode.SignIn -> handleLogin(action)
|
||||
|
|
@ -564,7 +564,7 @@ class FTUEViewModel @AssistedInject constructor(
|
|||
}.exhaustive
|
||||
}
|
||||
|
||||
private fun handleDirectLogin(action: FTUEAction.LoginOrRegister, homeServerConnectionConfig: HomeServerConnectionConfig?) {
|
||||
private fun handleDirectLogin(action: OnboardingAction.LoginOrRegister, homeServerConnectionConfig: HomeServerConnectionConfig?) {
|
||||
setState {
|
||||
copy(
|
||||
asyncLoginAction = Loading()
|
||||
|
|
@ -601,10 +601,10 @@ class FTUEViewModel @AssistedInject constructor(
|
|||
asyncLoginAction = Uninitialized
|
||||
)
|
||||
}
|
||||
_viewEvents.post(FTUEViewEvents.Failure(Exception(stringProvider.getString(R.string.autodiscover_well_known_error))))
|
||||
_viewEvents.post(OnboardingViewEvents.Failure(Exception(stringProvider.getString(R.string.autodiscover_well_known_error))))
|
||||
}
|
||||
|
||||
private suspend fun onWellknownSuccess(action: FTUEAction.LoginOrRegister,
|
||||
private suspend fun onWellknownSuccess(action: OnboardingAction.LoginOrRegister,
|
||||
wellKnownPrompt: WellknownResult.Prompt,
|
||||
homeServerConnectionConfig: HomeServerConnectionConfig?) {
|
||||
val alteredHomeServerConnectionConfig = homeServerConnectionConfig
|
||||
|
|
@ -636,7 +636,7 @@ class FTUEViewModel @AssistedInject constructor(
|
|||
is MatrixIdFailure.InvalidMatrixId,
|
||||
is Failure.UnrecognizedCertificateFailure -> {
|
||||
// Display this error in a dialog
|
||||
_viewEvents.post(FTUEViewEvents.Failure(failure))
|
||||
_viewEvents.post(OnboardingViewEvents.Failure(failure))
|
||||
setState {
|
||||
copy(
|
||||
asyncLoginAction = Uninitialized
|
||||
|
|
@ -653,7 +653,7 @@ class FTUEViewModel @AssistedInject constructor(
|
|||
}
|
||||
}
|
||||
|
||||
private fun handleLogin(action: FTUEAction.LoginOrRegister) {
|
||||
private fun handleLogin(action: OnboardingAction.LoginOrRegister) {
|
||||
val safeLoginWizard = loginWizard
|
||||
|
||||
if (safeLoginWizard == null) {
|
||||
|
|
@ -702,7 +702,7 @@ class FTUEViewModel @AssistedInject constructor(
|
|||
// Ensure Wizard is ready
|
||||
loginWizard
|
||||
|
||||
_viewEvents.post(FTUEViewEvents.OnSignModeSelected(SignMode.SignIn))
|
||||
_viewEvents.post(OnboardingViewEvents.OnSignModeSelected(SignMode.SignIn))
|
||||
}
|
||||
|
||||
private fun onFlowResponse(flowResult: FlowResult) {
|
||||
|
|
@ -712,7 +712,7 @@ class FTUEViewModel @AssistedInject constructor(
|
|||
handleRegisterDummy()
|
||||
} else {
|
||||
// Notify the user
|
||||
_viewEvents.post(FTUEViewEvents.RegistrationFlowResult(flowResult, isRegistrationStarted))
|
||||
_viewEvents.post(OnboardingViewEvents.RegistrationFlowResult(flowResult, isRegistrationStarted))
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -728,7 +728,7 @@ class FTUEViewModel @AssistedInject constructor(
|
|||
}
|
||||
}
|
||||
|
||||
private fun handleWebLoginSuccess(action: FTUEAction.WebLoginSuccess) = withState { state ->
|
||||
private fun handleWebLoginSuccess(action: OnboardingAction.WebLoginSuccess) = withState { state ->
|
||||
val homeServerConnectionConfigFinal = homeServerConnectionConfigFactory.create(state.homeServerUrl)
|
||||
|
||||
if (homeServerConnectionConfigFinal == null) {
|
||||
|
|
@ -749,11 +749,11 @@ class FTUEViewModel @AssistedInject constructor(
|
|||
}
|
||||
}
|
||||
|
||||
private fun handleUpdateHomeserver(action: FTUEAction.UpdateHomeServer) {
|
||||
private fun handleUpdateHomeserver(action: OnboardingAction.UpdateHomeServer) {
|
||||
val homeServerConnectionConfig = homeServerConnectionConfigFactory.create(action.homeServerUrl)
|
||||
if (homeServerConnectionConfig == null) {
|
||||
// This is invalid
|
||||
_viewEvents.post(FTUEViewEvents.Failure(Throwable("Unable to create a HomeServerConnectionConfig")))
|
||||
_viewEvents.post(OnboardingViewEvents.Failure(Throwable("Unable to create a HomeServerConnectionConfig")))
|
||||
} else {
|
||||
getLoginFlow(homeServerConnectionConfig)
|
||||
}
|
||||
|
|
@ -782,7 +782,7 @@ class FTUEViewModel @AssistedInject constructor(
|
|||
val data = try {
|
||||
authenticationService.getLoginFlow(homeServerConnectionConfig)
|
||||
} catch (failure: Throwable) {
|
||||
_viewEvents.post(FTUEViewEvents.Failure(failure))
|
||||
_viewEvents.post(OnboardingViewEvents.Failure(failure))
|
||||
setState {
|
||||
copy(
|
||||
asyncHomeServerLoginFlowRequest = Uninitialized,
|
||||
|
|
@ -820,9 +820,9 @@ class FTUEViewModel @AssistedInject constructor(
|
|||
if ((loginMode == LoginMode.Password && !data.isLoginAndRegistrationSupported) ||
|
||||
data.isOutdatedHomeserver) {
|
||||
// Notify the UI
|
||||
_viewEvents.post(FTUEViewEvents.OutdatedHomeserver)
|
||||
_viewEvents.post(OnboardingViewEvents.OutdatedHomeserver)
|
||||
}
|
||||
_viewEvents.post(FTUEViewEvents.OnLoginFlowRetrieved)
|
||||
_viewEvents.post(OnboardingViewEvents.OnLoginFlowRetrieved)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -14,7 +14,7 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package im.vector.app.features.ftue
|
||||
package im.vector.app.features.onboarding
|
||||
|
||||
import com.airbnb.mvrx.Async
|
||||
import com.airbnb.mvrx.Loading
|
||||
|
|
@ -26,7 +26,7 @@ import im.vector.app.features.login.LoginMode
|
|||
import im.vector.app.features.login.ServerType
|
||||
import im.vector.app.features.login.SignMode
|
||||
|
||||
data class FTUEViewState(
|
||||
data class OnboardingViewState(
|
||||
val asyncLoginAction: Async<Unit> = Uninitialized,
|
||||
val asyncHomeServerLoginFlowRequest: Async<Unit> = Uninitialized,
|
||||
val asyncResetPassword: Async<Unit> = Uninitialized,
|
||||
Loading…
Reference in a new issue