open chat and scroll to correct message after tap on notification

DcCore/DcCore/DC/events.swift

@@ -139,30 +139,10 @@ public func handleEvent(event: DcEvent) {
             "message_id": Int(data2),
             "chat_id": Int(data1),
         ]
-
         DispatchQueue.main.async {
             nc.post(name: dcNotificationIncoming,
                     object: nil,
                     userInfo: userInfo)
-
-            let chat = DcContext.shared.getChat(chatId: Int(data1))
-            if !UserDefaults.standard.bool(forKey: "notifications_disabled") && !chat.isMuted {
-                let content = UNMutableNotificationContent()
-                let msg = DcMsg(id: Int(data2))
-                content.title = msg.getSenderName(msg.fromContact)
-                content.body = msg.summary(chars: 40) ?? ""
-                content.userInfo = userInfo
-                content.sound = .default
-
-                let trigger = UNTimeIntervalNotificationTrigger(timeInterval: 0.1, repeats: false)
-
-                let request = UNNotificationRequest(identifier: Constants.notificationIdentifier, content: content, trigger: trigger)
-                UNUserNotificationCenter.current().add(request, withCompletionHandler: nil)
-                DcContext.shared.logger?.info("notifications: added \(content)")
-            }
-
-            let array = DcContext.shared.getFreshMessages()
-            UIApplication.shared.applicationIconBadgeNumber = array.count
         }
 
     case DC_EVENT_SMTP_MESSAGE_SENT:

deltachat-ios/AppDelegate.swift

@@ -9,7 +9,7 @@ import DBDebugToolkit
 let logger = SwiftyBeaver.self
 
 @UIApplicationMain
-class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterDelegate {
+class AppDelegate: UIResponder, UIApplicationDelegate {
     private let dcContext = DcContext.shared
     var appCoordinator: AppCoordinator!
     var relayHelper: RelayHelper!
@@ -19,6 +19,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
     var window: UIWindow?
     var appIsInForeground = false
 
+    var incomingMsgObserver: Any?
+
     func application(_: UIApplication, didFinishLaunchingWithOptions _: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         // explicitly ignore SIGPIPE to avoid crashes, see https://developer.apple.com/library/archive/documentation/NetworkingInternetWeb/Conceptual/NetworkingOverview/CommonPitfalls/CommonPitfalls.html
         // setupCrashReporting() may create an additional handler, but we do not want to rely on that
@@ -66,6 +68,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
             print("Unable to start notifier")
         }
 
+        if dcContext.isConfigured() {
+            registerForPushNotifications()
+        }
+
         return true
     }
 
@@ -255,45 +261,82 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
         UIApplication.shared.endBackgroundTask(backgroundTask)
         backgroundTask = .invalid
     }
+}
+
+extension AppDelegate: UNUserNotificationCenterDelegate {
+    // This function will be called right after user tap on the notification
+    func userNotificationCenter(_ center: UNUserNotificationCenter, didReceive response: UNNotificationResponse, withCompletionHandler completionHandler: @escaping () -> Void) {
+        if response.notification.request.identifier == Constants.notificationIdentifier {
+            let userInfo = response.notification.request.content.userInfo
+            logger.info("notifications: \(userInfo)")
+            if let chatId = userInfo["chat_id"] as? Int,
+               let msgId = userInfo["message_id"] as? Int {
+                appCoordinator.showChat(chatId: chatId, msgId: msgId)
+            }
+        }
+
+        completionHandler()
+    }
 
-    // MARK: - PushNotifications
+    func userNotificationCenter(_: UNUserNotificationCenter, willPresent _: UNNotification, withCompletionHandler completionHandler: @escaping (UNNotificationPresentationOptions) -> Void) {
+        logger.info("notifications: forground notification appeared")
+        completionHandler([.alert, .sound])
+    }
 
     func registerForPushNotifications() {
+        logger.info("notifications: reister for push notifications")
         UNUserNotificationCenter.current().delegate = self
 
         UNUserNotificationCenter.current()
             .requestAuthorization(options: [.alert, .sound, .badge]) { granted, _ in
-                logger.info("permission granted: \(granted)")
+                logger.info("notifications: permission granted: \(granted)")
                 guard granted else { return }
                 self.getNotificationSettings()
             }
-    }
 
-    private func getNotificationSettings() {
-        UNUserNotificationCenter.current().getNotificationSettings { settings in
-            logger.info("Notification settings: \(settings)")
-        }
-    }
+        let nc = NotificationCenter.default
+        incomingMsgObserver = nc.addObserver(
+            forName: dcNotificationIncoming,
+            object: nil, queue: OperationQueue.main
+        ) { [weak self] notification in
+            guard let self = self else { return }
+            let array = DcContext.shared.getFreshMessages()
+            UIApplication.shared.applicationIconBadgeNumber = array.count
+
+            let lastActiveChat = AppStateRestorer.shared.restoreLastActiveChatId()
+            if let ui = notification.userInfo,
+               let chatId = ui["chat_id"] as? Int,
+               lastActiveChat != chatId,
+               let msgId = ui["message_id"] as? Int {
+                let chat = self.dcContext.getChat(chatId: chatId)
+                if !UserDefaults.standard.bool(forKey: "notifications_disabled") && !chat.isMuted {
+                    let content = UNMutableNotificationContent()
+                    let msg = DcMsg(id: msgId)
+                    content.title = chat.isGroup ? chat.name : msg.fromContact.displayName
+                    content.body =  msg.summary(chars: 80) ?? ""
+                    content.subtitle = chat.isGroup ?  msg.fromContact.displayName : ""
+                    content.userInfo = ui
+                    content.sound = .default
+
+                    /*if let url = msg.fileURL,
+                       let attachment = try? UNNotificationAttachment(identifier: Constants.notificationIdentifier, url: url, options: nil) {
+                        content.attachments = [attachment]
+                    }*/
+
+                    let trigger = UNTimeIntervalNotificationTrigger(timeInterval: 3, repeats: false)
+                    let request = UNNotificationRequest(identifier: Constants.notificationIdentifier, content: content, trigger: trigger)
+                    UNUserNotificationCenter.current().add(request, withCompletionHandler: nil)
+                    DcContext.shared.logger?.info("notifications: added \(content)")
+                }
 
-    private func userNotificationCenter(_: UNUserNotificationCenter, willPresent _: UNNotification, withCompletionHandler completionHandler: @escaping (UNNotificationPresentationOptions) -> Void) {
-        logger.info("forground notification")
-        completionHandler([.alert, .sound])
-    }
-
-    private func userNotificationCenter(_: UNUserNotificationCenter, didReceive response: UNNotificationResponse, withCompletionHandler completionHandler: @escaping () -> Void) {
-        if response.notification.request.identifier == Constants.notificationIdentifier {
-            logger.info("handling notifications")
-            let userInfo = response.notification.request.content.userInfo
-            let nc = NotificationCenter.default
-            DispatchQueue.main.async {
-                nc.post(
-                    name: dcNotificationViewChat,
-                    object: nil,
-                    userInfo: userInfo
-                )
             }
+
         }
+    }
 
-        completionHandler()
+    private func getNotificationSettings() {
+        UNUserNotificationCenter.current().getNotificationSettings { settings in
+            logger.info("notifications: Notification settings: \(settings)")
+        }
     }
 }

deltachat-ios/Controller/ChatListController.swift

@@ -403,7 +403,6 @@ class ChatListController: UITableViewController {
     }
 
     func showChat(chatId: Int, highlightedMsg: Int? = nil, animated: Bool = true) {
-        //let chatVC = ChatViewController(dcContext: dcContext, chatId: chatId)
         let chatVC = ChatViewController(dcContext: dcContext, chatId: chatId, highlightedMsg: highlightedMsg)
         navigationController?.pushViewController(chatVC, animated: animated)
     }

deltachat-ios/Coordinator/AppCoordinator.swift

@@ -85,10 +85,10 @@ class AppCoordinator {
         tabBarController.selectedIndex = index
     }
 
-    func showChat(chatId: Int, animated: Bool = true) {
+    func showChat(chatId: Int, msgId: Int? = nil, animated: Bool = true) {
         showTab(index: chatsTab)
         if let rootController = self.chatsNavController.viewControllers.first as? ChatListController {
-            rootController.showChat(chatId: chatId, animated: animated)
+            rootController.showChat(chatId: chatId, msgId: msgId, animated: animated)
         }
     }