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

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 {
-                        view.showMessage(it)
-                    }.ifNull {
-                        view.showGenericErrorMessage()
+                    when (exception) {
+                        is RocketChatTwoFactorException -> {
+                            navigator.toTwoFA(usernameOrEmail, password)
+                        }
+                        else -> {
+                            exception.message?.let {
+                                view.showMessage(it)
+                            }.ifNull {
+                                view.showGenericErrorMessage()
+                            }
+                        }
                     }
                 } finally {
                     view.hideLoading()