add calls notification type; keep message test for backwards compat

mattermost · Nov 7, 2023 · 1d704ed · 1d704ed
1 parent 872f81e
commit 1d704ed
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/app/constants/push_notification.ts b/app/constants/push_notification.ts
@@ -9,6 +9,7 @@ export const NOTIFICATION_TYPE = {
     CLEAR: 'clear',
     MESSAGE: 'message',
     SESSION: 'session',
+    CALLS: 'calls',
 };
 
 export default {

diff --git a/app/init/push_notifications.ts b/app/init/push_notifications.ts
@@ -20,6 +20,7 @@ import {updateThread} from '@actions/local/thread';
 import {backgroundNotification, openNotification} from '@actions/remote/notifications';
 import {isCallsStartedMessage} from '@calls/utils';
 import {Device, Events, Navigation, PushNotification, Screens} from '@constants';
+import {NOTIFICATION_TYPE} from '@constants/push_notification';
 import DatabaseManager from '@database/manager';
 import {DEFAULT_LOCALE, getLocalizedMessage, t} from '@i18n';
 import NativeNotifications from '@notifications';
@@ -109,7 +110,7 @@ class PushNotifications {
         const {payload} = notification;
 
         // Do not show overlay if this is a call-started message (the call_notification will alert the user)
-        if (isCallsStartedMessage(notification.payload?.message)) {
+        if (notification.type === NOTIFICATION_TYPE.CALLS || isCallsStartedMessage(notification.payload?.message)) {
             return;
         }