Add support for the FCMv1 format in push notifications (#1456)

app/src/main/java/com/x8bit/bitwarden/data/platform/manager/PushManager.kt

@@ -65,10 +65,17 @@ interface PushManager {
     val syncSendUpsertFlow: Flow<SyncSendUpsertData>
 
     /**
-     * Handles the necessary steps to take when a push notification with payload [data] is received.
+     * 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.
+     */
+    fun onMessageReceived(data: Map<String, String>)
+
     /**
      * Registers a [token] for the current user with Bitwarden's server if needed.
      */

app/src/main/java/com/x8bit/bitwarden/data/platform/manager/PushManagerImpl.kt

@@ -106,14 +106,34 @@ class PushManagerImpl @Inject constructor(
             .launchIn(unconfinedScope)
     }
 
-    @Suppress("LongMethod", "CyclomaticComplexMethod", "ReturnCount")
     override fun onMessageReceived(data: String) {
         val notification = try {
             json.decodeFromString<BitwardenNotification>(data)
         } catch (exception: IllegalArgumentException) {
             return
         }
+        onMessageReceived(notification)
+    }
 
+    @Suppress("ReturnCount")
+    override fun onMessageReceived(data: Map<String, String>) {
+        val type = data["type"] ?: return
+        val payload = data["payload"] ?: return
+        val notificationType = try {
+            json.decodeFromString<NotificationType>(string = type)
+        } catch (exception: IllegalArgumentException) {
+            return
+        }
+        val notification = BitwardenNotification(
+            contextId = data["contextId"],
+            notificationType = notificationType,
+            payload = payload,
+        )
+        onMessageReceived(notification)
+    }
+
+    @Suppress("LongMethod", "CyclomaticComplexMethod", "ReturnCount")
+    private fun onMessageReceived(notification: BitwardenNotification) {
         if (authDiskSource.uniqueAppId == notification.contextId) return
 
         val userId = activeUserId ?: return

app/src/standard/java/com/x8bit/bitwarden/data/push/BitwardenFirebaseMessagingService.kt

@@ -17,8 +17,10 @@ class BitwardenFirebaseMessagingService : FirebaseMessagingService() {
     lateinit var pushManager: PushManager
 
     override fun onMessageReceived(message: RemoteMessage) {
-        val data = message.data["data"] ?: return
-        pushManager.onMessageReceived(data)
+        message
+            .data["data"]
+            ?.let { pushManager.onMessageReceived(it) }
+            ?: pushManager.onMessageReceived(message.data)
     }
 
     override fun onNewToken(token: String) {