Use properly fallback provider name

GetStream · Jul 24, 2023 · 65b5b20 · 65b5b20
1 parent 99c6292
commit 65b5b20
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 33 deletions.
diff --git a/stream-android-push-firebase/api/stream-android-push-firebase.api b/stream-android-push-firebase/api/stream-android-push-firebase.api
@@ -10,7 +10,6 @@ public final class io/getstream/android/push/firebase/FirebaseMessagingDelegate
 	public static final field INSTANCE Lio/getstream/android/push/firebase/FirebaseMessagingDelegate;
 	public static final fun handleRemoteMessage (Lcom/google/firebase/messaging/RemoteMessage;)Z
 	public static final fun registerFirebaseToken (Ljava/lang/String;Ljava/lang/String;)V
-	public static synthetic fun registerFirebaseToken$default (Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)V
 }
 
 public final class io/getstream/android/push/firebase/FirebasePushDeviceGenerator : io/getstream/android/push/PushDeviceGenerator {

diff --git a/...firebase/src/main/java/io/getstream/android/push/firebase/ChatFirebaseMessagingService.kt b/...firebase/src/main/java/io/getstream/android/push/firebase/ChatFirebaseMessagingService.kt
@@ -36,7 +36,7 @@ internal class ChatFirebaseMessagingService : FirebaseMessagingService() {
 
     override fun onNewToken(token: String) {
         try {
-            FirebaseMessagingDelegate.registerFirebaseToken(token)
+            FirebaseMessagingDelegate.registerFirebaseToken(token, "")
         } catch (exception: IllegalStateException) {
             logger.e(exception) { "[onFirebaseNewToken] error while registering Firebase Token" }
         }

diff --git a/...sh-firebase/src/main/java/io/getstream/android/push/firebase/FirebaseMessagingDelegate.kt b/...sh-firebase/src/main/java/io/getstream/android/push/firebase/FirebaseMessagingDelegate.kt
@@ -26,7 +26,7 @@ import io.getstream.android.push.delegate.PushDelegateProvider
  */
 public object FirebaseMessagingDelegate {
 
-    internal lateinit var fallbackProviderName: String
+    internal var fallbackProviderName: String? = null
 
     /**
      * Handles [remoteMessage] from Firebase.
@@ -45,18 +45,23 @@ public object FirebaseMessagingDelegate {
      * Register new Firebase Token.
      *
      * @param token provided by Firebase.
-     * @param providerName Optional name for the provider name.
+     * @param providerName The provider name.
      */
     @JvmStatic
     public fun registerFirebaseToken(
         token: String,
-        providerName: String = fallbackProviderName,
+        providerName: String,
     ) {
-        val pushDevice = PushDevice(
-            token = token,
-            pushProvider = PushProvider.FIREBASE,
-            providerName = providerName,
-        )
-        PushDelegateProvider.delegates.forEach { it.registerPushDevice(pushDevice) }
+        (providerName.takeUnless { it.isBlank() } ?: fallbackProviderName)
+            ?.let {
+                PushDevice(
+                    token = token,
+                    pushProvider = PushProvider.FIREBASE,
+                    providerName = it,
+                )
+            }
+            ?.let {
+                PushDelegateProvider.delegates.forEach { delegate -> delegate.registerPushDevice(it) }
+            }
     }
 }
diff --git a/stream-android-push-huawei/api/stream-android-push-huawei.api b/stream-android-push-huawei/api/stream-android-push-huawei.api
@@ -9,7 +9,6 @@ public final class io/getstream/android/push/huawei/HuaweiMessagingDelegate {
 	public static final field INSTANCE Lio/getstream/android/push/huawei/HuaweiMessagingDelegate;
 	public static final fun handleRemoteMessage (Lcom/huawei/hms/push/RemoteMessage;)Z
 	public static final fun registerHuaweiToken (Ljava/lang/String;Ljava/lang/String;)V
-	public static synthetic fun registerHuaweiToken$default (Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)V
 }
 
 public final class io/getstream/android/push/huawei/HuaweiPushDeviceGenerator : io/getstream/android/push/PushDeviceGenerator {

diff --git a/...-push-huawei/src/main/java/io/getstream/android/push/huawei/ChatHuaweiMessagingService.kt b/...-push-huawei/src/main/java/io/getstream/android/push/huawei/ChatHuaweiMessagingService.kt
@@ -36,7 +36,7 @@ internal class ChatHuaweiMessagingService : HmsMessageService() {
 
     override fun onNewToken(token: String) {
         try {
-            HuaweiMessagingDelegate.registerHuaweiToken(token)
+            HuaweiMessagingDelegate.registerHuaweiToken(token, "")
         } catch (exception: IllegalStateException) {
             logger.e(exception) { "[onHuaweiNewToken] error while registering Huawei Token" }
         }

diff --git a/...oid-push-huawei/src/main/java/io/getstream/android/push/huawei/HuaweiMessagingDelegate.kt b/...oid-push-huawei/src/main/java/io/getstream/android/push/huawei/HuaweiMessagingDelegate.kt
@@ -27,7 +27,7 @@ import kotlin.jvm.Throws
  */
 public object HuaweiMessagingDelegate {
 
-    internal lateinit var fallbackProviderName: String
+    internal var fallbackProviderName: String? = null
 
     /**
      * Handles [remoteMessage] from Huawei.
@@ -47,19 +47,24 @@ public object HuaweiMessagingDelegate {
      * Register new Huawei Token.
      *
      * @param token provided by Huawei.
-     * @param providerName Optional name for the provider name.
+     * @param providerName The provider name.
      */
     @Throws(IllegalStateException::class)
     @JvmStatic
     public fun registerHuaweiToken(
         token: String,
-        providerName: String = fallbackProviderName,
+        providerName: String,
     ) {
-        val pushDevice = PushDevice(
-            token = token,
-            pushProvider = PushProvider.HUAWEI,
-            providerName = providerName,
-        )
-        PushDelegateProvider.delegates.forEach { it.registerPushDevice(pushDevice) }
+        (providerName.takeUnless { it.isBlank() } ?: fallbackProviderName)
+            ?.let {
+                PushDevice(
+                    token = token,
+                    pushProvider = PushProvider.HUAWEI,
+                    providerName = it,
+                )
+            }
+            ?.let {
+                PushDelegateProvider.delegates.forEach { delegate -> delegate.registerPushDevice(it) }
+            }
     }
 }
diff --git a/stream-android-push-xiaomi/api/stream-android-push-xiaomi.api b/stream-android-push-xiaomi/api/stream-android-push-xiaomi.api
@@ -15,7 +15,6 @@ public final class io/getstream/android/push/xiaomi/XiaomiMessagingDelegate {
 	public static final field INSTANCE Lio/getstream/android/push/xiaomi/XiaomiMessagingDelegate;
 	public static final fun handleMiPushMessage (Lcom/xiaomi/mipush/sdk/MiPushMessage;)Z
 	public static final fun registerXiaomiToken (Lcom/xiaomi/mipush/sdk/MiPushCommandMessage;Ljava/lang/String;)V
-	public static synthetic fun registerXiaomiToken$default (Lcom/xiaomi/mipush/sdk/MiPushCommandMessage;Ljava/lang/String;ILjava/lang/Object;)V
 }
 
 public final class io/getstream/android/push/xiaomi/XiaomiPushDeviceGenerator : io/getstream/android/push/PushDeviceGenerator {

diff --git a/...push-xiaomi/src/main/java/io/getstream/android/push/xiaomi/ChatXiaomiMessagingReceiver.kt b/...push-xiaomi/src/main/java/io/getstream/android/push/xiaomi/ChatXiaomiMessagingReceiver.kt
@@ -52,7 +52,7 @@ public class ChatXiaomiMessagingReceiver : PushMessageReceiver() {
     override fun onReceiveRegisterResult(context: Context, miPushCommandMessage: MiPushCommandMessage) {
         logger.d { "[onReceiveXiaomiRegisterResult] miPushCommandMessage: $miPushCommandMessage" }
         try {
-            XiaomiMessagingDelegate.registerXiaomiToken(miPushCommandMessage)
+            XiaomiMessagingDelegate.registerXiaomiToken(miPushCommandMessage, "")
         } catch (exception: IllegalStateException) {
             logger.e(exception) { "[onReceiveRegisterResult] error while registering Xiaomi Token" }
         }

diff --git a/...oid-push-xiaomi/src/main/java/io/getstream/android/push/xiaomi/XiaomiMessagingDelegate.kt b/...oid-push-xiaomi/src/main/java/io/getstream/android/push/xiaomi/XiaomiMessagingDelegate.kt
@@ -31,7 +31,7 @@ import io.getstream.android.push.delegate.PushDelegateProvider
  */
 public object XiaomiMessagingDelegate {
 
-    internal lateinit var fallbackProviderName: String
+    internal var fallbackProviderName: String? = null
 
     private val mapAdapter: JsonAdapter<MutableMap<String, String>> by lazy {
         Moshi.Builder()
@@ -56,24 +56,29 @@ public object XiaomiMessagingDelegate {
      * Register new Xiaomi Token.
      *
      * @param miPushCommandMessage provided by Xiaomi.
-     * @param providerName Optional name for the provider name.
+     * @param providerName The provider name.
      */
     @JvmStatic
     public fun registerXiaomiToken(
         miPushCommandMessage: MiPushCommandMessage,
-        providerName: String = fallbackProviderName,
+        providerName: String,
     ) {
         miPushCommandMessage
             .takeIf { it.command == MiPushClient.COMMAND_REGISTER }
             ?.commandArguments
             ?.get(0)
             ?.run {
-                val pushDevice = PushDevice(
-                    token = this,
-                    pushProvider = PushProvider.XIAOMI,
-                    providerName = providerName,
-                )
-                PushDelegateProvider.delegates.forEach { it.registerPushDevice(pushDevice) }
+                (providerName.takeUnless { it.isBlank() } ?: fallbackProviderName)
+                    ?.let {
+                        PushDevice(
+                            token = this,
+                            pushProvider = PushProvider.XIAOMI,
+                            providerName = it,
+                        )
+                    }
+                    ?.let {
+                        PushDelegateProvider.delegates.forEach { delegate -> delegate.registerPushDevice(it) }
+                    }
             }
     }