NP-1197 fix listener & token issue

Author: Al-Taie

app/src/main/java/com/gateway/gms/MainActivity.kt

@@ -1,7 +1,7 @@
 package com.gateway.gms
 
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.gateway.gms.domain.interfaces.CloudMessagingServiceListener
 import com.google.firebase.messaging.RemoteMessage
 import kotlinx.coroutines.CoroutineScope
@@ -13,15 +13,17 @@ class MainActivity : AppCompatActivity(), CloudMessagingServiceListener {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
-        val gmsManager = GMSManager(this, this)
+
+        val gmsManager = GMSManager(context = this, listener = null)
+
         CoroutineScope(Dispatchers.IO).launch{
             with(gmsManager) {
                 this.subscribeToTopic("Technology").collect {
                     Timber.d(it.toString().substringAfter('$'))
                 }
             }
         }
-        Timber.d(gmsManager.token)
+        gmsManager.setListener(this)
     }
 
     override fun onMessageReceived(message: RemoteMessage) {

gms/src/main/java/com/gateway/gms/GMSManager.kt

@@ -1,16 +1,22 @@
 package com.gateway.gms
 
 import android.content.Context
+import com.gateway.gms.data.GMSConfigurations
 import com.gateway.gms.di.GMSInitializer
 import com.gateway.gms.domain.interfaces.CloudMessagingRepository
 import com.gateway.gms.domain.interfaces.CloudMessagingServiceListener
 
 class GMSManager(
     context: Context,
-    var listener: CloudMessagingServiceListener? = null
+    listener: CloudMessagingServiceListener? = null
 ) : CloudMessagingRepository {
+
     private val gms: GMSInitializer = GMSInitializer(context, listener)
 
+    fun setListener(listener: CloudMessagingServiceListener? = null) {
+        GMSConfigurations.listener = listener
+    }
+
     override fun subscribeToTopic(topic: String) =
         gms.repository.subscribeToTopic(topic)
 

gms/src/main/java/com/gateway/gms/data/CloudMessagingRepositoryImpl.kt

@@ -6,8 +6,9 @@ import com.gateway.gms.domain.models.Resource
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
 
-internal class CloudMessagingRepositoryImpl(private val service: CloudMessagingService) :
+internal class CloudMessagingRepositoryImpl(val service: CloudMessagingService) :
     CloudMessagingRepository {
+
     override fun subscribeToTopic(topic: String): Flow<Resource<Void>> =
         wrapWithFlow { service.subscribeToTopic(topic = topic) }
 

gms/src/main/java/com/gateway/gms/data/GMSConfigurations.kt

@@ -0,0 +1,9 @@
+package com.gateway.gms.data
+
+import android.content.SharedPreferences
+import com.gateway.gms.domain.interfaces.CloudMessagingServiceListener
+
+internal object GMSConfigurations {
+    var listener: CloudMessagingServiceListener? = null
+    var sharedPreferences: SharedPreferences? = null
+}

gms/src/main/java/com/gateway/gms/data/GoogleService.kt

@@ -8,12 +8,14 @@ import com.gateway.gms.utils.Constants
 import com.google.firebase.messaging.FirebaseMessaging
 import com.google.firebase.messaging.FirebaseMessagingService
 import com.google.firebase.messaging.RemoteMessage
-import timber.log.Timber
 
 class GoogleService : CloudMessagingService, FirebaseMessagingService() {
     lateinit var messaging: FirebaseMessaging
-    override var listener: CloudMessagingServiceListener? = null
-    var sharedPreferences: SharedPreferences? = null
+    private val listener: CloudMessagingServiceListener?
+        get() = GMSConfigurations.listener
+
+    private val sharedPreferences: SharedPreferences?
+        get() = GMSConfigurations.sharedPreferences
 
     override fun subscribeToTopic(topic: String) =
         safeTaskCall { MessagingTask.Google(messaging.subscribeToTopic(topic)) }
@@ -29,15 +31,14 @@ class GoogleService : CloudMessagingService, FirebaseMessagingService() {
     override fun onMessageReceived(message: RemoteMessage) {
         super.onMessageReceived(message)
         listener?.onMessageReceived(message = message)
-        Timber.d(message.toString())
     }
 
     override fun onNewToken(token: String) {
         super.onNewToken(token)
         listener?.onNewToken(token = token)
-        Timber.d(token)
-        with(sharedPreferences?.edit()) {
-            this?.putString(Constants.SharedPref.TOKEN, token)
+        sharedPreferences?.edit()?.run {
+            putString(Constants.SharedPref.TOKEN, token)
+            apply()
         }
     }
 }

gms/src/main/java/com/gateway/gms/data/HuaweiService.kt

@@ -13,8 +13,12 @@ import com.huawei.hms.push.RemoteMessage
 
 class HuaweiService : CloudMessagingService, HmsMessageService() {
     lateinit var messaging: HmsMessaging
-    override var listener: CloudMessagingServiceListener? = null
-    var sharedPreferences: SharedPreferences? = null
+
+    private val listener: CloudMessagingServiceListener?
+        get() = GMSConfigurations.listener
+
+    private val sharedPreferences: SharedPreferences?
+        get() = GMSConfigurations.sharedPreferences
 
     override fun subscribeToTopic(topic: String) =
         safeTaskCall { MessagingTask.Huawei(messaging.subscribe(topic)) }
@@ -36,8 +40,9 @@ class HuaweiService : CloudMessagingService, HmsMessageService() {
     override fun onNewToken(p0: String?) {
         super.onNewToken(p0)
         listener?.onNewToken(token = p0.toString())
-        with(sharedPreferences?.edit()) {
-            this?.putString(Constants.SharedPref.TOKEN, p0)
+        sharedPreferences?.edit()?.run {
+            putString(Constants.SharedPref.TOKEN, p0)
+            apply()
         }
     }
 }

gms/src/main/java/com/gateway/gms/data/NoneService.kt

@@ -1,8 +1,7 @@
 package com.gateway.gms.data
 
-import com.gateway.gms.domain.models.Resource
 import com.gateway.gms.domain.interfaces.CloudMessagingService
-import com.gateway.gms.domain.interfaces.CloudMessagingServiceListener
+import com.gateway.gms.domain.models.Resource
 import com.gateway.gms.domain.models.ServiceFailure
 
 
@@ -18,5 +17,4 @@ class NoneService : CloudMessagingService {
     override fun deleteToken(): Resource<Void> =
         Resource.Fail(error = ServiceFailure.ServiceNotDetected())
 
-    override var listener: CloudMessagingServiceListener? = null
 }

gms/src/main/java/com/gateway/gms/di/GMSInitializer.kt

@@ -9,19 +9,22 @@ import com.google.android.gms.common.ConnectionResult
 import com.google.firebase.FirebaseApp
 import timber.log.Timber
 
-internal class GMSInitializer(private val context: Context, private val listener: CloudMessagingServiceListener? = null) {
+internal class GMSInitializer(
+    context: Context,
+    listener: CloudMessagingServiceListener? = null
+) {
     var serviceProvider: Services = Services.None
     var isServicesAvailable: Boolean = false
     private var module: GMSModule
     val repository: CloudMessagingRepository
 
     init {
-        module = GMSModule(context = context)
-        prepareAvailability(module = module)
-        repository = provideCloudMessagingRepository(module)
+        module = GMSModule(context = context, listener = listener)
+        prepareAvailability(module = module, context = context)
+        repository = provideCloudMessagingRepository(module = module)
     }
 
-    private fun prepareAvailability(module: GMSModule) {
+    private fun prepareAvailability(module: GMSModule, context: Context) {
         isServicesAvailable = with(module) {
             when (ConnectionResult.SUCCESS) {
                 googleApiAvailability.isGooglePlayServicesAvailable(context) -> {
@@ -48,13 +51,9 @@ internal class GMSInitializer(private val context: Context, private val listener
             service = when (serviceProvider) {
                 is Services.Google -> GoogleService().apply {
                     messaging = module.googleService
-                    listener = this@GMSInitializer.listener
-                    sharedPreferences = module.sharedPreferences
-                }
+                    }
                 is Services.Huawei -> HuaweiService().apply {
                     messaging = module.huaweiService
-                    listener = this@GMSInitializer.listener
-                    sharedPreferences = module.sharedPreferences
                 }
                 else -> NoneService()
             }

gms/src/main/java/com/gateway/gms/di/GMSModule.kt

@@ -1,23 +1,30 @@
 package com.gateway.gms.di
 
 import android.content.Context
-import android.content.SharedPreferences
+import com.gateway.gms.data.GMSConfigurations
+import com.gateway.gms.domain.interfaces.CloudMessagingServiceListener
 import com.gateway.gms.utils.Constants
 import com.google.android.gms.common.GoogleApiAvailability
 import com.google.firebase.messaging.FirebaseMessaging
 import com.huawei.hms.api.HuaweiApiAvailability
 import com.huawei.hms.push.HmsMessaging
 
-internal class GMSModule(private val context: Context) {
+internal class GMSModule(context: Context, listener: CloudMessagingServiceListener?) {
     val googleService: FirebaseMessaging by lazy { FirebaseMessaging.getInstance() }
     val huaweiService: HmsMessaging by lazy { HmsMessaging.getInstance(context) }
     val googleApiAvailability: GoogleApiAvailability by lazy { provideGoogleApiAvailability() }
     val huaweiApiAvailability: HuaweiApiAvailability by lazy { provideHuaweiApiAvailability() }
-    val sharedPreferences: SharedPreferences by lazy { provideSharedPref() }
+
+    init {
+        GMSConfigurations.apply {
+            this.listener = listener
+            this.sharedPreferences = provideSharedPref(context)
+        }
+    }
 
     private fun provideGoogleApiAvailability() = GoogleApiAvailability.getInstance()
     private fun provideHuaweiApiAvailability() = HuaweiApiAvailability.getInstance()
 
-    private fun provideSharedPref() =
+    private fun provideSharedPref(context: Context) =
         context.getSharedPreferences(Constants.SharedPref.FILE_KEY, Context.MODE_PRIVATE)
 }

gms/src/main/java/com/gateway/gms/domain/interfaces/CloudMessagingService.kt

@@ -13,8 +13,6 @@ interface CloudMessagingService {
     fun getToken(): String?
     fun deleteToken(): Resource<Void>
 
-    var listener: CloudMessagingServiceListener?
-
     fun <T> safeTaskCall(block: () -> MessagingTask<T>) = catchTaskError(block())
 
     private fun <T> catchTaskError(block: MessagingTask<T>) =