Remove legacy GCM notification support (#1464)

bitwarden · Jun 18, 2024 · 37a53d4 · 37a53d4
1 parent 3ea15e3
commit 37a53d4
Show file tree

Hide file tree

Showing 5 changed files with 98 additions and 797 deletions.
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/PushManager.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/PushManager.kt
@@ -65,14 +65,7 @@ interface PushManager {
     val syncSendUpsertFlow: Flow<SyncSendUpsertData>
 
     /**
-     * Handles the necessary steps to take when a push notification with a legacy FCM [data]
-     * payload is received.
-     */
-    fun onMessageReceived(data: String)
-
-    /**
-     * Handles the necessary steps to take when a push notification with FCM v1 payload is
-     * received.
+     * Handles the necessary steps to take when a push notification payload is received.
      */
     fun onMessageReceived(data: Map<String, String>)
 

diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/PushManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/PushManagerImpl.kt
@@ -107,11 +107,6 @@ class PushManagerImpl @Inject constructor(
             .launchIn(unconfinedScope)
     }
 
-    override fun onMessageReceived(data: String) {
-        val notification = json.decodeFromStringOrNull<BitwardenNotification>(data) ?: return
-        onMessageReceived(notification)
-    }
-
     override fun onMessageReceived(data: Map<String, String>) {
         val notificationType = data["type"]
             ?.let { json.decodeFromStringOrNull<NotificationType>(string = it) }

diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/model/BitwardenNotification.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/model/BitwardenNotification.kt
@@ -1,8 +1,5 @@
 package com.x8bit.bitwarden.data.platform.manager.model
 
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-
 /**
  * Represents a Bitwarden push notification.
  *
@@ -11,9 +8,8 @@ import kotlinx.serialization.Serializable
  * @property notificationType The type of notification.
  * @property payload Data associated with the push notification.
  */
-@Serializable
 data class BitwardenNotification(
-    @SerialName("contextId") val contextId: String?,
-    @SerialName("type") val notificationType: NotificationType,
-    @SerialName("payload") val payload: String,
+    val contextId: String?,
+    val notificationType: NotificationType,
+    val payload: String,
 )
diff --git a/app/src/standard/java/com/x8bit/bitwarden/data/push/BitwardenFirebaseMessagingService.kt b/app/src/standard/java/com/x8bit/bitwarden/data/push/BitwardenFirebaseMessagingService.kt
@@ -17,10 +17,7 @@ class BitwardenFirebaseMessagingService : FirebaseMessagingService() {
     lateinit var pushManager: PushManager
 
     override fun onMessageReceived(message: RemoteMessage) {
-        message
-            .data["data"]
-            ?.let { pushManager.onMessageReceived(it) }
-            ?: pushManager.onMessageReceived(message.data)
+        pushManager.onMessageReceived(message.data)
     }
 
     override fun onNewToken(token: String) {