Fix incorrect presenter

Author: MarkNjunge

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

@@ -4,6 +4,8 @@ import com.marknkamau.justjava.data.local.PreferencesRepository
 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 timber.log.Timber
 
 internal class LogInPresenter(private val activityView: LogInView,
                               private val preferences: PreferencesRepository,
@@ -21,6 +23,7 @@ internal class LogInPresenter(private val activityView: LogInView,
         auth.signIn(email, password, object : AuthService.AuthActionListener {
             override fun actionSuccessful(response: String) {
                 getUserDefaults(response)
+                setFcmToken()
             }
 
             override fun actionFailed(response: String) {
@@ -44,6 +47,19 @@ internal class LogInPresenter(private val activityView: LogInView,
         })
     }
 
+    private fun setFcmToken() {
+        database.updateUserFcmToken(auth.getCurrentUser().userId, object : WriteListener {
+            override fun onError(reason: String) {
+                Timber.e(reason)
+            }
+
+            override fun onSuccess() {
+                Timber.i("FCM token saved")
+            }
+        })
+    }
+
+
     fun resetUserPassword(email: String) {
         auth.sendPasswordResetEmail(email, object : AuthService.AuthActionListener {
             override fun actionSuccessful(response: String) {

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

@@ -24,6 +24,7 @@ class LogInActivity : AppCompatActivity(), LoginView, View.OnClickListener {
         setContentView(R.layout.activity_log_in)
 
         val auth = (application as JustJavaStaffApp).auth
+        val db = (application as JustJavaStaffApp).databaseService
 
         if (auth.isSignedIn()) {
             startActivity(Intent(this@LogInActivity, MainActivity::class.java))

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

@@ -1,9 +1,6 @@
 package com.marknkamau.justjavastaff.ui.login
 
 import com.marknjunge.core.auth.AuthService
-import com.marknjunge.core.data.firebase.ClientDatabaseService
-import com.marknjunge.core.data.firebase.WriteListener
-import timber.log.Timber
 import java.util.regex.Pattern
 
 /**
@@ -12,7 +9,7 @@ import java.util.regex.Pattern
  * https://github.com/MarkNjunge
  */
 
-class LoginPresenter(private val auth: AuthService, private val databaseService: ClientDatabaseService,private val view: LoginView) {
+class LoginPresenter(private val auth: AuthService, private val view: LoginView) {
 
     fun signIn(email: String, password: String) {
         val pattern = Pattern.compile("^([a-zA-Z0-9_.-])+@justjava.com+")
@@ -26,7 +23,6 @@ class LoginPresenter(private val auth: AuthService, private val databaseService:
         auth.signIn(email, password, object : AuthService.AuthActionListener {
             override fun actionSuccessful(response: String) {
                 view.onSignedIn()
-                setFcmToken()
             }
 
             override fun actionFailed(response: String) {
@@ -35,16 +31,4 @@ class LoginPresenter(private val auth: AuthService, private val databaseService:
         })
     }
 
-    private fun setFcmToken(){
-        databaseService.updateUserFcmToken(auth.getCurrentUser().userId, object : WriteListener {
-            override fun onError(reason: String) {
-                Timber.e(reason)
-            }
-
-            override fun onSuccess() {
-                Timber.i("FCM token saved")
-            }
-        })
-    }
-
 }