rei-forks/element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

avoiding showing the loading when the last screen is not a transition into the main app

Browse Source
This commit is contained in:
Adam Brown 2022-02-04 12:34:20 +00:00
parent 023b32367b
commit 3a961e0803
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewState.kt
View File

@ -73,7 +73,7 @@ data class OnboardingViewState(
asyncRegistration is Loading asyncRegistration is Loading
} }
fun isUserLogged(): Boolean { fun isAuthTaskCompleted(): Boolean {
return asyncLoginAction is Success return asyncLoginAction is Success
} }
} }

8
vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt
View File

@ -229,8 +229,12 @@ class FtueAuthVariant(
} }
private fun updateWithState(viewState: OnboardingViewState) { private fun updateWithState(viewState: OnboardingViewState) {
// Loading views.loginLoading.isVisible = if (vectorFeatures.isOnboardingPersonalizeEnabled()) {
views.loginLoading.isVisible = viewState.isLoading() viewState.isLoading()
} else {
// Keep loading when during success because of the delay when switching to the next Activity
viewState.isLoading() || viewState.isAuthTaskCompleted()
}
} }
private fun onWebLoginError(onWebLoginError: OnboardingViewEvents.OnWebLoginError) { private fun onWebLoginError(onWebLoginError: OnboardingViewEvents.OnWebLoginError) {