mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-10-25 12:17:25 +03:00
Code Issues Projects Releases Packages Wiki Activity

Bugfix

Browse source
This commit is contained in:
Benoit Marty 2021-04-15 16:22:25 +02:00 committed by Benoit Marty
parent af3893cdc9
commit 5d65a290d2
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
vector/src/main/java/im/vector/app/features/login2/LoginActivity2.kt
View file

@ -208,19 +208,19 @@ open class LoginActivity2 : VectorBaseActivity<ActivityLoginBinding>(), ToolbarC
// Go back to the login fragment
supportFragmentManager.popBackStack(FRAGMENT_LOGIN_TAG, POP_BACK_STACK_EXCLUSIVE)
}
is LoginViewEvents2.OnSendEmailSuccess ->
is LoginViewEvents2.OnSendEmailSuccess ->
addFragmentToBackstack(R.id.loginFragmentContainer,
LoginWaitForEmailFragment2::class.java,
LoginWaitForEmailFragmentArgument(event.email),
tag = FRAGMENT_REGISTRATION_STAGE_TAG,
option = commonOption)
is LoginViewEvents2.OpenPasswordScreen -> {
is LoginViewEvents2.OpenSigninPasswordScreen -> {
addFragmentToBackstack(R.id.loginFragmentContainer,
LoginFragment2SigninPassword::class.java,
tag = FRAGMENT_LOGIN_TAG,
option = commonOption)
}
is LoginViewEvents2.OpenSignupPasswordScreen -> {
is LoginViewEvents2.OpenSignupPasswordScreen -> {
addFragmentToBackstack(R.id.loginFragmentContainer,
LoginFragment2SignupPassword::class.java,
tag = FRAGMENT_REGISTRATION_STAGE_TAG,

2
vector/src/main/java/im/vector/app/features/login2/LoginViewEvents2.kt
View file

@ -30,7 +30,7 @@ sealed class LoginViewEvents2 : VectorViewEvents {
object OutdatedHomeserver : LoginViewEvents2()
// Navigation event
object OpenPasswordScreen : LoginViewEvents2()
object OpenSigninPasswordScreen : LoginViewEvents2()
object OpenSignupPasswordScreen : LoginViewEvents2()
object OpenSignInEnterIdentifierScreen : LoginViewEvents2()

2
vector/src/main/java/im/vector/app/features/login2/LoginViewModel2.kt
View file

@ -646,7 +646,7 @@ class LoginViewModel2 @AssistedInject constructor(
is LoginMode.SsoAndPassword -> {
retrieveProfileInfo(action.username)
// We can navigate to the password screen
LoginViewEvents2.OpenPasswordScreen
LoginViewEvents2.OpenSigninPasswordScreen
}
is LoginMode.Sso -> {
LoginViewEvents2.OpenSsoOnlyScreen