Browse Source

Login: should fix case after logout...

feature/bma/flipper
ganfra 2 years ago
parent
commit
cf0570661d
  1. 2
      features/login/src/main/java/io/element/android/x/features/login/LoginViewModel.kt
  2. 8
      features/login/src/main/java/io/element/android/x/features/login/changeserver/ChangeServerViewModel.kt

2
features/login/src/main/java/io/element/android/x/features/login/LoginViewModel.kt

@ -24,9 +24,7 @@ class LoginViewModel(initialState: LoginViewState) : @@ -24,9 +24,7 @@ class LoginViewModel(initialState: LoginViewState) :
suspend {
val state = awaitState()
// Ensure the server is provided to the Rust SDK
if (matrix.getHomeserver() == null) {
matrix.setHomeserver(state.homeserver)
}
matrix.login(state.login.trim(), state.password.trim())
matrix.activeClient().startSync()
}.execute {

8
features/login/src/main/java/io/element/android/x/features/login/changeserver/ChangeServerViewModel.kt

@ -1,6 +1,5 @@ @@ -1,6 +1,5 @@
package io.element.android.x.features.login.changeserver
import com.airbnb.mvrx.Loading
import com.airbnb.mvrx.MavericksViewModel
import io.element.android.x.matrix.MatrixInstance
import kotlinx.coroutines.launch
@ -24,13 +23,10 @@ class ChangeServerViewModel(initialState: ChangeServerViewState) : @@ -24,13 +23,10 @@ class ChangeServerViewModel(initialState: ChangeServerViewState) :
}
}
fun setServerSubmit() = withState { state ->
setState {
copy(changeServerAction = Loading())
}
fun setServerSubmit() {
viewModelScope.launch {
suspend {
val state = awaitState()
matrix.setHomeserver(state.homeserver)
}.execute { it ->
copy(changeServerAction = it)

Loading…
Cancel
Save