Merge branch 'develop' into rtl-layout-fix

app/build.gradle

@@ -74,6 +74,7 @@ dependencies {
     kapt libraries.daggerAndroidApt
 
     implementation libraries.playServicesGcm
+    implementation libraries.playServicesAuth
 
     implementation libraries.room
     kapt libraries.roomProcessor

app/src/main/java/chat/rocket/android/authentication/login/presentation/LoginPresenter.kt

@@ -17,6 +17,7 @@ import chat.rocket.common.model.Token
 import chat.rocket.common.util.ifNull
 import chat.rocket.core.RocketChatClient
 import chat.rocket.core.internal.rest.*
+import com.google.android.gms.auth.api.credentials.Credential
 import kotlinx.coroutines.experimental.delay
 import timber.log.Timber
 import java.util.concurrent.TimeUnit
@@ -54,6 +55,7 @@ class LoginPresenter @Inject constructor(
     private lateinit var credentialSecret: String
     private lateinit var deepLinkUserId: String
     private lateinit var deepLinkToken: String
+    private var loginCredentials: Credential? = null
 
     fun setupView() {
         setupConnectionInfo(currentServer)
@@ -149,13 +151,20 @@ class LoginPresenter @Inject constructor(
                     client.settingsOauth().services
                 }
                 if (services.isNotEmpty()) {
-                    val state = "{\"loginStyle\":\"popup\",\"credentialToken\":\"${generateRandomString(40)}\",\"isCordova\":true}".encodeToBase64()
+                    val state =
+                        "{\"loginStyle\":\"popup\",\"credentialToken\":\"${generateRandomString(40)}\",\"isCordova\":true}".encodeToBase64()
                     var totalSocialAccountsEnabled = 0
 
                     if (settings.isFacebookAuthenticationEnabled()) {
                         val clientId = getOauthClientId(services, SERVICE_NAME_FACEBOOK)
                         if (clientId != null) {
-                            view.setupFacebookButtonListener(OauthHelper.getFacebookOauthUrl(clientId, currentServer, state), state)
+                            view.setupFacebookButtonListener(
+                                OauthHelper.getFacebookOauthUrl(
+                                    clientId,
+                                    currentServer,
+                                    state
+                                ), state
+                            )
                             view.enableLoginByFacebook()
                             totalSocialAccountsEnabled++
                         }
@@ -163,7 +172,12 @@ class LoginPresenter @Inject constructor(
                     if (settings.isGithubAuthenticationEnabled()) {
                         val clientId = getOauthClientId(services, SERVICE_NAME_GITHUB)
                         if (clientId != null) {
-                            view.setupGithubButtonListener(OauthHelper.getGithubOauthUrl(clientId, state), state)
+                            view.setupGithubButtonListener(
+                                OauthHelper.getGithubOauthUrl(
+                                    clientId,
+                                    state
+                                ), state
+                            )
                             view.enableLoginByGithub()
                             totalSocialAccountsEnabled++
                         }
@@ -171,7 +185,13 @@ class LoginPresenter @Inject constructor(
                     if (settings.isGoogleAuthenticationEnabled()) {
                         val clientId = getOauthClientId(services, SERVICE_NAME_GOOGLE)
                         if (clientId != null) {
-                            view.setupGoogleButtonListener(OauthHelper.getGoogleOauthUrl(clientId, currentServer, state), state)
+                            view.setupGoogleButtonListener(
+                                OauthHelper.getGoogleOauthUrl(
+                                    clientId,
+                                    currentServer,
+                                    state
+                                ), state
+                            )
                             view.enableLoginByGoogle()
                             totalSocialAccountsEnabled++
                         }
@@ -179,7 +199,13 @@ class LoginPresenter @Inject constructor(
                     if (settings.isLinkedinAuthenticationEnabled()) {
                         val clientId = getOauthClientId(services, SERVICE_NAME_LINKEDIN)
                         if (clientId != null) {
-                            view.setupLinkedinButtonListener(OauthHelper.getLinkedinOauthUrl(clientId, currentServer, state), state)
+                            view.setupLinkedinButtonListener(
+                                OauthHelper.getLinkedinOauthUrl(
+                                    clientId,
+                                    currentServer,
+                                    state
+                                ), state
+                            )
                             view.enableLoginByLinkedin()
                             totalSocialAccountsEnabled++
                         }
@@ -303,6 +329,12 @@ class LoginPresenter @Inject constructor(
                     saveAccount(username)
                     saveToken(token)
                     registerPushToken()
+                    if (loginType == TYPE_LOGIN_USER_EMAIL) {
+                        loginCredentials = Credential.Builder(usernameOrEmail)
+                            .setPassword(password)
+                            .build()
+                        view.saveSmartLockCredentials(loginCredentials)
+                    }
                     navigator.toChatList()
                 } else if (loginType == TYPE_LOGIN_OAUTH) {
                     navigator.toRegisterUsername(token.userId, token.authToken)
@@ -333,7 +365,7 @@ class LoginPresenter @Inject constructor(
         }.toString()
     }
 
-    private fun getCustomOauthServices(listMap: List<Map<String, Any>>): List<Map<String, Any>>  {
+    private fun getCustomOauthServices(listMap: List<Map<String, Any>>): List<Map<String, Any>> {
         return listMap.filter { map -> map["custom"] == true }
     }
 

app/src/main/java/chat/rocket/android/authentication/login/presentation/LoginView.kt

@@ -2,6 +2,7 @@ package chat.rocket.android.authentication.login.presentation
 
 import chat.rocket.android.core.behaviours.LoadingView
 import chat.rocket.android.core.behaviours.MessageView
+import com.google.android.gms.auth.api.credentials.Credential
 
 interface LoginView : LoadingView, MessageView {
 
@@ -223,4 +224,9 @@ interface LoginView : LoadingView, MessageView {
      * Alerts the user about a wrong inputted password.
      */
     fun alertWrongPassword()
+
+    /**
+     * Save credentials via google smart lock
+     */
+    fun saveSmartLockCredentials(loginCredential: Credential?)
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/authentication/login/ui/LoginFragment.kt

@@ -2,20 +2,20 @@ package chat.rocket.android.authentication.login.ui
 
 import DrawableHelper
 import android.app.Activity
+import android.app.PendingIntent
 import android.content.Intent
+import android.content.IntentSender
 import android.graphics.PorterDuff
 import android.os.Build
 import android.os.Bundle
 import android.support.v4.app.Fragment
+import android.support.v4.app.FragmentActivity
 import android.text.style.ClickableSpan
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.ViewTreeObserver
-import android.widget.Button
-import android.widget.ImageButton
-import android.widget.LinearLayout
-import android.widget.ScrollView
+import android.widget.*
 import androidx.core.view.isVisible
 import androidx.core.view.postDelayed
 import chat.rocket.android.R
@@ -31,22 +31,37 @@ import chat.rocket.android.webview.oauth.ui.INTENT_OAUTH_CREDENTIAL_SECRET
 import chat.rocket.android.webview.oauth.ui.INTENT_OAUTH_CREDENTIAL_TOKEN
 import chat.rocket.android.webview.oauth.ui.oauthWebViewIntent
 import chat.rocket.common.util.ifNull
+import com.google.android.gms.auth.api.Auth
+import com.google.android.gms.auth.api.credentials.*
+import com.google.android.gms.common.api.CommonStatusCodes
+import com.google.android.gms.common.api.GoogleApiClient
+import com.google.android.gms.common.api.ResolvingResultCallbacks
+import com.google.android.gms.common.api.Status
 import dagger.android.support.AndroidSupportInjection
 import kotlinx.android.synthetic.main.fragment_authentication_log_in.*
+import timber.log.Timber
 import javax.inject.Inject
 
+
 internal const val REQUEST_CODE_FOR_CAS = 1
 internal const val REQUEST_CODE_FOR_OAUTH = 2
+internal const val MULTIPLE_CREDENTIALS_READ = 3
+internal const val NO_CREDENTIALS_EXIST = 4
+internal const val SAVE_CREDENTIALS = 5
+
+lateinit var googleApiClient: GoogleApiClient
 
-class LoginFragment : Fragment(), LoginView {
+class LoginFragment : Fragment(), LoginView, GoogleApiClient.ConnectionCallbacks {
     @Inject
     lateinit var presenter: LoginPresenter
     private var isOauthViewEnable = false
     private val layoutListener = ViewTreeObserver.OnGlobalLayoutListener {
         areLoginOptionsNeeded()
     }
+    private var isOauthSuccessful = false
     private var isGlobalLayoutListenerSetUp = false
     private var deepLinkInfo: LoginDeepLinkInfo? = null
+    private var credentialsToBeSaved: Credential? = null
 
     companion object {
         private const val DEEP_LINK_INFO = "DeepLinkInfo"
@@ -58,9 +73,17 @@ class LoginFragment : Fragment(), LoginView {
         }
     }
 
+    override fun onConnected(bundle: Bundle?) {
+        saveSmartLockCredentials(credentialsToBeSaved)
+    }
+
+    override fun onConnectionSuspended(errorCode: Int) {
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         AndroidSupportInjection.inject(this)
+        buildGoogleApiClient()
         deepLinkInfo = arguments?.getParcelable(DEEP_LINK_INFO)
     }
 
@@ -95,18 +118,155 @@ class LoginFragment : Fragment(), LoginView {
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         if (resultCode == Activity.RESULT_OK) {
-            if (requestCode == REQUEST_CODE_FOR_CAS) {
-                data?.apply {
-                    presenter.authenticateWithCas(getStringExtra(INTENT_CAS_TOKEN))
+            if (data != null) {
+                when (requestCode) {
+                    REQUEST_CODE_FOR_CAS -> data.apply {
+                        presenter.authenticateWithCas(getStringExtra(INTENT_CAS_TOKEN))
+                    }
+                    REQUEST_CODE_FOR_OAUTH -> {
+                        isOauthSuccessful = true
+                        data.apply {
+                            presenter.authenticateWithOauth(
+                                getStringExtra(INTENT_OAUTH_CREDENTIAL_TOKEN),
+                                getStringExtra(INTENT_OAUTH_CREDENTIAL_SECRET)
+                            )
+                        }
+                    }
+                    MULTIPLE_CREDENTIALS_READ -> {
+                        val loginCredentials: Credential =
+                            data.getParcelableExtra(Credential.EXTRA_KEY)
+                        handleCredential(loginCredentials)
+                    }
+                    NO_CREDENTIALS_EXIST -> {
+                        //use the hints to autofill sign in forms to reduce the info to be filled
+                        val loginCredentials: Credential =
+                            data.getParcelableExtra(Credential.EXTRA_KEY)
+                        val email = loginCredentials.id
+                        val password = loginCredentials.password
+
+                        text_username_or_email.setText(email)
+                        text_password.setText(password)
+                    }
+                    SAVE_CREDENTIALS -> Toast.makeText(
+                        context,
+                        getString(R.string.message_credentials_saved_successfully),
+                        Toast.LENGTH_SHORT
+                    ).show()
                 }
-            } else if (requestCode == REQUEST_CODE_FOR_OAUTH) {
-                data?.apply {
-                    presenter.authenticateWithOauth(
-                        getStringExtra(INTENT_OAUTH_CREDENTIAL_TOKEN),
-                        getStringExtra(INTENT_OAUTH_CREDENTIAL_SECRET)
+            }
+        }
+        //cancel button pressed by the user in case of reading from smart lock
+        else if (resultCode == Activity.RESULT_CANCELED && requestCode == REQUEST_CODE_FOR_OAUTH) {
+            Timber.d("Returned from oauth")
+        }
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        googleApiClient.let {
+            activity?.let { it1 -> it.stopAutoManage(it1) }
+            it.disconnect()
+        }
+    }
+
+    private fun buildGoogleApiClient() {
+        googleApiClient = GoogleApiClient.Builder(context!!)
+            .enableAutoManage(activity as FragmentActivity, {
+                Timber.e("ERROR: Connection to client failed")
+            })
+            .addConnectionCallbacks(this)
+            .addApi(Auth.CREDENTIALS_API)
+            .build()
+    }
+
+    override fun onStart() {
+        super.onStart()
+        if (!isOauthSuccessful) {
+            requestCredentials()
+        }
+    }
+
+    private fun requestCredentials() {
+        val request: CredentialRequest = CredentialRequest.Builder()
+            .setPasswordLoginSupported(true)
+            .build()
+
+        Auth.CredentialsApi.request(googleApiClient, request)
+            .setResultCallback { credentialRequestResult ->
+                val status = credentialRequestResult.status
+                when {
+                    status.isSuccess -> handleCredential(credentialRequestResult.credential)
+                    (status.statusCode == CommonStatusCodes.RESOLUTION_REQUIRED) -> resolveResult(
+                        status,
+                        MULTIPLE_CREDENTIALS_READ
                     )
+                    (status.statusCode == CommonStatusCodes.SIGN_IN_REQUIRED) -> {
+                        val hintRequest: HintRequest = HintRequest.Builder()
+                            .setHintPickerConfig(
+                                CredentialPickerConfig.Builder()
+                                    .setShowCancelButton(true)
+                                    .build()
+                            )
+                            .setEmailAddressIdentifierSupported(true)
+                            .setAccountTypes(IdentityProviders.GOOGLE)
+                            .build()
+                        val intent: PendingIntent =
+                            Auth.CredentialsApi.getHintPickerIntent(googleApiClient, hintRequest)
+                        try {
+                            startIntentSenderForResult(
+                                intent.intentSender,
+                                NO_CREDENTIALS_EXIST,
+                                null,
+                                0,
+                                0,
+                                0,
+                                null
+                            )
+                        } catch (e: IntentSender.SendIntentException) {
+                            Timber.e("ERROR: Could not start hint picker Intent")
+                        }
+                    }
+                    else -> Timber.d("ERROR: nothing happening")
                 }
             }
+    }
+
+    private fun handleCredential(loginCredentials: Credential) {
+        if (loginCredentials.accountType == null) {
+            presenter.authenticateWithUserAndPassword(
+                loginCredentials.id,
+                loginCredentials.password.toString()
+            )
+        }
+    }
+
+    private fun resolveResult(status: Status, requestCode: Int) {
+        try {
+            status.startResolutionForResult(activity, requestCode)
+        } catch (e: IntentSender.SendIntentException) {
+            Timber.e("Failed to send Credentials intent")
+        }
+    }
+
+    override fun saveSmartLockCredentials(loginCredential: Credential?) {
+        credentialsToBeSaved = loginCredential
+        if (credentialsToBeSaved == null) {
+            return
+        }
+
+        activity?.let {
+            Auth.CredentialsApi.save(googleApiClient, credentialsToBeSaved).setResultCallback(
+                object : ResolvingResultCallbacks<Status>(it, SAVE_CREDENTIALS) {
+                    override fun onSuccess(status: Status) {
+                        Timber.d("credentials save:SUCCESS:$status")
+                        credentialsToBeSaved = null
+                    }
+
+                    override fun onUnresolvableFailure(status: Status) {
+                        Timber.e("credentials save:FAILURE:$status")
+                        credentialsToBeSaved = null
+                    }
+                })
         }
     }
 

app/src/main/java/chat/rocket/android/authentication/server/presentation/ServerPresenter.kt

@@ -32,6 +32,7 @@ class ServerPresenter @Inject constructor(private val view: ServerView,
     }
 
     fun connect(server: String) {
+        //code that leads to login screen (smart lock will be implemented after this)
         connectToServer(server) {
             navigator.toLogin()
         }
@@ -64,6 +65,7 @@ class ServerPresenter @Inject constructor(private val view: ServerView,
     }
 
     fun deepLink(deepLinkInfo: LoginDeepLinkInfo) {
+        //code that leads to login screen (smart lock will be implemented after this)
         connectToServer(deepLinkInfo.url) {
             navigator.toLogin(deepLinkInfo)
         }

app/src/main/java/chat/rocket/android/authentication/signup/presentation/SignupPresenter.kt

@@ -6,12 +6,7 @@ import chat.rocket.android.infrastructure.LocalRepository
 import chat.rocket.android.server.domain.*
 import chat.rocket.android.server.domain.model.Account
 import chat.rocket.android.server.infraestructure.RocketChatClientFactory
-import chat.rocket.android.util.extensions.avatarUrl
-import chat.rocket.android.util.extensions.launchUI
-import chat.rocket.android.util.extensions.privacyPolicyUrl
-import chat.rocket.android.util.extensions.registerPushToken
-import chat.rocket.android.util.extensions.serverLogoUrl
-import chat.rocket.android.util.extensions.termsOfServiceUrl
+import chat.rocket.android.util.extensions.*
 import chat.rocket.android.util.retryIO
 import chat.rocket.common.RocketChatException
 import chat.rocket.common.util.ifNull
@@ -20,17 +15,20 @@ import chat.rocket.core.internal.rest.login
 import chat.rocket.core.internal.rest.me
 import chat.rocket.core.internal.rest.signup
 import chat.rocket.core.model.Myself
+import com.google.android.gms.auth.api.credentials.Credential
 import javax.inject.Inject
 
-class SignupPresenter @Inject constructor(private val view: SignupView,
-                                          private val strategy: CancelStrategy,
-                                          private val navigator: AuthenticationNavigator,
-                                          private val localRepository: LocalRepository,
-                                          private val serverInteractor: GetCurrentServerInteractor,
-                                          private val factory: RocketChatClientFactory,
-                                          private val saveAccountInteractor: SaveAccountInteractor,
-                                          private val getAccountsInteractor: GetAccountsInteractor,
-                                          settingsInteractor: GetSettingsInteractor) {
+class SignupPresenter @Inject constructor(
+    private val view: SignupView,
+    private val strategy: CancelStrategy,
+    private val navigator: AuthenticationNavigator,
+    private val localRepository: LocalRepository,
+    private val serverInteractor: GetCurrentServerInteractor,
+    private val factory: RocketChatClientFactory,
+    private val saveAccountInteractor: SaveAccountInteractor,
+    private val getAccountsInteractor: GetAccountsInteractor,
+    settingsInteractor: GetSettingsInteractor
+) {
     private val currentServer = serverInteractor.get()!!
     private val client: RocketChatClient = factory.create(currentServer)
     private var settings: PublicSettings = settingsInteractor.get(serverInteractor.get()!!)
@@ -66,6 +64,10 @@ class SignupPresenter @Inject constructor(private val view: SignupView,
                         localRepository.save(LocalRepository.CURRENT_USERNAME_KEY, me.username)
                         saveAccount(me)
                         registerPushToken()
+                        val loginCredentials = Credential.Builder(email)
+                            .setPassword(password)
+                            .build()
+                        view.saveSmartLockCredentials(loginCredentials)
                         navigator.toChatList()
                     } catch (exception: RocketChatException) {
                         exception.message?.let {

app/src/main/java/chat/rocket/android/authentication/signup/presentation/SignupView.kt

@@ -2,6 +2,7 @@ package chat.rocket.android.authentication.signup.presentation
 
 import chat.rocket.android.core.behaviours.LoadingView
 import chat.rocket.android.core.behaviours.MessageView
+import com.google.android.gms.auth.api.credentials.Credential
 
 interface SignupView : LoadingView, MessageView {
 
@@ -24,4 +25,9 @@ interface SignupView : LoadingView, MessageView {
      * Alerts the user about a blank email.
      */
     fun alertBlankEmail()
+
+    /**
+     * Save credentials via google smart lock
+     */
+    fun saveSmartLockCredentials(loginCredential: Credential)
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/authentication/signup/ui/SignupFragment.kt

 package chat.rocket.android.authentication.signup.ui
 
 import DrawableHelper
+import android.app.Activity.RESULT_OK
+import android.content.Intent
 import android.os.Build
 import android.os.Bundle
 import android.support.v4.app.Fragment
 import android.text.style.ClickableSpan
-import android.view.*
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.ViewTreeObserver
 import android.widget.Toast
 import chat.rocket.android.R
+import chat.rocket.android.authentication.login.ui.googleApiClient
 import chat.rocket.android.authentication.signup.presentation.SignupPresenter
 import chat.rocket.android.authentication.signup.presentation.SignupView
 import chat.rocket.android.helper.KeyboardHelper
 import chat.rocket.android.helper.TextHelper
 import chat.rocket.android.util.extensions.*
+import com.google.android.gms.auth.api.Auth
+import com.google.android.gms.auth.api.credentials.Credential
+import com.google.android.gms.common.api.ResolvingResultCallbacks
+import com.google.android.gms.common.api.Status
 import dagger.android.support.AndroidSupportInjection
 import kotlinx.android.synthetic.main.fragment_authentication_sign_up.*
+import timber.log.Timber
 import javax.inject.Inject
 
+internal const val SAVE_CREDENTIALS = 1
+
 class SignupFragment : Fragment(), SignupView {
-    @Inject lateinit var presenter: SignupPresenter
+
+    @Inject
+    lateinit var presenter: SignupPresenter
+    private lateinit var credentialsToBeSaved: Credential
     private val layoutListener = ViewTreeObserver.OnGlobalLayoutListener {
         if (KeyboardHelper.isSoftKeyboardShown(relative_layout.rootView)) {
             bottom_container.setVisible(false)
@@ -40,7 +56,11 @@ class SignupFragment : Fragment(), SignupView {
         AndroidSupportInjection.inject(this)
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? = inflater.inflate(R.layout.fragment_authentication_sign_up, container, false)
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? = inflater.inflate(R.layout.fragment_authentication_sign_up, container, false)
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
@@ -54,7 +74,12 @@ class SignupFragment : Fragment(), SignupView {
         setUpNewUserAgreementListener()
 
         button_sign_up.setOnClickListener {
-            presenter.signup(text_username.textContent, text_username.textContent, text_password.textContent, text_email.textContent)
+            presenter.signup(
+                text_username.textContent,
+                text_username.textContent,
+                text_password.textContent,
+                text_email.textContent
+            )
         }
     }
 
@@ -95,6 +120,44 @@ class SignupFragment : Fragment(), SignupView {
         }
     }
 
+    override fun saveSmartLockCredentials(loginCredential: Credential) {
+        credentialsToBeSaved = loginCredential
+        googleApiClient.let {
+            if (it.isConnected) {
+                saveCredentials()
+            }
+        }
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        if (requestCode == SAVE_CREDENTIALS) {
+            if (resultCode == RESULT_OK) {
+                Toast.makeText(
+                    context,
+                    getString(R.string.message_credentials_saved_successfully),
+                    Toast.LENGTH_SHORT
+                ).show()
+            } else {
+                Timber.e("ERROR: Cancelled by user")
+            }
+        }
+    }
+
+    private fun saveCredentials() {
+        activity?.let {
+            Auth.CredentialsApi.save(googleApiClient, credentialsToBeSaved).setResultCallback(
+                object : ResolvingResultCallbacks<Status>(it, SAVE_CREDENTIALS) {
+                    override fun onSuccess(status: Status) {
+                        Timber.d("save:SUCCESS:$status")
+                    }
+
+                    override fun onUnresolvableFailure(status: Status) {
+                        Timber.e("save:FAILURE:$status")
+                    }
+                })
+        }
+    }
+
     override fun showLoading() {
         ui {
             enableUserInput(false)
@@ -127,7 +190,8 @@ class SignupFragment : Fragment(), SignupView {
 
     private fun tintEditTextDrawableStart() {
         ui {
-            val personDrawable = DrawableHelper.getDrawableFromId(R.drawable.ic_person_black_24dp, it)
+            val personDrawable =
+                DrawableHelper.getDrawableFromId(R.drawable.ic_person_black_24dp, it)
             val atDrawable = DrawableHelper.getDrawableFromId(R.drawable.ic_at_black_24dp, it)
             val lockDrawable = DrawableHelper.getDrawableFromId(R.drawable.ic_lock_black_24dp, it)
             val emailDrawable = DrawableHelper.getDrawableFromId(R.drawable.ic_email_black_24dp, it)
@@ -135,14 +199,22 @@ class SignupFragment : Fragment(), SignupView {
             val drawables = arrayOf(personDrawable, atDrawable, lockDrawable, emailDrawable)
             DrawableHelper.wrapDrawables(drawables)
             DrawableHelper.tintDrawables(drawables, it, R.color.colorDrawableTintGrey)
-            DrawableHelper.compoundDrawables(arrayOf(text_name, text_username, text_password, text_email), drawables)
+            DrawableHelper.compoundDrawables(
+                arrayOf(
+                    text_name,
+                    text_username,
+                    text_password,
+                    text_email
+                ), drawables
+            )
         }
     }
 
     private fun setUpNewUserAgreementListener() {
         val termsOfService = getString(R.string.action_terms_of_service)
         val privacyPolicy = getString(R.string.action_privacy_policy)
-        val newUserAgreement = String.format(getString(R.string.msg_new_user_agreement), termsOfService, privacyPolicy)
+        val newUserAgreement =
+            String.format(getString(R.string.msg_new_user_agreement), termsOfService, privacyPolicy)
 
         text_new_user_agreement.text = newUserAgreement
 
@@ -158,7 +230,11 @@ class SignupFragment : Fragment(), SignupView {
             }
         }
 
-        TextHelper.addLink(text_new_user_agreement, arrayOf(termsOfService, privacyPolicy), arrayOf(termsOfServiceListener, privacyPolicyListener))
+        TextHelper.addLink(
+            text_new_user_agreement,
+            arrayOf(termsOfService, privacyPolicy),
+            arrayOf(termsOfServiceListener, privacyPolicyListener)
+        )
     }
 
     private fun enableUserInput(value: Boolean) {

app/src/main/java/chat/rocket/android/authentication/ui/AuthenticationActivity.kt

@@ -21,8 +21,10 @@ import kotlinx.coroutines.experimental.launch
 import javax.inject.Inject
 
 class AuthenticationActivity : AppCompatActivity(), HasSupportFragmentInjector {
-    @Inject lateinit var fragmentDispatchingAndroidInjector: DispatchingAndroidInjector<Fragment>
-    @Inject lateinit var presenter: AuthenticationPresenter
+    @Inject
+    lateinit var fragmentDispatchingAndroidInjector: DispatchingAndroidInjector<Fragment>
+    @Inject
+    lateinit var presenter: AuthenticationPresenter
     val job = Job()
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -43,6 +45,14 @@ class AuthenticationActivity : AppCompatActivity(), HasSupportFragmentInjector {
         }
     }
 
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        val currentFragment = supportFragmentManager.findFragmentById(R.id.fragment_container)
+        if (currentFragment != null) {
+            currentFragment.onActivityResult(requestCode, resultCode, data)
+        }
+    }
+
     override fun onDestroy() {
         job.cancel()
         super.onDestroy()

app/src/main/java/chat/rocket/android/main/presentation/MainPresenter.kt

@@ -105,11 +105,12 @@ class MainPresenter @Inject constructor(
                 disconnect()
                 removeAccountInteractor.remove(currentServer)
                 tokenRepository.remove(currentServer)
+                view.disableAutoSignIn()
                 navigator.toNewServer()
             } catch (ex: Exception) {
                 Timber.d(ex, "Error cleaning up the session...")
             }
-
+            view.disableAutoSignIn()
             navigator.toNewServer()
         }
     }

app/src/main/java/chat/rocket/android/main/presentation/MainView.kt

@@ -24,4 +24,9 @@ interface MainView : MessageView, VersionCheckView {
     fun setupNavHeader(viewModel: NavHeaderViewModel, accounts: List<Account>)
 
     fun closeServerSelection()
+
+    /**
+     * callback to disable auto sign in for google smart lock when the user logs out
+     */
+    fun disableAutoSignIn()
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/main/ui/MainActivity.kt

 package chat.rocket.android.main.ui
 
+import DrawableHelper
 import android.app.Activity
 import android.app.AlertDialog
 import android.os.Bundle
@@ -11,8 +12,8 @@ import android.view.MenuItem
 import android.view.View
 import chat.rocket.android.BuildConfig
 import chat.rocket.android.R
-import chat.rocket.android.main.adapter.Selector
 import chat.rocket.android.main.adapter.AccountsAdapter
+import chat.rocket.android.main.adapter.Selector
 import chat.rocket.android.main.presentation.MainPresenter
 import chat.rocket.android.main.presentation.MainView
 import chat.rocket.android.main.viewmodel.NavHeaderViewModel
@@ -22,6 +23,8 @@ import chat.rocket.android.util.extensions.fadeOut
 import chat.rocket.android.util.extensions.rotateBy
 import chat.rocket.android.util.extensions.showToast
 import chat.rocket.common.model.UserStatus
+import com.google.android.gms.auth.api.Auth
+import com.google.android.gms.common.api.GoogleApiClient
 import com.google.android.gms.gcm.GoogleCloudMessaging
 import com.google.android.gms.iid.InstanceID
 import dagger.android.AndroidInjection
@@ -37,22 +40,32 @@ import kotlinx.coroutines.experimental.launch
 import timber.log.Timber
 import javax.inject.Inject
 
-class MainActivity : AppCompatActivity(), MainView, HasActivityInjector, HasSupportFragmentInjector {
-    @Inject lateinit var activityDispatchingAndroidInjector: DispatchingAndroidInjector<Activity>
-    @Inject lateinit var fragmentDispatchingAndroidInjector: DispatchingAndroidInjector<Fragment>
-    @Inject lateinit var presenter: MainPresenter
+class MainActivity : AppCompatActivity(), MainView, HasActivityInjector, HasSupportFragmentInjector,
+    GoogleApiClient.ConnectionCallbacks {
+    @Inject
+    lateinit var activityDispatchingAndroidInjector: DispatchingAndroidInjector<Activity>
+    @Inject
+    lateinit var fragmentDispatchingAndroidInjector: DispatchingAndroidInjector<Fragment>
+    @Inject
+    lateinit var presenter: MainPresenter
     private var isFragmentAdded: Boolean = false
     private var expanded = false
+    private lateinit var googleApiClient: GoogleApiClient
     private val headerLayout by lazy { view_navigation.getHeaderView(0) }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         AndroidInjection.inject(this)
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
+        buildGoogleApiClient()
 
         launch(CommonPool) {
             try {
-                val token = InstanceID.getInstance(this@MainActivity).getToken(getString(R.string.gcm_sender_id), GoogleCloudMessaging.INSTANCE_ID_SCOPE, null)
+                val token = InstanceID.getInstance(this@MainActivity).getToken(
+                    getString(R.string.gcm_sender_id),
+                    GoogleCloudMessaging.INSTANCE_ID_SCOPE,
+                    null
+                )
                 Timber.d("GCM token: $token")
                 presenter.refreshToken(token)
             } catch (ex: Exception) {
@@ -66,6 +79,39 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector, HasSupp
         setupNavigationView()
     }
 
+    override fun onConnected(bundle: Bundle?) {
+    }
+
+    override fun onConnectionSuspended(errorCode: Int) {
+    }
+
+    private fun buildGoogleApiClient() {
+        googleApiClient = GoogleApiClient.Builder(this)
+            .enableAutoManage(this, {
+                Timber.d("ERROR: connection to client failed")
+            })
+            .addConnectionCallbacks(this)
+            .addApi(Auth.CREDENTIALS_API)
+            .build()
+    }
+
+    override fun onStart() {
+        super.onStart()
+        googleApiClient.let {
+            if (it.isConnected) {
+                Timber.d("Google api client connected successfully")
+            }
+        }
+    }
+
+    override fun disableAutoSignIn() {
+        googleApiClient.let {
+            if (it.isConnected) {
+                Auth.CredentialsApi.disableAutoSignIn(googleApiClient)
+            }
+        }
+    }
+
     override fun onResume() {
         super.onResume()
         if (!isFragmentAdded) {
@@ -119,19 +165,29 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector, HasSupp
 
     override fun alertNotRecommendedVersion() {
         AlertDialog.Builder(this)
-                .setMessage(getString(R.string.msg_ver_not_recommended, BuildConfig.RECOMMENDED_SERVER_VERSION))
-                .setPositiveButton(R.string.msg_ok, null)
-                .create()
-                .show()
+            .setMessage(
+                getString(
+                    R.string.msg_ver_not_recommended,
+                    BuildConfig.RECOMMENDED_SERVER_VERSION
+                )
+            )
+            .setPositiveButton(R.string.msg_ok, null)
+            .create()
+            .show()
     }
 
     override fun blockAndAlertNotRequiredVersion() {
         AlertDialog.Builder(this)
-                .setMessage(getString(R.string.msg_ver_not_minimum, BuildConfig.REQUIRED_SERVER_VERSION))
-                .setOnDismissListener { presenter.logout() }
-                .setPositiveButton(R.string.msg_ok, null)
-                .create()
-                .show()
+            .setMessage(
+                getString(
+                    R.string.msg_ver_not_minimum,
+                    BuildConfig.REQUIRED_SERVER_VERSION
+                )
+            )
+            .setOnDismissListener { presenter.logout() }
+            .setPositiveButton(R.string.msg_ok, null)
+            .create()
+            .show()
     }
 
     private fun setupAccountsList(header: View, accounts: List<Account>) {
@@ -176,7 +232,8 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector, HasSupp
 
     override fun activityInjector(): AndroidInjector<Activity> = activityDispatchingAndroidInjector
 
-    override fun supportFragmentInjector(): AndroidInjector<Fragment> = fragmentDispatchingAndroidInjector
+    override fun supportFragmentInjector(): AndroidInjector<Fragment> =
+        fragmentDispatchingAndroidInjector
 
     private fun setupToolbar() {
         setSupportActionBar(toolbar)

app/src/main/java/chat/rocket/android/webview/oauth/ui/OauthWebViewActivity.kt

@@ -40,7 +40,6 @@ class OauthWebViewActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_web_view)
-
         webPageUrl = intent.getStringExtra(INTENT_WEB_PAGE_URL)
         requireNotNull(webPageUrl) { "no web_page_url provided in Intent extras" }
 
@@ -81,7 +80,8 @@ class OauthWebViewActivity : AppCompatActivity() {
             domStorageEnabled = true
             // TODO Remove this workaround that is required to make Google OAuth to work. We should use Custom Tabs instead. See https://github.com/RocketChat/Rocket.Chat.Android/issues/968
             if (webPageUrl.contains("google")) {
-                userAgentString = "Mozilla/5.0 (Linux; Android 4.1.1; Galaxy Nexus Build/JRO03C) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/43.0.2357.65 Mobile Safari/535.19"
+                userAgentString =
+                        "Mozilla/5.0 (Linux; Android 4.1.1; Galaxy Nexus Build/JRO03C) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/43.0.2357.65 Mobile Safari/535.19"
             }
         }
         web_view.webViewClient = object : WebViewClient() {
@@ -114,8 +114,18 @@ class OauthWebViewActivity : AppCompatActivity() {
     private fun getCredentialSecret(json: JSONObject): String =
         json.optString(JSON_CREDENTIAL_SECRET)
 
-    private fun closeView(activityResult: Int = Activity.RESULT_CANCELED, credentialToken: String? = null, credentialSecret: String? = null) {
-        setResult(activityResult, Intent().putExtra(INTENT_OAUTH_CREDENTIAL_TOKEN, credentialToken).putExtra(INTENT_OAUTH_CREDENTIAL_SECRET, credentialSecret))
+    private fun closeView(
+        activityResult: Int = Activity.RESULT_CANCELED,
+        credentialToken: String? = null,
+        credentialSecret: String? = null
+    ) {
+        setResult(
+            activityResult,
+            Intent().putExtra(INTENT_OAUTH_CREDENTIAL_TOKEN, credentialToken).putExtra(
+                INTENT_OAUTH_CREDENTIAL_SECRET,
+                credentialSecret
+            )
+        )
         finish()
         overridePendingTransition(R.anim.hold, R.anim.slide_down)
     }

app/src/main/res/values-es/strings.xml

@@ -134,6 +134,9 @@
     <string name="message_unmuted">Usuario %1$s no silenciado por %2$s</string>
     <string name="message_role_add">%1$s fue establecido %2$s por %3$s</string>
     <string name="message_role_removed">%1$s ya no es %2$s por %3$s</string>
+    // TODO:Add proper translation.
+    <string name="message_credentials_saved_successfully">Credentials saved successfully</string>
+
 
     <!-- Message actions -->
     <string name="action_msg_reply">Respuesta</string>

app/src/main/res/values-fr/strings.xml

@@ -134,6 +134,9 @@
     <string name="message_unmuted">Utilisateur %1$s non muté par %2$s</string>
     <string name="message_role_add">%1$s a été défini %2$s par %3$s</string>
     <string name="message_role_removed">%1$s is no longer %2$s par %3$s</string>
+    // TODO:Add proper translation.
+    <string name="message_credentials_saved_successfully">Credentials saved successfully</string>
+
 
     <!-- Message actions -->
     <string name="action_msg_reply">Répondre</string>

app/src/main/res/values-hi-rIN/strings.xml

@@ -136,6 +136,9 @@
     <string name="message_unmuted">उपयोगकर्ता %1$s %2$s द्वारा अनम्यूट किया गया</string>
     <string name="message_role_add">%1$s %3$s द्वारा %2$s सेट किया गया था</string>
     <string name="message_role_removed">%1$s अब %3$s द्वारा %2$s नहीं है</string>
+    // TODO:Add proper translation.
+    <string name="message_credentials_saved_successfully">Credentials saved successfully</string>
+
 
     <!-- Message actions -->
     <string name="action_msg_reply">जवाब दें</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -126,6 +126,9 @@
     <string name="message_unmuted">Usuário %1$s saiu do modo mudo por %2$s</string>
     <string name="message_role_add">%1$s foi definido %2$s por %3$s</string>
     <string name="message_role_removed">%1$s não é mais %2$s por %3$s</string>
+    // TODO:Add proper translation.
+    <string name="message_credentials_saved_successfully">Credentials saved successfully</string>
+
 
     <!-- Message actions -->
     <string name="action_msg_reply">Responder</string>

app/src/main/res/values/strings.xml

@@ -127,6 +127,7 @@
     <string name="message_unmuted">User %1$s unmuted by %2$s</string>
     <string name="message_role_add">%1$s was set %2$s by %3$s</string>
     <string name="message_role_removed">%1$s is no longer %2$s by %3$s</string>
+    <string name="message_credentials_saved_successfully">Credentials saved successfully</string>
 
     <!-- Message actions -->
     <string name="action_msg_reply">Reply</string>

dependencies.gradle

@@ -59,6 +59,7 @@ ext {
             daggerProcessor       : "com.google.dagger:dagger-compiler:${versions.dagger}",
             daggerAndroidApt      : "com.google.dagger:dagger-android-processor:${versions.dagger}",
             playServicesGcm       : "com.google.android.gms:play-services-gcm:${versions.playServices}",
+            playServicesAuth      : "com.google.android.gms:play-services-auth:${versions.playServices}",
             exoPlayer             : "com.google.android.exoplayer:exoplayer:${versions.exoPlayer}",
 
             room                  : "android.arch.persistence.room:runtime:${versions.room}",