Notification improvements

signalapp · Sep 27, 2021 · 826306a · 826306a
1 parent baf445c
commit 826306a
Show file tree

Hide file tree

Showing 16 changed files with 416 additions and 410 deletions.
diff --git a/js/modules/signal.js b/js/modules/signal.js
@@ -14,7 +14,6 @@ const EmojiLib = require('../../ts/components/emoji/lib');
 const Groups = require('../../ts/groups');
 const GroupChange = require('../../ts/groupChange');
 const IndexedDB = require('./indexeddb');
-const Notifications = require('../../ts/notifications');
 const OS = require('../../ts/OS');
 const Stickers = require('../../ts/types/Stickers');
 const Settings = require('./settings');
@@ -159,7 +158,6 @@ const {
 const {
   initializeUpdateListener,
 } = require('../../ts/services/updateListener');
-const { notify } = require('../../ts/services/notify');
 const { calling } = require('../../ts/services/calling');
 const { onTimeout, removeTimeout } = require('../../ts/services/timers');
 const {
@@ -406,7 +404,6 @@ exports.setup = (options = {}) => {
     initializeNetworkObserver,
     initializeUpdateListener,
     onTimeout,
-    notify,
     removeTimeout,
     runStorageServiceSyncJob,
     storageServiceUploadJob,
@@ -454,7 +451,6 @@ exports.setup = (options = {}) => {
     GroupChange,
     IndexedDB,
     Migrations,
-    Notifications,
     OS,
     RemoteConfig,
     Settings,

diff --git a/js/notifications.js b/js/notifications.js
diff --git a/ts/background.ts b/ts/background.ts
@@ -38,6 +38,7 @@ import { updateConversationsWithUuidLookup } from './updateConversationsWithUuid
 import { initializeAllJobQueues } from './jobs/initializeAllJobQueues';
 import { removeStorageKeyJobQueue } from './jobs/removeStorageKeyJobQueue';
 import { ourProfileKeyService } from './services/ourProfileKey';
+import { notificationService } from './services/notifications';
 import { shouldRespondWithProfileKey } from './util/shouldRespondWithProfileKey';
 import { LatestQueue } from './util/LatestQueue';
 import { parseIntOrThrow } from './util/parseIntOrThrow';
@@ -134,6 +135,10 @@ export async function startApp(): Promise<void> {
   window.Signal.Util.MessageController.install();
   window.Signal.conversationControllerStart();
   window.startupProcessingQueue = new window.Signal.Util.StartupQueue();
+  notificationService.initialize({
+    i18n: window.i18n,
+    storage: window.storage,
+  });
   window.attachmentDownloadQueue = [];
   try {
     log.info('Initializing SQL in renderer');
@@ -1777,12 +1782,10 @@ export async function startApp(): Promise<void> {
       }
     });
 
-    window.registerForActive(() => window.Whisper.Notifications.clear());
-    window.addEventListener('unload', () =>
-      window.Whisper.Notifications.fastClear()
-    );
+    window.registerForActive(() => notificationService.clear());
+    window.addEventListener('unload', () => notificationService.fastClear());
 
-    window.Whisper.Notifications.on('click', (id, messageId) => {
+    notificationService.on('click', (id, messageId) => {
       window.showWindow();
       if (id) {
         window.Whisper.events.trigger('showConversation', id, messageId);
@@ -2071,7 +2074,7 @@ export async function startApp(): Promise<void> {
       profileKeyResponseQueue.pause();
       lightSessionResetQueue.pause();
       window.Whisper.deliveryReceiptQueue.pause();
-      window.Whisper.Notifications.disable();
+      notificationService.disable();
 
       window.Signal.Services.initializeGroupCredentialFetcher();
 
@@ -2323,7 +2326,7 @@ export async function startApp(): Promise<void> {
     profileKeyResponseQueue.start();
     lightSessionResetQueue.start();
     window.Whisper.deliveryReceiptQueue.start();
-    window.Whisper.Notifications.enable();
+    notificationService.enable();
 
     await onAppView;
 
@@ -2387,7 +2390,7 @@ export async function startApp(): Promise<void> {
     profileKeyResponseQueue.pause();
     lightSessionResetQueue.pause();
     window.Whisper.deliveryReceiptQueue.pause();
-    window.Whisper.Notifications.disable();
+    notificationService.disable();
   }
 
   let initialStartupCount = 0;

diff --git a/ts/messageModifiers/ReadSyncs.ts b/ts/messageModifiers/ReadSyncs.ts
@@ -1,4 +1,4 @@
-// Copyright 2017-2020 Signal Messenger, LLC
+// Copyright 2017-2021 Signal Messenger, LLC
 // SPDX-License-Identifier: AGPL-3.0-only
 
 /* eslint-disable max-classes-per-file */
@@ -8,6 +8,7 @@ import { Collection, Model } from 'backbone';
 import { MessageModel } from '../models/messages';
 import { isIncoming } from '../state/selectors/message';
 import { isMessageUnread } from '../util/isMessageUnread';
+import { notificationService } from '../services/notifications';
 import * as log from '../logging/log';
 
 type ReadSyncAttributesType = {
@@ -39,7 +40,7 @@ async function maybeItIsAReactionReadSync(sync: ReadSyncModel): Promise<void> {
     return;
   }
 
-  window.Whisper.Notifications.removeBy({
+  notificationService.removeBy({
     conversationId: readReaction.conversationId,
     emoji: readReaction.emoji,
     targetAuthorUuid: readReaction.targetAuthorUuid,
@@ -99,7 +100,7 @@ export class ReadSyncs extends Collection {
         return;
       }
 
-      window.Whisper.Notifications.removeBy({ messageId: found.id });
+      notificationService.removeBy({ messageId: found.id });
 
       const message = window.MessageController.register(found.id, found);
       const readAt = Math.min(sync.get('readAt'), Date.now());

diff --git a/ts/messageModifiers/ViewSyncs.ts b/ts/messageModifiers/ViewSyncs.ts
@@ -9,6 +9,7 @@ import { MessageModel } from '../models/messages';
 import { ReadStatus } from '../messages/MessageReadStatus';
 import { markViewed } from '../services/MessageUpdater';
 import { isIncoming } from '../state/selectors/message';
+import { notificationService } from '../services/notifications';
 import * as log from '../logging/log';
 
 type ViewSyncAttributesType = {
@@ -83,7 +84,7 @@ export class ViewSyncs extends Collection {
         return;
       }
 
-      window.Whisper.Notifications.removeBy({ messageId: found.id });
+      notificationService.removeBy({ messageId: found.id });
 
       const message = window.MessageController.register(found.id, found);