Master

app/build.gradle

@@ -36,8 +36,8 @@ android {
         applicationId "com.ncs.o2"
         minSdk 26
         targetSdkVersion 34
-        versionCode 14
-        versionName "24.2.14"
+        versionCode 15
+        versionName "24.2.15"
         multiDexEnabled true
 
 

app/src/main/java/com/ncs/o2/Api/MailApiService.kt

@@ -2,14 +2,24 @@ package com.ncs.o2.Api
 
 import com.google.gson.JsonObject
 import com.ncs.o2.Domain.Models.Mail
+import retrofit2.Call
 import retrofit2.Response
 import retrofit2.http.Body
 import retrofit2.http.Headers
 import retrofit2.http.POST
+import retrofit2.http.Query
 
 
 interface MailApiService {
     @Headers("Content-Type: application/json")
     @POST("/sendmail")
     suspend fun sendOnboardingMail(@Body payload: Mail): Response<JsonObject>
+
+
+    @POST("/send-msg-copy")
+    fun sendEmail(
+        @Query("message") message: String,
+        @Query("email") emailAddress: String
+    ): Response<JsonObject>
+
 }

app/src/main/java/com/ncs/o2/Api/NotificationApiService.kt

@@ -2,7 +2,6 @@ package com.ncs.o2.Api
 
 import com.google.gson.JsonObject
 import com.ncs.o2.BuildConfig
-import retrofit2.Call
 import retrofit2.Response
 
 import retrofit2.http.Body

app/src/main/java/com/ncs/o2/Domain/Repositories/FirebaseAuthRepository.kt

@@ -5,6 +5,8 @@ import com.google.firebase.auth.FirebaseUser
 import com.ncs.o2.Domain.Interfaces.AuthRepository
 import com.ncs.o2.Domain.Models.ServerResult
 import com.ncs.o2.Domain.Utility.FirebaseUtils.awaitt
+import kotlinx.coroutines.tasks.await
+import timber.log.Timber
 import javax.inject.Inject
 
 /*
@@ -27,7 +29,6 @@ Tasks FUTURE ADDITION :
 
 class FirebaseAuthRepository @Inject constructor(val firebaseAuth: FirebaseAuth) : AuthRepository {
 
-
     override val currentUser: FirebaseUser
         get() = firebaseAuth.currentUser!!
 
@@ -36,10 +37,15 @@ class FirebaseAuthRepository @Inject constructor(val firebaseAuth: FirebaseAuth)
         password: String
     ): ServerResult<FirebaseUser> {
 
+        Timber.tag("Auth Repository").d("Login try ${email} ${password}")
+
         return try {
-            val result = firebaseAuth.signInWithEmailAndPassword(email, password).awaitt()
+            val result = firebaseAuth.signInWithEmailAndPassword(email, password).await()
+            Timber.tag("Auth Repository").d("Login try - success ${result.user?.email}")
             ServerResult.Success(result.user!!)
+
         } catch (e: Exception) {
+            Timber.tag("Auth Repository").d("Login try - failure ${e.message}")
             e.printStackTrace()
             ServerResult.Failure(e)
         }

app/src/main/java/com/ncs/o2/Domain/Utility/NotificationsUtils.kt

@@ -9,13 +9,10 @@ import androidx.work.NetworkType
 import androidx.work.OneTimeWorkRequestBuilder
 import androidx.work.WorkManager
 import com.google.firebase.auth.FirebaseAuth
-import com.google.firebase.messaging.FirebaseMessaging
-import com.google.firebase.messaging.RemoteMessage
 import com.google.gson.JsonObject
 import com.ncs.o2.Constants.NotificationType
 import com.ncs.o2.Domain.Models.Notification
-import com.ncs.o2.Domain.Workers.FCMWorker
-import org.json.JSONObject
+import com.ncs.o2.Domain.Workers.NotificationsFCMWorker
 import com.ncs.versa.Constants.Endpoints.Notifications as N
 import java.util.concurrent.TimeUnit
 
@@ -51,14 +48,14 @@ object NotificationsUtils {
             val payloadJsonObject = buildNotificationPayload(fcmToken, notification)
             payloadJsonObject?.let {
                 val payloadInputData = Data.Builder()
-                    .putString(FCMWorker.PAYLOAD_DATA, payloadJsonObject.toString())
+                    .putString(NotificationsFCMWorker.PAYLOAD_DATA, payloadJsonObject.toString())
                     .build()
 
                 val contraints = Constraints.Builder()
                     .setRequiredNetworkType(NetworkType.CONNECTED)
                     .build()
 
-                val workRequest = OneTimeWorkRequestBuilder<FCMWorker>()
+                val workRequest = OneTimeWorkRequestBuilder<NotificationsFCMWorker>()
                     .setConstraints(contraints)
                     .setBackoffCriteria(BackoffPolicy.LINEAR, 500L, TimeUnit.MICROSECONDS)
                     .setInputData(payloadInputData)
@@ -74,14 +71,14 @@ object NotificationsUtils {
         val payloadJsonObject = buildNotificationPayloadForTopic(topic, notification)
         payloadJsonObject?.let {
             val payloadInputData = Data.Builder()
-                .putString(FCMWorker.PAYLOAD_DATA, payloadJsonObject.toString())
+                .putString(NotificationsFCMWorker.PAYLOAD_DATA, payloadJsonObject.toString())
                 .build()
 
             val constraints = Constraints.Builder()
                 .setRequiredNetworkType(NetworkType.CONNECTED)
                 .build()
 
-            val workRequest = OneTimeWorkRequestBuilder<FCMWorker>()
+            val workRequest = OneTimeWorkRequestBuilder<NotificationsFCMWorker>()
                 .setConstraints(constraints)
                 .setBackoffCriteria(BackoffPolicy.LINEAR, 500L, TimeUnit.MICROSECONDS)
                 .setInputData(payloadInputData)

app/src/main/java/com/ncs/o2/Domain/Workers/FCMWorker.kt → app/src/main/java/com/ncs/o2/Domain/Workers/NotificationsFCMWorker.kt

@@ -40,7 +40,7 @@ Tasks FUTURE ADDITION :
 */
 
 @HiltWorker
-class FCMWorker @AssistedInject constructor(
+class NotificationsFCMWorker @AssistedInject constructor(
     @Assisted context: Context,
     @Assisted workerParameters: WorkerParameters,
     @Assisted val notificationApiService: NotificationApiService,

app/src/main/java/com/ncs/o2/O2Application.kt

@@ -4,12 +4,10 @@ import android.app.Activity
 import android.app.ActivityManager
 import android.app.Application
 import android.content.Context
-import android.hardware.SensorManager
 import android.os.Bundle
 import android.os.Looper
 import android.util.Log
 import android.view.View
-import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.fragment.app.FragmentManager
@@ -26,17 +24,14 @@ import com.google.firebase.messaging.FirebaseMessaging
 import com.ncs.o2.Domain.Models.ServerResult
 import com.ncs.o2.Domain.Utility.FirebaseRepository
 import com.ncs.o2.Domain.Utility.NotificationsUtils
-import com.ncs.o2.Domain.Workers.FCMWorker
+import com.ncs.o2.Domain.Workers.NotificationsFCMWorker
 import com.ncs.o2.HelperClasses.PrefManager
 import com.ncs.o2.Api.NotificationApiService
-import com.ncs.o2.Domain.Utility.ExtensionsUtil.gone
-import com.ncs.o2.Domain.Utility.GlobalUtils
 import com.ncs.o2.HelperClasses.CrashReporting.CrashMan
 import dagger.hilt.android.HiltAndroidApp
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import me.everything.android.ui.overscroll.OverScrollDecoratorHelper
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -297,7 +292,7 @@ class O2Application : Application(), Configuration.Provider, LifecycleEventObser
             workerClassName: String,
             workerParameters: WorkerParameters
         ): ListenableWorker
-        = FCMWorker(
+        = NotificationsFCMWorker(
             appContext,
             workerParameters,
             notificationApiService)

app/src/main/java/com/ncs/o2/UI/Auth/LoginScreen/LoginScreenFragment.kt

@@ -55,8 +55,11 @@ class LoginScreenFragment @Inject constructor() : Fragment() {
 
     companion object {
         fun newInstance() = LoginScreenFragment()
+        val TAG = "LoginScreenFragment"
     }
 
+
+
     @Inject
     lateinit var util : GlobalUtils.EasyElements
     private val viewModel: LoginScreenViewModel by viewModels()
@@ -75,70 +78,72 @@ class LoginScreenFragment @Inject constructor() : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+
         setUpViews()
         setUpValidation()
 
     }
 
 
     private fun setUpValidation() {
-        authResource = viewModel.loginLiveData
-        CoroutineScope(Dispatchers.Main).launch {
-            viewModel.validationEvents.collect { event ->
-                when (event) {
-                    LoginScreenViewModel.ValidationEvent.Success -> {
-                        //requireActivity().startActivity(Intent(requireContext(),MainActivity::class.java))
-                        authResource.let { liveData ->
-                            liveData.observe(viewLifecycleOwner) { result ->
-                                handleLoginResult(result)
-                            }
-                        }
-                    }
 
-                }
-            }
+        viewModel.loginLiveData.observe(viewLifecycleOwner){ result->
+            handleLoginResult(result)
         }
+
     }
 
     private fun handleLoginResult(result: ServerResult<FirebaseUser>?) {
+
+        Timber.tag(TAG)
+            .d("Received result : ${result.toString()}")
+
         when (result) {
             is ServerResult.Failure -> {
+
+                Timber.tag(TAG)
+                    .d("Failure ran: ${result.exception.message}")
+
                 binding.progressbar.gone()
                 binding.btnLogin.isEnabled = true
                 binding.btnLogin.isClickable = true
                 binding.btnLogin.text = getString(R.string.login)
+
                 Toast.makeText(
                     activity,
                     "Registration Failed : ${result.exception.message}",
                     Toast.LENGTH_SHORT
                 ).show()
 
-                Timber.tag(SignUpScreenFragment.TAG)
+                Timber.tag(TAG)
                     .d("Registration Failed : ${result.exception.message}")
 
             }
 
-            ServerResult.Progress -> {
-
+            is ServerResult.Progress -> {
 
                 binding.progressbar.visible()
                 binding.btnLogin.isEnabled = false
                 binding.btnLogin.isClickable = false
                 binding.btnLogin.text = getString(R.string.hold_on)
-
+                Timber.tag(TAG)
+                    .d("Progress Ran " )
 
             }
 
             is ServerResult.Success -> {
 
+                binding.progressbar.gone()
+
+                Timber.tag(TAG)
+                    .d("Success Ran ${FirebaseAuth.getInstance().currentUser?.email}" )
+
                 FirebaseFirestore.getInstance().collection("Users")
                     .document(FirebaseAuth.getInstance().currentUser?.email!!)
                     .get(Source.SERVER)
                     .addOnCompleteListener { task ->
                         if (task.isSuccessful) {
 
-
-
                             val document = task.result
                             if (document != null && document.exists()) {
 
@@ -177,6 +182,7 @@ class LoginScreenFragment @Inject constructor() : Fragment() {
                                                 }
                                             }
                                             val notification_timestamp=document.getLong("NOTIFICATION_LAST_SEEN")
+
                                             if (fcmToken == null) {
                                                 fcmToken { token->
                                                     fcmToken = token
@@ -186,7 +192,7 @@ class LoginScreenFragment @Inject constructor() : Fragment() {
 
                                                 initialize(requireContext())
                                                 setLastSeenTimeStamp(notification_timestamp!!)
-                                                setProjectTimeStamp(PrefManager.getcurrentProject(),notification_timestamp)
+                                                setProjectTimeStamp(getcurrentProject(),notification_timestamp)
                                                 setLatestNotificationTimeStamp(0)
                                                 setNotificationCount(0)
 
@@ -399,21 +405,22 @@ class LoginScreenFragment @Inject constructor() : Fragment() {
 
         setUpVisibilities()
 
+        viewModel.emailError.observe(requireActivity()) { error ->
+            binding.etEmail.error = error
+        }
+
+        viewModel.passwordError.observe(requireActivity()) { error ->
+            binding.etPass.error = error
+        }
+
+
         binding.forgotPassword.setOnClickThrottleBounceListener {
             findNavController().navigate(R.id.action_loginScreenFragment_to_resetPasswordFragment)
         }
 
         binding.signUp.setOnClickListener {
-            findNavController().navigate(R.id.action_loginScreenFragment_to_signUpScreenFragment)
-
-            viewModel.emailError.observe(requireActivity()) { error ->
-                binding.etEmail.error = error
-            }
-
-            viewModel.passwordError.observe(requireActivity()) { error ->
-                binding.etPass.error = error
-            }
 
+            findNavController().navigate(R.id.action_loginScreenFragment_to_signUpScreenFragment)
         }
 
 
@@ -422,8 +429,10 @@ class LoginScreenFragment @Inject constructor() : Fragment() {
         }
 
         binding.btnLogin.setOnClickThrottleBounceListener {
+
             val email = binding.etEmail.text.toString()
             val pass = binding.etPass.text.toString()
+
             viewModel.validateInput(
                 email = email,
                 password = pass