Merge pull request #1186 from Hirobreak/push-subject

Correctly localizing subject

Author: Erika Perugachi

electron_app/src/globalManager.js

@@ -96,7 +96,7 @@ const disableWindowsEvents = () => {
 };
 
 const enableWindowsEvents = () => {
-  global.windowsEventsDisabled = true;
+  global.windowsEventsDisabled = false;
 };
 
 const checkWindowsEvents = () => {

email_mailbox/src/utils/StringUtils.js

@@ -85,11 +85,3 @@ export const splitSignalIdentifier = identifier => {
   const recipientId = parts.join('.');
   return { recipientId, deviceId };
 };
-
-export const getSubjectFromPushMessage = (message, emptySubject) => {
-  const matched = message.match(/"(.*)"/);
-  if (!matched) return null;
-  const substr = matched[0];
-  if (substr === `""`) return `(${emptySubject})`;
-  return substr;
-};

email_mailbox/src/utils/electronEventInterface.js

@@ -70,7 +70,6 @@ import Messages from './../data/message';
 import { MessageType } from './../components/Message';
 import { AttachItemStatus } from '../components/AttachItem';
 import { getShowEmailPreviewStatus, getUserGuideStepStatus } from './storage';
-import { getSubjectFromPushMessage } from './StringUtils';
 import {
   fetchAcknowledgeEvents,
   fetchEvents,
@@ -1462,15 +1461,11 @@ ipcRenderer.on(NOTIFICATION_RECEIVED, async (_, { data }) => {
         break;
       }
       case NOTIFICATION_ACTIONS.OPEN_EMAIL: {
-        const subject = getSubjectFromPushMessage(
-          data.body,
-          string.mailbox.empty_subject
-        );
-        if (subject) {
+        if (data.subject) {
           const title = string.notification.openEmail.title;
           const message = string.notification.openEmail.message.replace(
             '<subject>',
-            subject
+            data.subject
           );
           showNotificationApp({ title, message });
         }