Merge branch 'develop'

Author: Jeff Yanta

api/src/main/java/com/getcode/model/notifications/NotificationParser.kt

@@ -29,6 +29,8 @@ fun RemoteMessage.parse(): CodeNotification? {
         return null
     }
 
+    if (!type.isNotifiable()) return CodeNotification(type, "", MessageContent.Localized(""))
+
     val chatTitle = data[NOTIFICATION_TITLE_KEY].let {
         if (it == null) {
             Timber.e("$NOTIFICATION_TITLE_KEY unspecified")

app/src/main/java/com/getcode/notifications/CodePushMessagingService.kt

@@ -91,9 +91,11 @@ class CodePushMessagingService : FirebaseMessagingService(),
 
             if (notification != null) {
                 val (type, titleKey, messageContent) = notification
-                val title = titleKey.localizedStringByKey(resources) ?: titleKey
-                val body = messageContent.localizedText(title, resources, currencyUtils)
-                notify(type, title, body)
+                if (type.isNotifiable()) {
+                    val title = titleKey.localizedStringByKey(resources) ?: titleKey
+                    val body = messageContent.localizedText(title, resources, currencyUtils)
+                    notify(type, title, body)
+                }
 
                 when (type) {
                     NotificationType.ChatMessage -> {
@@ -139,8 +141,6 @@ class CodePushMessagingService : FirebaseMessagingService(),
         title: String,
         content: String,
     ) {
-        if (!type.isNotifiable()) return
-
         val notificationManager =
             getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager