From 3ffe09638063e0823f82fa6db87870600fc3e40d Mon Sep 17 00:00:00 2001
From: sim <git@sgougeon.fr>
Date: Thu, 1 Sep 2022 21:07:59 +0200
Subject: [PATCH] Always use FirebaseMessaging instance to get fcmToken

---
 .../EmbeddedDistributorReceiver.kt                 |  6 ------
 .../android/foss_embedded_fcm_distributor/Utils.kt | 14 ++------------
 .../fcm/FirebaseReceiver.kt                        |  8 +++-----
 3 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/lib/src/main/java/org/unifiedpush/android/foss_embedded_fcm_distributor/EmbeddedDistributorReceiver.kt b/lib/src/main/java/org/unifiedpush/android/foss_embedded_fcm_distributor/EmbeddedDistributorReceiver.kt
index 4ab157d..7a31fcf 100644
--- a/lib/src/main/java/org/unifiedpush/android/foss_embedded_fcm_distributor/EmbeddedDistributorReceiver.kt
+++ b/lib/src/main/java/org/unifiedpush/android/foss_embedded_fcm_distributor/EmbeddedDistributorReceiver.kt
@@ -5,10 +5,8 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.util.Log
-import org.unifiedpush.android.foss_embedded_fcm_distributor.Utils.getFCMToken
 import org.unifiedpush.android.foss_embedded_fcm_distributor.Utils.removeToken
 import org.unifiedpush.android.foss_embedded_fcm_distributor.Utils.saveToken
-import org.unifiedpush.android.foss_embedded_fcm_distributor.Utils.sendNewEndpoint
 
 private const val TAG = "UP-Embedded_distributor"
 
@@ -27,10 +25,6 @@ open class EmbeddedDistributorReceiver : BroadcastReceiver() {
                 Log.d(TAG, "Registering to the embedded distributor")
                 saveGetEndpoint(context)
                 saveToken(context, token)
-                getFCMToken(context)?.let {
-                    sendNewEndpoint(context, it, token)
-                    return
-                }
                 registerFCM(context)
             }
             ACTION_UNREGISTER -> {
diff --git a/lib/src/main/java/org/unifiedpush/android/foss_embedded_fcm_distributor/Utils.kt b/lib/src/main/java/org/unifiedpush/android/foss_embedded_fcm_distributor/Utils.kt
index cc33172..01f77b6 100644
--- a/lib/src/main/java/org/unifiedpush/android/foss_embedded_fcm_distributor/Utils.kt
+++ b/lib/src/main/java/org/unifiedpush/android/foss_embedded_fcm_distributor/Utils.kt
@@ -4,16 +4,6 @@ import android.content.Context
 import android.content.Intent
 
 object Utils {
-    fun getFCMToken(context: Context): String? {
-        val prefs = context.getSharedPreferences(PREF_MASTER, Context.MODE_PRIVATE)
-        return prefs.getString(EXTRA_FCM_TOKEN, null)
-    }
-
-    fun saveFCMToken(context: Context, token: String) {
-        val prefs = context.getSharedPreferences(PREF_MASTER, Context.MODE_PRIVATE)
-        prefs.edit().putString(EXTRA_FCM_TOKEN, token).commit()
-    }
-
     fun getTokens(context: Context): MutableSet<String> {
         val prefs = context.getSharedPreferences(PREF_MASTER, Context.MODE_PRIVATE)
         return prefs.getStringSet(PREF_MASTER_TOKENS, null)
@@ -25,7 +15,7 @@ object Utils {
         if (!tokens.contains(token)) {
             tokens.add(token)
             val prefs = context.getSharedPreferences(PREF_MASTER, Context.MODE_PRIVATE)
-            prefs.edit().putStringSet(PREF_MASTER_TOKENS, tokens).commit()
+            prefs.edit().putStringSet(PREF_MASTER_TOKENS, tokens).apply()
         }
     }
 
@@ -34,7 +24,7 @@ object Utils {
         if (tokens.contains(token)) {
             tokens.remove(token)
             val prefs = context.getSharedPreferences(PREF_MASTER, Context.MODE_PRIVATE)
-            prefs.edit().putStringSet(PREF_MASTER_TOKENS, tokens).commit()
+            prefs.edit().putStringSet(PREF_MASTER_TOKENS, tokens).apply()
         }
     }
 
diff --git a/lib/src/main/java/org/unifiedpush/android/foss_embedded_fcm_distributor/fcm/FirebaseReceiver.kt b/lib/src/main/java/org/unifiedpush/android/foss_embedded_fcm_distributor/fcm/FirebaseReceiver.kt
index f7b4a9c..6232d30 100644
--- a/lib/src/main/java/org/unifiedpush/android/foss_embedded_fcm_distributor/fcm/FirebaseReceiver.kt
+++ b/lib/src/main/java/org/unifiedpush/android/foss_embedded_fcm_distributor/fcm/FirebaseReceiver.kt
@@ -9,7 +9,6 @@ import android.util.Log
 import org.json.JSONObject
 import org.unifiedpush.android.foss_embedded_fcm_distributor.*
 import org.unifiedpush.android.foss_embedded_fcm_distributor.Utils.getTokens
-import org.unifiedpush.android.foss_embedded_fcm_distributor.Utils.saveFCMToken
 import org.unifiedpush.android.foss_embedded_fcm_distributor.Utils.sendNewEndpoint
 import java.util.Timer
 import kotlin.collections.HashMap
@@ -38,11 +37,10 @@ class FirebaseReceiver : BroadcastReceiver() {
         return map
     }
 
-    private fun onNewToken(context: Context, FCMToken: String) {
-        Log.d(TAG, "New FCM token: $FCMToken")
-        saveFCMToken(context, FCMToken)
+    private fun onNewToken(context: Context, fcmToken: String) {
+        Log.d(TAG, "New FCM token: $fcmToken")
         getTokens(context).forEach {
-            sendNewEndpoint(context, FCMToken, it)
+            sendNewEndpoint(context, fcmToken, it)
         }
     }