Merge pull request #1329 from nextcloud/refactor/neon_framework/move-…

…push-notification-callbacks
nextcloud · Dec 20, 2023 · ab681e9 · ab681e9
2 parents 5a80232 + 7d37797
commit ab681e9
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 20 deletions.
diff --git a/packages/neon_framework/lib/src/app.dart b/packages/neon_framework/lib/src/app.dart
@@ -18,7 +18,6 @@ import 'package:neon_framework/src/router.dart';
 import 'package:neon_framework/src/theme/neon.dart';
 import 'package:neon_framework/src/theme/theme.dart';
 import 'package:neon_framework/src/utils/findable.dart';
-import 'package:neon_framework/src/utils/global.dart';
 import 'package:neon_framework/src/utils/global_options.dart';
 import 'package:neon_framework/src/utils/localizations.dart';
 import 'package:neon_framework/src/utils/provider.dart';
@@ -149,7 +148,7 @@ class _NeonAppState extends State<NeonApp> with WidgetsBindingObserver, tray.Tra
 
       if (NeonPlatform.instance.canUsePushNotifications) {
         final localNotificationsPlugin = await PushUtils.initLocalNotifications();
-        Global.onPushNotificationReceived = (final accountID) async {
+        PushUtils.onPushNotificationReceived = (final accountID) async {
           final account = _accountsBloc.accounts.value.tryFind(accountID);
           if (account == null) {
             return;
@@ -164,7 +163,7 @@ class _NeonAppState extends State<NeonApp> with WidgetsBindingObserver, tray.Tra
 
           await _accountsBloc.getAppsBlocFor(account).getAppBloc<NotificationsBlocInterface>(app).refresh();
         };
-        Global.onPushNotificationClicked = (final pushNotificationWithAccountID) async {
+        PushUtils.onLocalNotificationClicked = (final pushNotificationWithAccountID) async {
           final account = _accountsBloc.accounts.value.tryFind(pushNotificationWithAccountID.accountID);
           if (account == null) {
             return;
@@ -191,7 +190,7 @@ class _NeonAppState extends State<NeonApp> with WidgetsBindingObserver, tray.Tra
 
         final details = await localNotificationsPlugin.getNotificationAppLaunchDetails();
         if (details != null && details.didNotificationLaunchApp && details.notificationResponse?.payload != null) {
-          await Global.onPushNotificationClicked!(
+          await PushUtils.onLocalNotificationClicked!(
             PushNotification.fromJson(
               json.decode(details.notificationResponse!.payload!) as Map<String, dynamic>,
             ),

diff --git a/packages/neon_framework/lib/src/utils/global.dart b/packages/neon_framework/lib/src/utils/global.dart
diff --git a/packages/neon_framework/lib/src/utils/push_utils.dart b/packages/neon_framework/lib/src/utils/push_utils.dart
@@ -16,7 +16,6 @@ import 'package:neon_framework/src/models/push_notification.dart';
 import 'package:neon_framework/src/settings/models/storage.dart';
 import 'package:neon_framework/src/theme/colors.dart';
 import 'package:neon_framework/src/utils/findable.dart';
-import 'package:neon_framework/src/utils/global.dart';
 import 'package:neon_framework/src/utils/localizations.dart';
 import 'package:neon_framework/src/utils/universal_svg_file_loader.dart';
 import 'package:nextcloud/notifications.dart' as notifications;
@@ -26,6 +25,16 @@ import 'package:nextcloud/notifications.dart' as notifications;
 class PushUtils {
   const PushUtils._();
 
+  /// Called when a new push notification was received.
+  ///
+  /// The callback will only be set if the current flutter engine was opened in the foreground.
+  static Future<void> Function(String accountID)? onPushNotificationReceived;
+
+  /// Called when a local notification was clicked on by the user.
+  ///
+  /// The callback will only be set if the current flutter engine was opened in the foreground.
+  static Future<void> Function(PushNotification notification)? onLocalNotificationClicked;
+
   static notifications.RSAKeypair loadRSAKeypair() {
     const storage = AppStorage(StorageKeys.notifications);
     const keyDevicePrivateKey = 'device-private-key';
@@ -66,8 +75,8 @@ class PushUtils {
 
     final localNotificationsPlugin = await initLocalNotifications(
       onDidReceiveNotificationResponse: (final notification) async {
-        if (Global.onPushNotificationClicked != null && notification.payload != null) {
-          await Global.onPushNotificationClicked!(
+        if (onLocalNotificationClicked != null && notification.payload != null) {
+          await onLocalNotificationClicked!(
             PushNotification.fromJson(
               json.decode(notification.payload!) as Map<String, dynamic>,
             ),
@@ -90,7 +99,7 @@ class PushUtils {
         await localNotificationsPlugin.cancel(_getNotificationID(instance, pushNotification));
       } else if (pushNotification.subject.deleteAll ?? false) {
         await localNotificationsPlugin.cancelAll();
-        await Global.onPushNotificationReceived?.call(instance);
+        await onPushNotificationReceived?.call(instance);
       } else if (pushNotification.type == 'background') {
         debugPrint('Got unknown background notification ${json.encode(pushNotification.toJson())}');
       } else {
@@ -174,7 +183,7 @@ class PushUtils {
         }
       }
 
-      await Global.onPushNotificationReceived?.call(instance);
+      await onPushNotificationReceived?.call(instance);
     }
   }