Merge pull request #1728 from RocketChat/fix/two-fa-with-email

[FIX] Two factor authentication when using email.

app/src/main/java/chat/rocket/android/authentication/twofactor/presentation/TwoFAPresenter.kt

@@ -17,12 +17,14 @@ import chat.rocket.android.server.domain.wideTile
 import chat.rocket.android.server.infraestructure.RocketChatClientFactory
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.extensions.avatarUrl
+import chat.rocket.android.util.extensions.isEmail
 import chat.rocket.android.util.extensions.serverLogoUrl
 import chat.rocket.android.util.retryIO
 import chat.rocket.common.RocketChatAuthException
 import chat.rocket.common.RocketChatException
 import chat.rocket.common.util.ifNull
 import chat.rocket.core.internal.rest.login
+import chat.rocket.core.internal.rest.loginWithEmail
 import chat.rocket.core.internal.rest.me
 import chat.rocket.core.model.Myself
 import javax.inject.Inject
@@ -64,7 +66,11 @@ class TwoFAPresenter @Inject constructor(
                     try {
                         // The token is saved via the client TokenProvider
                         val token = retryIO("login") {
-                            client.login(usernameOrEmail, password, twoFactorAuthenticationCode)
+                            if (usernameOrEmail.isEmail()) {
+                                client.loginWithEmail(usernameOrEmail, password, twoFactorAuthenticationCode)
+                            } else {
+                                client.login(usernameOrEmail, password, twoFactorAuthenticationCode)
+                            }
                         }
                         val me = retryIO("me") { client.me() }
                         saveAccount(me)