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

Login screens: prepare for saving user state

Browse Source
This commit is contained in:
Benoit Marty 2019-11-26 13:11:31 +01:00
parent 9bd4dbb65f
commit 7ce8a13ddf
4 changed files with 61 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
vector/src/main/java/im/vector/riotx/features/login/HomeServerConnectionConfigFactory.kt Normal file
View File

@ -0,0 +1,39 @@
/*
* Copyright 2019 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.riotx.features.login
import im.vector.matrix.android.api.auth.data.HomeServerConnectionConfig
import timber.log.Timber
import javax.inject.Inject
class HomeServerConnectionConfigFactory @Inject constructor() {
fun create(url: String?): HomeServerConnectionConfig? {
if (url == null) {
return null
}
return try {
HomeServerConnectionConfig.Builder()
.withHomeServerUri(url)
.build()
} catch (t: Throwable) {
Timber.e(t)
null
}
}
}

2
vector/src/main/java/im/vector/riotx/features/login/LoginCaptchaFragment.kt
View File

@ -73,7 +73,7 @@ class LoginCaptchaFragment @Inject constructor(
val mime = "text/html"
val encoding = "utf-8"
val homeServerUrl = loginViewModel.getHomeServerUrl()
val homeServerUrl = loginViewModel.homeServerUrl ?: error("missing url of homeserver")
loginCaptchaWevView.loadDataWithBaseURL(homeServerUrl, html, mime, encoding, null)
loginCaptchaWevView.requestLayout()

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

@ -16,13 +16,11 @@
package im.vector.riotx.features.login
import arrow.core.Try
import com.airbnb.mvrx.*
import com.squareup.inject.assisted.Assisted
import com.squareup.inject.assisted.AssistedInject
import im.vector.matrix.android.api.MatrixCallback
import im.vector.matrix.android.api.auth.AuthenticationService
import im.vector.matrix.android.api.auth.data.HomeServerConnectionConfig
import im.vector.matrix.android.api.auth.data.LoginFlowResult
import im.vector.matrix.android.api.auth.login.LoginWizard
import im.vector.matrix.android.api.auth.registration.FlowResult
@ -50,6 +48,7 @@ class LoginViewModel @AssistedInject constructor(@Assisted initialState: LoginVi
private val authenticationService: AuthenticationService,
private val activeSessionHolder: ActiveSessionHolder,
private val pushRuleTriggerListener: PushRuleTriggerListener,
private val homeServerConnectionConfigFactory: HomeServerConnectionConfigFactory,
private val sessionListener: SessionListener)
: VectorViewModel<LoginViewState, LoginAction>(initialState) {
@ -81,6 +80,7 @@ class LoginViewModel @AssistedInject constructor(@Assisted initialState: LoginVi
private var registrationWizard: RegistrationWizard? = null
private var loginWizard: LoginWizard? = null
// TODO Move all this in a data class
var serverType: ServerType = ServerType.MatrixOrg
private set
var signMode: SignMode = SignMode.Unknown
@ -88,9 +88,11 @@ class LoginViewModel @AssistedInject constructor(@Assisted initialState: LoginVi
var resetPasswordEmail: String? = null
private set
var homeServerUrl: String? = null
private set
private var loginConfig: LoginConfig? = null
private var homeServerConnectionConfig: HomeServerConnectionConfig? = null
private var currentTask: Cancelable? = null
private val _viewEvents = PublishDataSource<LoginViewEvents>()
@ -268,7 +270,7 @@ class LoginViewModel @AssistedInject constructor(@Assisted initialState: LoginVi
}
}
LoginAction.ResetHomeServerUrl -> {
homeServerConnectionConfig = null
homeServerUrl = null
registrationWizard = null
loginWizard = null
@ -472,7 +474,7 @@ class LoginViewModel @AssistedInject constructor(@Assisted initialState: LoginVi
}
private fun handleWebLoginSuccess(action: LoginAction.WebLoginSuccess) {
val homeServerConnectionConfigFinal = homeServerConnectionConfig
val homeServerConnectionConfigFinal = homeServerConnectionConfigFactory.create(homeServerUrl)
if (homeServerConnectionConfigFinal == null) {
// Should not happen
@ -490,28 +492,10 @@ class LoginViewModel @AssistedInject constructor(@Assisted initialState: LoginVi
}
}
private fun handleUpdateHomeserver(action: LoginAction.UpdateHomeServer) = withState { state ->
var newConfig: HomeServerConnectionConfig? = null
Try {
val homeServerUri = action.homeServerUrl
newConfig = HomeServerConnectionConfig.Builder()
.withHomeServerUri(homeServerUri)
.build()
}
private fun handleUpdateHomeserver(action: LoginAction.UpdateHomeServer) {
val homeServerConnectionConfig = homeServerConnectionConfigFactory.create(action.homeServerUrl)
// Do not retry if we already have flows for this config -> causes infinite focus loop
if (newConfig?.homeServerUri?.toString() == homeServerConnectionConfig?.homeServerUri?.toString()
&& state.asyncHomeServerLoginFlowRequest is Success) return@withState
currentTask?.cancel()
currentTask = null
homeServerConnectionConfig = newConfig
loginWizard = null
registrationWizard = null
val homeServerConnectionConfigFinal = homeServerConnectionConfig
if (homeServerConnectionConfigFinal == null) {
if (homeServerConnectionConfig == null) {
// This is invalid
setState {
copy(
@ -519,13 +503,18 @@ class LoginViewModel @AssistedInject constructor(@Assisted initialState: LoginVi
)
}
} else {
currentTask?.cancel()
currentTask = null
loginWizard = null
registrationWizard = null
setState {
copy(
asyncHomeServerLoginFlowRequest = Loading()
)
}
currentTask = authenticationService.getLoginFlow(homeServerConnectionConfigFinal, object : MatrixCallback<LoginFlowResult> {
currentTask = authenticationService.getLoginFlow(homeServerConnectionConfig, object : MatrixCallback<LoginFlowResult> {
override fun onFailure(failure: Throwable) {
_viewEvents.post(LoginViewEvents.Error(failure))
setState {
@ -536,6 +525,9 @@ class LoginViewModel @AssistedInject constructor(@Assisted initialState: LoginVi
}
override fun onSuccess(data: LoginFlowResult) {
// Keep the url
homeServerUrl = action.homeServerUrl
when (data) {
is LoginFlowResult.Success -> {
val loginMode = when {
@ -585,15 +577,11 @@ class LoginViewModel @AssistedInject constructor(@Assisted initialState: LoginVi
return loginConfig?.homeServerUrl
}
fun getHomeServerUrl(): String {
return homeServerConnectionConfig?.homeServerUri?.toString() ?: ""
}
/**
* Ex: "https://matrix.org/" -> "matrix.org"
*/
fun getHomeServerUrlSimple(): String {
return getHomeServerUrl()
return (homeServerUrl ?: "")
.substringAfter("://")
.trim { it == '/' }
}

2
vector/src/main/java/im/vector/riotx/features/login/LoginWebFragment.kt
View File

@ -56,7 +56,7 @@ class LoginWebFragment @Inject constructor(
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
homeServerUrl = loginViewModel.getHomeServerUrl()
homeServerUrl = loginViewModel.homeServerUrl ?: error("Developer error: Invalid url")
signMode = loginViewModel.signMode.takeIf { it != SignMode.Unknown } ?: error("Developer error: Invalid sign mode")
setupToolbar(loginWebToolbar)