From 2d664c423d54e09f3b915ec4dda2ffd0f6cda13c Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 2 Mar 2021 16:21:40 +0100
Subject: [PATCH] Simplify code

---
 .../fcm/VectorFirebaseMessagingService.kt     | 26 ++++++-------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt b/vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
index cfd241d4f9..4d2cbecfe4 100755
--- a/vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
+++ b/vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
@@ -253,25 +253,15 @@ class VectorFirebaseMessagingService : FirebaseMessagingService() {
      * Try to create an event from the FCM data
      *
      * @param data the FCM data
-     * @return the event
+     * @return the event or null if required data are missing
      */
     private fun parseEvent(data: Map<String, String>?): Event? {
-        // accept only event with room id.
-        if (null == data || !data.containsKey("room_id") || !data.containsKey("event_id")) {
-            return null
-        }
-
-        try {
-            return Event(eventId = data["event_id"],
-                    senderId = data["sender"],
-                    roomId = data["room_id"],
-                    type = data.getValue("type"),
-                    // TODO content = data.getValue("content"),
-                    originServerTs = System.currentTimeMillis())
-        } catch (e: Exception) {
-            Timber.e(e, "buildEvent fails ")
-        }
-
-        return null
+        return Event(
+                eventId = data?.get("event_id") ?: return null,
+                senderId = data["sender"],
+                roomId = data["room_id"] ?: return null,
+                type = data["type"] ?: return null,
+                originServerTs = System.currentTimeMillis()
+        )
     }
 }