Merge pull request #235 from RyanRory/notifications

Fix Push Notification Bugs

LokiPushNotificationService/NotificationServiceExtension.swift

@@ -15,31 +15,36 @@ final class NotificationServiceExtension : UNNotificationServiceExtension {
     override func didReceive(_ request: UNNotificationRequest, withContentHandler contentHandler: @escaping (UNNotificationContent) -> Void) {
         self.contentHandler = contentHandler
         notificationContent = (request.content.mutableCopy() as? UNMutableNotificationContent)
-
+        
-        DispatchQueue.main.async {
+        // The code using DispatchQueue.main.async { self.setUpIfNecessary(){ Modify the notification content } } will somehow cause a freezing when the second PN comes
-            self.setUpIfNecessary() {
+        
-                if let notificationContent = self.notificationContent {
+        DispatchQueue.main.sync { self.setUpIfNecessary(){} }
-                    // Modify the notification content here...
+        
-                    let base64EncodedData = notificationContent.userInfo["ENCRYPTED_DATA"] as! String
+        AppReadiness.runNowOrWhenAppDidBecomeReady {
-                    let data = Data(base64Encoded: base64EncodedData)!
+            if let notificationContent = self.notificationContent {
-                    let decrypter = SSKEnvironment.shared.messageDecrypter
+                // Modify the notification content here...
-                    if let envelope = try? MessageWrapper.unwrap(data: data), let data = try? envelope.serializedData() {
+                let base64EncodedData = notificationContent.userInfo["ENCRYPTED_DATA"] as! String
-                        decrypter.decryptEnvelope(envelope,
+                let data = Data(base64Encoded: base64EncodedData)!
-                                                  envelopeData: data,
+                let decrypter = SSKEnvironment.shared.messageDecrypter
-                                                  successBlock: { result, transaction in
+                let messageManager = SSKEnvironment.shared.messageManager
-                                                      if (try? SSKProtoEnvelope.parseData(result.envelopeData)) != nil {
+                if let envelope = try? MessageWrapper.unwrap(data: data), let data = try? envelope.serializedData() {
-                                                          self.handleDecryptionResult(result: result, notificationContent: notificationContent, transaction: transaction)
+                    let wasReceivedByUD = self.wasReceivedByUD(envelope: envelope)
-                                                      } else {
+                    decrypter.decryptEnvelope(envelope,
-                                                          self.completeWithFailure(content: notificationContent)
+                                              envelopeData: data,
-                                                      }
+                                              successBlock: { result, transaction in
-                                                  },
+                                                  if let envelope = try? SSKProtoEnvelope.parseData(result.envelopeData) {
-                                                  failureBlock: {
+                                                      messageManager.throws_processEnvelope(envelope, plaintextData: result.plaintextData, wasReceivedByUD: wasReceivedByUD, transaction: transaction, serverID: 0)
+                                                      self.handleDecryptionResult(result: result, notificationContent: notificationContent, transaction: transaction)
+                                                  } else {
                                                       self.completeWithFailure(content: notificationContent)
                                                   }
-                        )
+                                              },
-                    } else {
+                                              failureBlock: {
-                        self.completeWithFailure(content: notificationContent)
+                                                  self.completeWithFailure(content: notificationContent)
-                    }
+                                              }
+                    )
+                } else {
+                    self.completeWithFailure(content: notificationContent)
                 }
             }
         }

Signal/src/Loki/View Controllers/HomeVC.swift

@@ -212,12 +212,16 @@ final class HomeVC : BaseVC, UITableViewDataSource, UITableViewDelegate, UIScrol
         isObservingDatabase = isViewVisible && CurrentAppContext().isAppForegroundAndActive()
     }
     
-    private func reload() {
+    private func updateThreadMapping() {
-        AssertIsOnMainThread()
         uiDatabaseConnection.beginLongLivedReadTransaction()
         uiDatabaseConnection.read { transaction in
             self.threads.update(with: transaction)
         }
+    }
+    
+    private func reload() {
+        AssertIsOnMainThread()
+        updateThreadMapping()
         threadViewModelCache.removeAll()
         tableView.reloadData()
         emptyStateView.isHidden = (threadCount != 0)
@@ -235,6 +239,21 @@ final class HomeVC : BaseVC, UITableViewDataSource, UITableViewDelegate, UIScrol
             }
             return
         }
+        // Guard for changes made in Notification Service Extension
+        // Crashes may happen if there is some modification in NSE
+        // The YapDBModificationNotification cannot cross process
+        // So the thread mapping won't update itself if DB modification happened in other process like NSE
+        // With these code we can sync the mapping before asking for changes from YapDB
+        if (notifications.count > 0) {
+            if let firstChangeset = notifications[0].userInfo {
+                let firstSnapshot = firstChangeset[YapDatabaseSnapshotKey] as! UInt64
+                if (self.threads.snapshotOfLastUpdate != firstSnapshot - 1) {
+                    reload()
+                    return
+                }
+            }
+        }
+        
         var sectionChanges = NSArray()
         var rowChanges = NSArray()
         ext.getSectionChanges(&sectionChanges, rowChanges: &rowChanges, for: notifications, with: threads)
@@ -261,6 +280,7 @@ final class HomeVC : BaseVC, UITableViewDataSource, UITableViewDelegate, UIScrol
     
     @objc private func handleApplicationDidBecomeActiveNotification(_ notification: Notification) {
         updateIsObservingDatabase()
+        updateThreadMapping()
     }
     
     @objc private func handleApplicationWillResignActiveNotification(_ notification: Notification) {

SignalServiceKit/src/Messages/OWSMessageManager.m

@@ -1613,10 +1613,10 @@ NS_ASSUME_NONNULL_BEGIN
 
     // Update thread preview in inbox
     [masterThread touchWithTransaction:transaction];
-
+    
-    [SSKEnvironment.shared.notificationsManager notifyUserForIncomingMessage:incomingMessage
+    if (CurrentAppContext().isMainAppAndActive) {
-                                                                    inThread:masterThread
+        [SSKEnvironment.shared.notificationsManager notifyUserForIncomingMessage:incomingMessage inThread:masterThread transaction:transaction];
-                                                                 transaction:transaction];
+    }
 
     dispatch_async(dispatch_get_main_queue(), ^{
         [self.typingIndicators didReceiveIncomingMessageInThread:masterThread

SignalServiceKit/src/Storage/AxolotlStore/OWSPrimaryStorage+SessionStore.m

@@ -88,8 +88,6 @@ NSString *const kSessionStoreDBConnectionKey = @"kSessionStoreDBConnectionKey";
     OWSAssertDebug(contactIdentifier.length > 0);
     OWSAssertDebug(deviceId >= 0);
     OWSAssertDebug([protocolContext isKindOfClass:[YapDatabaseReadWriteTransaction class]]);
-    // FIXME: This needs a comment from Ryan explaining why it's necessary (it has to do with push notifications)
-    if (!CurrentAppContext().isMainApp) { return; }
 
     YapDatabaseReadWriteTransaction *transaction = protocolContext;