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

Cleanup

Browse Source
This commit is contained in:
Benoit Marty 2019-11-21 16:04:21 +01:00
parent edb65f1787
commit 1a603742d0
4 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/InteractiveAuthenticationFlow.kt
View File

@ -30,12 +30,5 @@ data class InteractiveAuthenticationFlow(
@Json(name = "stages") @Json(name = "stages")
val stages: List<String>? = null val stages: List<String>? = null
) { )
companion object {
// Possible values for type
const val TYPE_LOGIN_SSO = "m.login.sso"
const val TYPE_LOGIN_TOKEN = "m.login.token"
const val TYPE_LOGIN_PASSWORD = "m.login.password"
}
}

3
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/LoginFlowTypes.kt
View File

@ -16,7 +16,6 @@
package im.vector.matrix.android.internal.auth.data package im.vector.matrix.android.internal.auth.data
// TODO Move to [InteractiveAuthenticationFlow]
object LoginFlowTypes { object LoginFlowTypes {
const val PASSWORD = "m.login.password" const val PASSWORD = "m.login.password"
const val OAUTH2 = "m.login.oauth2" const val OAUTH2 = "m.login.oauth2"
@ -27,4 +26,6 @@ object LoginFlowTypes {
const val RECAPTCHA = "m.login.recaptcha" const val RECAPTCHA = "m.login.recaptcha"
const val DUMMY = "m.login.dummy" const val DUMMY = "m.login.dummy"
const val TERMS = "m.login.terms" const val TERMS = "m.login.terms"
const val TOKEN = "m.login.token"
const val SSO = "m.login.sso"
} }

5
vector/src/main/java/im/vector/riotx/features/login/LoginResetPasswordFragment.kt
View File

@ -30,7 +30,6 @@ import im.vector.riotx.core.extensions.showPassword
import io.reactivex.Observable import io.reactivex.Observable
import io.reactivex.functions.BiFunction import io.reactivex.functions.BiFunction
import io.reactivex.rxkotlin.subscribeBy import io.reactivex.rxkotlin.subscribeBy
import kotlinx.android.synthetic.main.fragment_login.*
import kotlinx.android.synthetic.main.fragment_login.passwordField import kotlinx.android.synthetic.main.fragment_login.passwordField
import kotlinx.android.synthetic.main.fragment_login.passwordFieldTil import kotlinx.android.synthetic.main.fragment_login.passwordFieldTil
import kotlinx.android.synthetic.main.fragment_login.passwordReveal import kotlinx.android.synthetic.main.fragment_login.passwordReveal
@ -133,9 +132,7 @@ class LoginResetPasswordFragment @Inject constructor(
renderPasswordField() renderPasswordField()
} }
is Fail -> { is Fail -> {
// TODO This does not work, we want the error to be on without text. Fix that resetPasswordEmailTil.error = " "
resetPasswordEmailTil.error = ""
// TODO Handle error text properly
passwordFieldTil.error = errorFormatter.toHumanReadable(state.asyncResetPassword.error) passwordFieldTil.error = errorFormatter.toHumanReadable(state.asyncResetPassword.error)
} }
is Success -> { is Success -> {

8
vector/src/main/java/im/vector/riotx/features/login/LoginViewModel.kt
View File

@ -30,8 +30,8 @@ import im.vector.matrix.android.api.auth.registration.RegistrationWizard
import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.Session
import im.vector.matrix.android.api.util.Cancelable import im.vector.matrix.android.api.util.Cancelable
import im.vector.matrix.android.api.util.MatrixCallbackDelegate import im.vector.matrix.android.api.util.MatrixCallbackDelegate
import im.vector.matrix.android.internal.auth.data.InteractiveAuthenticationFlow
import im.vector.matrix.android.internal.auth.data.LoginFlowResponse import im.vector.matrix.android.internal.auth.data.LoginFlowResponse
import im.vector.matrix.android.internal.auth.data.LoginFlowTypes
import im.vector.riotx.core.di.ActiveSessionHolder import im.vector.riotx.core.di.ActiveSessionHolder
import im.vector.riotx.core.extensions.configureAndStart import im.vector.riotx.core.extensions.configureAndStart
import im.vector.riotx.core.platform.VectorViewModel import im.vector.riotx.core.platform.VectorViewModel
@ -461,9 +461,9 @@ class LoginViewModel @AssistedInject constructor(@Assisted initialState: LoginVi
override fun onSuccess(data: LoginFlowResponse) { override fun onSuccess(data: LoginFlowResponse) {
val loginMode = when { val loginMode = when {
// SSO login is taken first // SSO login is taken first
data.flows.any { it.type == InteractiveAuthenticationFlow.TYPE_LOGIN_SSO } -> LoginMode.Sso data.flows.any { it.type == LoginFlowTypes.SSO } -> LoginMode.Sso
data.flows.any { it.type == InteractiveAuthenticationFlow.TYPE_LOGIN_PASSWORD } -> LoginMode.Password data.flows.any { it.type == LoginFlowTypes.PASSWORD } -> LoginMode.Password
else -> LoginMode.Unsupported(data.flows.mapNotNull { it.type }.toList()) else -> LoginMode.Unsupported(data.flows.mapNotNull { it.type }.toList())
} }
setState { setState {