Foreground notifications (#160)

raphaelrobert · web-flow · commit e5b78c60e83b · 2024-07-29T23:56:43.000+02:00
* Foreground notifications

* Change code signing

* Revert code signing changes
diff --git a/applogic/src/nse/mod.rs b/applogic/src/nse/mod.rs
@@ -15,6 +15,7 @@ struct IncomingNotificationContent {
 
 #[derive(Serialize, Deserialize)]
 struct NotificationBatch {
+    badge_count: u32,
     removals: Vec<String>,
     additions: Vec<NotificationContent>,
 }
@@ -24,6 +25,7 @@ struct NotificationContent {
     identifier: String,
     title: String,
     body: String,
+    data: String,
 }
 
 #[no_mangle]
@@ -37,41 +39,49 @@ pub extern "C" fn process_new_messages(content: *const c_char) -> *mut c_char {
     let incoming_content: IncomingNotificationContent = serde_json::from_str(json_str).unwrap();
 
     // Test notifictaions only for now
-    let (removals, additions) = match &incoming_content.data[..] {
+    let (badge_count, removals, additions) = match &incoming_content.data[..] {
         "add" => (
+            1,
             vec!["documentation".to_string()],
             vec![
                 NotificationContent {
                     identifier: "documentation".to_string(),
                     title: "Added the placeholder notification".to_string(),
                     body: "Add operation".to_string(),
+                    data: incoming_content.data.clone(),
                 },
                 NotificationContent {
                     identifier: "placeholder".to_string(),
                     title: "Placeholder notification".to_string(),
                     body: "This is a placeholder notification".to_string(),
+                    data: incoming_content.data.clone(),
                 },
             ],
         ),
         "remove" => (
+            0,
             vec!["documentation".to_string(), "placeholder".to_string()],
             vec![NotificationContent {
                 identifier: "documentation".to_string(),
                 title: "Removed the placeholder notification".to_string(),
                 body: "Remove operation".to_string(),
+                data: incoming_content.data.clone(),
             }],
         ),
         _ => (
+            0,
             vec!["documentation".to_string()],
             vec![NotificationContent {
                 identifier: "documentation".to_string(),
                 title: "Could not process command".to_string(),
                 body: format!("Unknown command: {}", incoming_content.data),
+                data: incoming_content.data.clone(),
             }],
         ),
     };
 
     let batch = NotificationBatch {
+        badge_count,
         removals,
         additions,
     };
diff --git a/prototype/ios/NotificationService/NotificationService.swift b/prototype/ios/NotificationService/NotificationService.swift
@@ -2,8 +2,6 @@
 //  NotificationService.swift
 //  NotificationService
 //
-//  Created by Raphael Robert on 17.07.2024.
-//
 
 import UserNotifications
 import Foundation
@@ -14,6 +12,7 @@ struct IncomingNotificationContent: Codable {
 }
 
 struct NotificationBatch: Codable {
+    let badge_count: UInt32
     let removals: [String]
     let additions: [NotificationContent]
 }
@@ -22,7 +21,8 @@ struct NotificationContent: Codable {
     let identifier: String
     let title: String
     let body: String
-}
+    let data: String
+} 
 
 class NotificationService: UNNotificationServiceExtension {
 
@@ -62,7 +62,7 @@ class NotificationService: UNNotificationServiceExtension {
                     if let responseData = responseString.data(using: .utf8),
                        let notificationBatch = try? JSONDecoder().decode(NotificationBatch.self, from: responseData) {
                         
-                        handleNotificationBatch(notificationBatch, contentHandler: contentHandler, bestAttemptContent: bestAttemptContent)
+                        handleNotificationBatch(notificationBatch, contentHandler: contentHandler)
                     } else {
                         contentHandler(request.content)
                     }
@@ -84,7 +84,7 @@ class NotificationService: UNNotificationServiceExtension {
         }
     }
 
-    func handleNotificationBatch(_ batch: NotificationBatch, contentHandler: @escaping (UNNotificationContent) -> Void, bestAttemptContent: UNMutableNotificationContent) {
+    func handleNotificationBatch(_ batch: NotificationBatch, contentHandler: @escaping (UNNotificationContent) -> Void) {
         let center = UNUserNotificationCenter.current()
         let dispatchGroup = DispatchGroup()
 
@@ -102,6 +102,8 @@ class NotificationService: UNNotificationServiceExtension {
                 let newContent = UNMutableNotificationContent()
                 newContent.title = notificationContent.title
                 newContent.body = notificationContent.body
+                newContent.sound = UNNotificationSound.default
+                newContent.userInfo["customData"] = notificationContent.data
                 let request = UNNotificationRequest(identifier: notificationContent.identifier, content: newContent, trigger: nil)
                 center.add(request) { error in
                     if let error = error {
@@ -114,15 +116,18 @@ class NotificationService: UNNotificationServiceExtension {
 
         // Notify when all notifications are added
         dispatchGroup.notify(queue: DispatchQueue.main) {
+            var content = UNMutableNotificationContent()
             if let lastNotification = lastNotification {
-                bestAttemptContent.title = lastNotification.title
-                bestAttemptContent.body = lastNotification.body
-                contentHandler(bestAttemptContent)
-            } else {
-                // Delay the callback by 1 second so that the notifications can be removed
-                DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
-                    contentHandler(UNNotificationContent())
-                }
+                content.title = lastNotification.title
+                content.body = lastNotification.body
+                content.sound = UNNotificationSound.default
+                content.userInfo["customData"] = lastNotification.data
+            }
+            // Add the badge number
+            content.badge = NSNumber(value: batch.badge_count)
+            // Delay the callback by 1 second so that the notifications can be removed
+            DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
+                contentHandler(content)
             }
         }
     }
diff --git a/prototype/ios/Podfile.lock b/prototype/ios/Podfile.lock
@@ -42,6 +42,6 @@ SPEC CHECKSUMS:
   permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
   phnxapplogic: 3a80c8eb90a59223e9add14dde8a0447b069b0b3
 
-PODFILE CHECKSUM: 0125abbd476297c108cff54855f8852db903c646
+PODFILE CHECKSUM: 1220b9aeaff430464a6e8d836cc72e2101e24e90
 
 COCOAPODS: 1.15.2
diff --git a/prototype/ios/Runner/AppDelegate.swift b/prototype/ios/Runner/AppDelegate.swift
@@ -4,6 +4,7 @@ import UIKit
 @UIApplicationMain
 @objc class AppDelegate: FlutterAppDelegate {
   private var deviceToken: String?
+  private let notificationChannelName: String = "im.phnx.prototype/channel"
   
   override func application(
     _ application: UIApplication,
@@ -20,15 +21,11 @@ import UIKit
 
     // Set up the method channel to retrieve the token from Flutter
     let controller = window?.rootViewController as! FlutterViewController
-    let deviceTokenChannel = FlutterMethodChannel(name: "im.phnx.prototype/channel",
+    let methodChannel = FlutterMethodChannel(name: notificationChannelName,
                                                   binaryMessenger: controller.binaryMessenger)
-    deviceTokenChannel.setMethodCallHandler { [weak self] (call, result) in
-      if call.method == "devicetoken" {
-        self?.getDeviceToken(result: result)
-      } else {
-        result(FlutterMethodNotImplemented)
-      }
-    }
+
+    // Set the handler function for the method channel
+    methodChannel.setMethodCallHandler(handleMethodCall)
 
     return super.application(application, didFinishLaunchingWithOptions: launchOptions)
   }
@@ -43,9 +40,47 @@ import UIKit
   }
 
   override func application(_ application: UIApplication, didFailToRegisterForRemoteNotificationsWithError error: Error) {
-    print("Failed to register: \(error)")
+    NSLog("Failed to register: \(error)")
   }
   
+  // This method will be called when app received push notifications in foreground
+  override func userNotificationCenter(_ center: UNUserNotificationCenter, willPresent notification: UNNotification, withCompletionHandler completionHandler: @escaping (UNNotificationPresentationOptions) -> Void) {
+    NSLog("Foreground notification received")
+    let userInfo = notification.request.content.userInfo
+    if let customData = userInfo["customData"] as? String {
+        notifyFlutter(customData: customData, method: "receivedNotification")
+    }
+    completionHandler([.alert, .sound])
+  }
+  
+  // This method will be called when the user taps on the notification
+  override func userNotificationCenter(_ center: UNUserNotificationCenter, didReceive response: UNNotificationResponse, withCompletionHandler completionHandler: @escaping () -> Void) {
+    NSLog("User opened notification")
+    let userInfo = response.notification.request.content.userInfo
+    if let customData = userInfo["customData"] as? String {
+        notifyFlutter(customData: customData, method: "openedNotification")
+    }
+    completionHandler() 
+  }
+
+  private func notifyFlutter(customData: String, method: String) {
+    let controller = window?.rootViewController as! FlutterViewController
+    let channel = FlutterMethodChannel(name: notificationChannelName, binaryMessenger: controller.binaryMessenger)
+    let arguments: [String: String] = ["customData": customData]
+    channel.invokeMethod(method, arguments: arguments)
+}
+
+  // Define the handler function
+  private func handleMethodCall(call: FlutterMethodCall, result: @escaping FlutterResult) {
+      if call.method == "devicetoken" {
+          self.getDeviceToken(result: result)
+      } else {
+          NSLog("Unknown method called: \(call.method)")
+          result(FlutterMethodNotImplemented)
+      }
+  }
+
+  // Get device token
   private func getDeviceToken(result: FlutterResult) {
     if let token = deviceToken {
       result(token)
diff --git a/prototype/lib/homescreen.dart b/prototype/lib/homescreen.dart
@@ -8,6 +8,7 @@ import 'package:flutter/material.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:prototype/core_client.dart';
 import 'package:prototype/messenger_view.dart';
+import 'package:prototype/platform.dart';
 import 'package:prototype/registration/server_choice.dart';
 import 'package:prototype/settings/developer.dart';
 import 'package:prototype/styles.dart';
@@ -34,10 +35,12 @@ class _HomeScreenState extends State<HomeScreen> {
       statusText = "Initializing core client...";
     });
 
-    await coreClient.init();
-
-    // Ask for notification permission on iOS
+    // iOS specific initialization
     if (Platform.isIOS) {
+      // Initialize the method channel
+      initMethodChannel();
+
+      // Ask for notification permission
       var status = await Permission.notification.status;
       switch (status) {
         case PermissionStatus.denied:
diff --git a/prototype/lib/main.dart b/prototype/lib/main.dart
@@ -3,10 +3,14 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
 import 'package:flutter/material.dart';
+import 'package:prototype/core_client.dart';
 import 'package:prototype/homescreen.dart';
 import 'package:prototype/styles.dart';
 
 void main() async {
+  // Initialize the FRB
+  await coreClient.init();
+
   runApp(const MyApp());
 }
 
diff --git a/prototype/lib/platform.dart b/prototype/lib/platform.dart
@@ -7,6 +7,29 @@ import 'package:flutter/services.dart';
 
 const platform = MethodChannel('im.phnx.prototype/channel');
 
+void initMethodChannel() {
+  platform.setMethodCallHandler(_handleMethod);
+}
+
+Future<void> _handleMethod(MethodCall call) async {
+  switch (call.method) {
+    case 'receivedNotification':
+      // Handle notification data
+      final String data = call.arguments["customData"];
+      print('Notification data: $data');
+      // Do something with the data
+      break;
+    case 'openedNotification':
+      // Handle notification opened
+      final String data = call.arguments["customData"];
+      print('Notification opened: $data');
+      // Do something with the data
+      break;
+    default:
+      print('Unknown method called: ${call.method}');
+  }
+}
+
 Future<String?> getDeviceToken() async {
   // Make sure we are on iOS
   if (!Platform.isIOS) {
