Use coroutines instead of listeners for Firebase Auth

Author: MarkNjunge

app/src/main/java/com/marknkamau/justjava/ui/login/LogInActivity.kt

@@ -14,6 +14,7 @@ import com.marknkamau.justjava.data.local.PreferencesRepository
 import com.marknkamau.justjava.ui.signup.SignUpActivity
 import com.marknkamau.justjava.utils.trimmedText
 import kotlinx.android.synthetic.main.activity_log_in.*
+import kotlinx.coroutines.Dispatchers
 import org.koin.android.ext.android.inject
 
 class LogInActivity : AppCompatActivity(), LogInView, View.OnClickListener {
@@ -28,7 +29,7 @@ class LogInActivity : AppCompatActivity(), LogInView, View.OnClickListener {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_log_in)
 
-        presenter = LogInPresenter(this, preferencesRepository, authService, databaseService)
+        presenter = LogInPresenter(this, preferencesRepository, authService, databaseService, Dispatchers.Main)
         presenter.checkSignInStatus()
 
         btnLogin.setOnClickListener(this)
@@ -41,6 +42,11 @@ class LogInActivity : AppCompatActivity(), LogInView, View.OnClickListener {
         presenter.checkSignInStatus()
     }
 
+    override fun onStop() {
+        super.onStop()
+        presenter.cancel()
+    }
+
     override fun onClick(view: View) {
         when (view) {
             btnLogin -> signIn()

app/src/main/java/com/marknkamau/justjava/ui/login/LogInPresenter.kt

@@ -5,12 +5,24 @@ import com.marknjunge.core.model.UserDetails
 import com.marknjunge.core.auth.AuthService
 import com.marknjunge.core.data.firebase.ClientDatabaseService
 import com.marknjunge.core.data.firebase.WriteListener
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
 import timber.log.Timber
 
 internal class LogInPresenter(private val activityView: LogInView,
                               private val preferences: PreferencesRepository,
                               private val auth: AuthService,
-                              private val database: ClientDatabaseService) {
+                              private val database: ClientDatabaseService,
+                              mainDispatcher: CoroutineDispatcher) {
+
+    private val job = Job()
+    private val uiScope = CoroutineScope(job + mainDispatcher)
+
+    fun cancel() {
+        job.cancel()
+    }
 
     fun checkSignInStatus() {
         if (auth.isSignedIn()) {
@@ -20,16 +32,16 @@ internal class LogInPresenter(private val activityView: LogInView,
 
     fun signIn(email: String, password: String) {
         activityView.showDialog()
-        auth.signIn(email, password, object : AuthService.AuthActionListener {
-            override fun actionSuccessful(response: String) {
-                getUserDefaults(response)
+        uiScope.launch {
+            try {
+                val uid = auth.signIn(email, password)
+                getUserDefaults(uid)
                 setFcmToken()
+            } catch (e: Exception) {
+                Timber.e(e)
+                activityView.displayMessage(e.message)
             }
-
-            override fun actionFailed(response: String) {
-                activityView.displayMessage(response)
-            }
-        })
+        }
     }
 
     private fun getUserDefaults(id: String) {
@@ -61,14 +73,14 @@ internal class LogInPresenter(private val activityView: LogInView,
 
 
     fun resetUserPassword(email: String) {
-        auth.sendPasswordResetEmail(email, object : AuthService.AuthActionListener {
-            override fun actionSuccessful(response: String) {
-                activityView.displayMessage(response)
-            }
-
-            override fun actionFailed(response: String) {
-                activityView.displayMessage(response)
+        uiScope.launch {
+            try {
+                auth.sendPasswordResetEmail(email)
+                activityView.displayMessage("Password reset email sent")
+            } catch (e: Exception) {
+                Timber.e(e)
+                activityView.displayMessage(e.message)
             }
-        })
+        }
     }
 }

app/src/main/java/com/marknkamau/justjava/ui/profile/ProfileActivity.kt

@@ -20,6 +20,7 @@ import com.marknkamau.justjava.ui.previousOrder.PreviousOrderActivity
 
 import com.marknkamau.justjava.utils.trimmedText
 import kotlinx.android.synthetic.main.activity_profile.*
+import kotlinx.coroutines.Dispatchers
 import org.koin.android.ext.android.inject
 
 class ProfileActivity : BaseActivity(), ProfileView {
@@ -45,7 +46,7 @@ class ProfileActivity : BaseActivity(), ProfileView {
         rvPreviousOrders.addItemDecoration(androidx.recyclerview.widget.DividerItemDecoration(this, LinearLayout.VERTICAL))
         rvPreviousOrders.adapter = adapter
 
-        presenter = ProfilePresenter(this, preferencesRepository, authService, databaseService)
+        presenter = ProfilePresenter(this, preferencesRepository, authService, databaseService, Dispatchers.Main)
 
         btnUpdateProfile.setOnClickListener { saveChanges() }
     }

app/src/main/java/com/marknkamau/justjava/ui/profile/ProfilePresenter.kt

@@ -6,12 +6,20 @@ import com.marknjunge.core.data.firebase.WriteListener
 import com.marknkamau.justjava.data.local.PreferencesRepository
 import com.marknjunge.core.model.Order
 import com.marknjunge.core.model.UserDetails
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
 import timber.log.Timber
 
 internal class ProfilePresenter(private val view: ProfileView,
                                 private val preferencesRepository: PreferencesRepository,
                                 private val authenticationService: AuthService,
-                                private val databaseService: ClientDatabaseService) {
+                                private val databaseService: ClientDatabaseService,
+                                mainDispatcher: CoroutineDispatcher) {
+
+    private val job = Job()
+    private val uiScope = CoroutineScope(job + mainDispatcher)
 
     init {
         getUserDetails()
@@ -47,8 +55,9 @@ internal class ProfilePresenter(private val view: ProfileView,
 
     fun updateUserDetails(name: String, phone: String, address: String) {
         view.showProfileProgressBar()
-        authenticationService.setUserDisplayName(name, object : AuthService.AuthActionListener {
-            override fun actionSuccessful(response: String) {
+        uiScope.launch {
+            try {
+                authenticationService.setUserDisplayName(name)
                 databaseService.updateUserDetails(userDetails.id, name, phone, address, object : WriteListener {
                     override fun onSuccess() {
                         val newUserDetails = UserDetails(userDetails.id, userDetails.email, name, phone, address)
@@ -64,12 +73,12 @@ internal class ProfilePresenter(private val view: ProfileView,
                         view.displayMessage(reason)
                     }
                 })
+            } catch (e: Exception) {
+                Timber.e(e)
+                view.hideProfileProgressBar()
+                view.displayMessage(e.message)
             }
-
-            override fun actionFailed(response: String) {
-                view.displayMessage(response)
-            }
-        })
+        }
     }
 
 }

app/src/main/java/com/marknkamau/justjava/ui/signup/SignUpActivity.kt

@@ -12,6 +12,7 @@ import com.marknkamau.justjava.R
 import com.marknkamau.justjava.data.local.PreferencesRepository
 import com.marknkamau.justjava.utils.trimmedText
 import kotlinx.android.synthetic.main.activity_sign_up.*
+import kotlinx.coroutines.Dispatchers
 import org.koin.android.ext.android.inject
 import java.util.regex.Pattern
 
@@ -31,7 +32,7 @@ class SignUpActivity : AppCompatActivity(), SignUpView, View.OnClickListener {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_sign_up)
 
-        presenter = SignUpPresenter(this, preferencesRepository, authService, databaseService)
+        presenter = SignUpPresenter(this, preferencesRepository, authService, databaseService, Dispatchers.Main)
 
         btnSignup.setOnClickListener(this)
         tvLogin.setOnClickListener(this)

app/src/main/java/com/marknkamau/justjava/ui/signup/SignUpPresenter.kt

@@ -5,44 +5,53 @@ import com.marknjunge.core.data.firebase.ClientDatabaseService
 import com.marknjunge.core.data.firebase.WriteListener
 import com.marknkamau.justjava.data.local.PreferencesRepository
 import com.marknjunge.core.model.UserDetails
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
 import timber.log.Timber
 
 internal class SignUpPresenter(private val activityView: SignUpView,
                                private val preferences: PreferencesRepository,
                                private val auth: AuthService,
-                               private val database: ClientDatabaseService) {
+                               private val database: ClientDatabaseService,
+                               mainDispatcher: CoroutineDispatcher) {
+
+    private val job = Job()
+    private val uiScope = CoroutineScope(job + mainDispatcher)
 
     fun createUser(email: String, password: String, name: String, phone: String, address: String) {
         activityView.disableUserInteraction()
 
-        auth.createUser(email, password, object : AuthService.AuthActionListener {
-            override fun actionSuccessful(response: String) {
+        uiScope.launch {
+            try {
+                auth.createUser(email, password)
                 signInUser(email, password, name, phone, address)
-            }
-
-            override fun actionFailed(response: String) {
+            } catch (e: Exception) {
+                Timber.e(e)
                 activityView.enableUserInteraction()
-                activityView.displayMessage(response)
+                activityView.displayMessage(e.message ?: "Unable to sign up")
             }
-        })
+        }
     }
 
     private fun signInUser(email: String, password: String, name: String, phone: String, address: String) {
-        auth.signIn(email, password, object : AuthService.AuthActionListener {
-            override fun actionSuccessful(response: String) {
-                setUserDisplayName(response, email, name, phone, address)
-            }
-
-            override fun actionFailed(response: String) {
+        uiScope.launch {
+            try {
+                val uid = auth.signIn(email, password)
+                setUserDisplayName(uid, email, name, phone, address)
+            } catch (e: Exception) {
+                Timber.e(e)
                 activityView.enableUserInteraction()
-                activityView.displayMessage(response)
+                activityView.displayMessage(e.message ?: "Unable to sign in")
             }
-        })
+        }
     }
 
-    private fun setUserDisplayName(id:String, email: String, name: String, phone: String, address: String) {
-        auth.setUserDisplayName(name, object : AuthService.AuthActionListener {
-            override fun actionSuccessful(response: String) {
+    private fun setUserDisplayName(id: String, email: String, name: String, phone: String, address: String) {
+        uiScope.launch {
+            try {
+                auth.setUserDisplayName(name)
                 val userDetails = UserDetails(id, email, name, phone, address)
 
                 database.saveUserDetails(userDetails, object : WriteListener {
@@ -59,17 +68,15 @@ internal class SignUpPresenter(private val activityView: SignUpView,
                         activityView.displayMessage(reason)
                     }
                 })
-
-            }
-
-            override fun actionFailed(response: String) {
+            } catch (e: Exception) {
+                Timber.e(e)
                 activityView.enableUserInteraction()
-                activityView.displayMessage(response)
+                activityView.displayMessage(e.message ?: "Unable to create account")
             }
-        })
+        }
     }
 
-    private fun setFcmToken(){
+    private fun setFcmToken() {
         database.updateUserFcmToken(auth.getCurrentUser().userId, object : WriteListener {
             override fun onError(reason: String) {
                 Timber.e(reason)

core/src/main/java/com/marknjunge/core/auth/AuthService.kt

@@ -6,13 +6,13 @@ import com.marknjunge.core.model.AuthUser
 interface AuthService {
     fun addStateListener(listener: FirebaseAuth.AuthStateListener)
 
-    fun createUser(email: String, password: String, listener: AuthActionListener)
+    suspend fun createUser(email: String, password: String)
 
-    fun signIn(email: String, password: String, listener: AuthActionListener)
+    suspend fun signIn(email: String, password: String): String
 
-    fun sendPasswordResetEmail(email: String, listener: AuthActionListener)
+    suspend fun sendPasswordResetEmail(email: String)
 
-    fun setUserDisplayName(name: String, listener: AuthActionListener)
+    suspend fun setUserDisplayName(name: String)
 
     fun getCurrentUser(): AuthUser
 

core/src/main/java/com/marknjunge/core/auth/AuthServiceImpl.kt

@@ -3,6 +3,7 @@ package com.marknjunge.core.auth
 import com.google.firebase.auth.FirebaseAuth
 import com.google.firebase.auth.UserProfileChangeRequest
 import com.marknjunge.core.model.AuthUser
+import kotlinx.coroutines.tasks.await
 
 internal class AuthServiceImpl : AuthService {
     private val firebaseAuth: FirebaseAuth by lazy { FirebaseAuth.getInstance() }
@@ -11,38 +12,21 @@ internal class AuthServiceImpl : AuthService {
         firebaseAuth.addAuthStateListener(listener)
     }
 
-    override fun createUser(email: String, password: String, listener: AuthService.AuthActionListener) {
-        firebaseAuth.createUserWithEmailAndPassword(email, password)
-                .addOnSuccessListener { listener.actionSuccessful("Account created") }
-                .addOnFailureListener { exception ->
-                    listener.actionFailed(exception.message ?: "Unable to create account")
-                }
+    override suspend fun createUser(email: String, password: String) {
+        firebaseAuth.createUserWithEmailAndPassword(email, password).await()
     }
 
-    override fun signIn(email: String, password: String, listener: AuthService.AuthActionListener) {
-        firebaseAuth.signInWithEmailAndPassword(email, password)
-                .addOnSuccessListener { listener.actionSuccessful(it.user.uid) }
-                .addOnFailureListener { exception ->
-                    listener.actionFailed(exception.message ?: "Unable to sign in")
-                }
+    override suspend fun signIn(email: String, password: String): String {
+        return firebaseAuth.signInWithEmailAndPassword(email, password).await().user.uid
     }
 
-    override fun sendPasswordResetEmail(email: String, listener: AuthService.AuthActionListener) {
-        firebaseAuth.sendPasswordResetEmail(email)
-                .addOnSuccessListener { listener.actionSuccessful("Password reset email sent") }
-                .addOnFailureListener { exception ->
-                    listener.actionFailed(exception.message ?: "Unable to send email")
-                }
+    override suspend fun sendPasswordResetEmail(email: String) {
+        firebaseAuth.sendPasswordResetEmail(email).await()
     }
 
-    override fun setUserDisplayName(name: String, listener: AuthService.AuthActionListener) {
+    override suspend fun setUserDisplayName(name: String) {
         val profileUpdate = UserProfileChangeRequest.Builder().setDisplayName(name).build()
-
-        firebaseAuth.currentUser?.updateProfile(profileUpdate)
-                ?.addOnSuccessListener { listener.actionSuccessful("User's name set") }
-                ?.addOnFailureListener { exception ->
-                    listener.actionFailed(exception.message ?: "Unable to update name")
-                }
+        firebaseAuth.currentUser?.updateProfile(profileUpdate)?.await()
     }
 
     override fun getCurrentUser(): AuthUser {

justjavastaff/src/main/java/com/marknkamau/justjavastaff/ui/login/LogInActivity.kt

@@ -13,6 +13,7 @@ import com.marknkamau.justjavastaff.R
 import com.marknkamau.justjavastaff.ui.main.MainActivity
 
 import kotlinx.android.synthetic.main.activity_log_in.*
+import kotlinx.coroutines.Dispatchers
 
 class LogInActivity : AppCompatActivity(), LoginView, View.OnClickListener {
 
@@ -31,12 +32,17 @@ class LogInActivity : AppCompatActivity(), LoginView, View.OnClickListener {
             finish()
         }
 
-        presenter = LoginPresenter(auth, this)
+        presenter = LoginPresenter(auth, this, Dispatchers.Main)
 
         btnLogIn.setOnClickListener(this)
         imgVisibility.setOnClickListener(this)
     }
 
+    override fun onStop() {
+        super.onStop()
+        presenter.cancel()
+    }
+
     override fun onClick(view: View) {
         when (view.id) {
             R.id.imgVisibility -> if (passVisible) {