Fix merge issue

35b4b62b · Lucio Maciel · 632896ef · 35b4b62b
Commit 35b4b62b authored Mar 29, 2018 by Lucio Maciel
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

LoginPresenter.kt ...droid/authentication/login/presentation/LoginPresenter.kt +1 -1

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
@@ -136,7 +136,7 @@ class LoginPresenter @Inject constructor(private val view: LoginView,
                    if (settings.isGoogleAuthenticationEnabled()) {
                        val clientId = getOauthClientId(services, SERVICE_NAME_GOOGLE)
                        if (clientId != null) {
-                            view.setupGoogleButtonListener(UrlHelper.getGoogleOauthUrl(clientId, server!!, state), state)
+                            view.setupGoogleButtonListener(UrlHelper.getGoogleOauthUrl(clientId, currentServer, state), state)
                            view.enableLoginByGoogle()
                            totalSocialAccountsEnabled++
                        }