Merge branch 'develop-2.x' into new/version-check

81de4f59 · Leonardo Aramaki · GitHub · 1e778869 · 41e40af7 · 81de4f59
Unverified Commit 81de4f59 authored Apr 02, 2018 by Leonardo Aramaki Committed by GitHub Apr 02, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 4 deletions

LoginPresenter.kt ...droid/authentication/login/presentation/LoginPresenter.kt +12 -4

No files found.
--- a/app/src/main/java/chat/rocket/android/authentication/login/presentation/LoginPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/authentication/login/presentation/LoginPresenter.kt
@@ -14,6 +14,7 @@ import chat.rocket.android.server.presentation.CheckServerPresenter
 import chat.rocket.android.util.VersionInfo
 import chat.rocket.android.util.extensions.*
 import chat.rocket.common.RocketChatException
+import chat.rocket.common.RocketChatTwoFactorException
 import chat.rocket.common.model.Token
 import chat.rocket.common.util.ifNull
 import chat.rocket.core.RocketChatClient
@@ -224,10 +225,17 @@ class LoginPresenter @Inject constructor(private val view: LoginView,
                    registerPushToken()
                    navigator.toChatList()
                } catch (exception: RocketChatException) {
-                    exception.message?.let {
+                    when (exception) {
-                        view.showMessage(it)
+                        is RocketChatTwoFactorException -> {
-                    }.ifNull {
+                            navigator.toTwoFA(usernameOrEmail, password)
-                        view.showGenericErrorMessage()
+                        }
+                        else -> {
+                            exception.message?.let {
+                                view.showMessage(it)
+                            }.ifNull {
+                                view.showGenericErrorMessage()
+                            }
+                        }
                    }
                } finally {
                    view.hideLoading()