diff --git a/lib/utils/background_push.dart b/lib/utils/background_push.dart index 4e0f91f10..85651de31 100644 --- a/lib/utils/background_push.dart +++ b/lib/utils/background_push.dart @@ -112,7 +112,7 @@ class BackgroundPush { }); } await _flutterLocalNotificationsPlugin.initialize( - const InitializationSettings( + settings: const InitializationSettings( android: AndroidInitializationSettings('notifications_icon'), iOS: DarwinInitializationSettings(), ), @@ -170,7 +170,7 @@ class BackgroundPush { Future cancelNotification(String roomId) async { Logs().v('Cancel notification for room', roomId); - await _flutterLocalNotificationsPlugin.cancel(roomId.hashCode); + await _flutterLocalNotificationsPlugin.cancel(id: roomId.hashCode); // Workaround for app icon badge not updating if (Platform.isIOS) { diff --git a/lib/utils/client_manager.dart b/lib/utils/client_manager.dart index c318ceb11..31ef63971 100644 --- a/lib/utils/client_manager.dart +++ b/lib/utils/client_manager.dart @@ -161,17 +161,17 @@ abstract class ClientManager { final flutterLocalNotificationsPlugin = FlutterLocalNotificationsPlugin(); await flutterLocalNotificationsPlugin.initialize( - const InitializationSettings( + settings: const InitializationSettings( android: AndroidInitializationSettings('notifications_icon'), iOS: DarwinInitializationSettings(), ), ); - flutterLocalNotificationsPlugin.show( - 0, - title, - body, - const NotificationDetails( + await flutterLocalNotificationsPlugin.show( + id: 0, + title: title, + body: body, + notificationDetails: const NotificationDetails( android: AndroidNotificationDetails( 'error_message', 'Error Messages', diff --git a/lib/utils/notification_background_handler.dart b/lib/utils/notification_background_handler.dart index eaaeb7c67..81213d829 100644 --- a/lib/utils/notification_background_handler.dart +++ b/lib/utils/notification_background_handler.dart @@ -196,7 +196,7 @@ Future notificationTap( .timeout(const Duration(seconds: 3)); final messagingStyleInformation = await AndroidFlutterLocalNotificationsPlugin() - .getActiveNotificationMessagingStyle(room.id.hashCode); + .getActiveNotificationMessagingStyle(id: room.id.hashCode); if (messagingStyleInformation == null) return; l10n ??= await lookupL10n(PlatformDispatcher.instance.locale); messagingStyleInformation.messages?.add( @@ -214,10 +214,10 @@ Future notificationTap( ); await FlutterLocalNotificationsPlugin().show( - room.id.hashCode, - room.getLocalizedDisplayname(MatrixLocals(l10n)), - input, - NotificationDetails( + id: room.id.hashCode, + title: room.getLocalizedDisplayname(MatrixLocals(l10n)), + body: input, + notificationDetails: NotificationDetails( android: AndroidNotificationDetails( AppConfig.pushNotificationsChannelId, l10n.incomingMessages, diff --git a/lib/utils/push_helper.dart b/lib/utils/push_helper.dart index 6c9f9338f..0fdc9565f 100644 --- a/lib/utils/push_helper.dart +++ b/lib/utils/push_helper.dart @@ -41,11 +41,11 @@ Future pushHelper( Logs().e('Push Helper has crashed! Writing into temporary file', e, s); l10n ??= await lookupL10n(PlatformDispatcher.instance.locale); - flutterLocalNotificationsPlugin.show( - notification.roomId?.hashCode ?? 0, - l10n.newMessageInFluffyChat, - l10n.openAppToReadMessages, - NotificationDetails( + await flutterLocalNotificationsPlugin.show( + id: notification.roomId?.hashCode ?? 0, + title: l10n.newMessageInFluffyChat, + body: l10n.openAppToReadMessages, + notificationDetails: NotificationDetails( iOS: const DarwinNotificationDetails(), android: AndroidNotificationDetails( AppConfig.pushNotificationsChannelId, @@ -111,7 +111,7 @@ Future _tryPushHelper( (room) => room.id.hashCode == activeNotification.id, ); if (room == null || !room.isUnreadOrInvited) { - flutterLocalNotificationsPlugin.cancel(activeNotification.id!); + flutterLocalNotificationsPlugin.cancel(id: activeNotification.id!); } } } @@ -220,7 +220,7 @@ Future _tryPushHelper( final messagingStyleInformation = PlatformInfos.isAndroid ? await AndroidFlutterLocalNotificationsPlugin() - .getActiveNotificationMessagingStyle(id) + .getActiveNotificationMessagingStyle(id: id) : null; messagingStyleInformation?.messages?.add(newMessage); @@ -317,10 +317,10 @@ Future _tryPushHelper( } await flutterLocalNotificationsPlugin.show( - id, - title, - body, - platformChannelSpecifics, + id: id, + title: title, + body: body, + notificationDetails: platformChannelSpecifics, payload: FluffyChatPushPayload( client.clientName, event.room.id, diff --git a/pubspec.lock b/pubspec.lock index 258900a6f..d88b6e8fb 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -503,34 +503,34 @@ packages: dependency: "direct main" description: name: flutter_local_notifications - sha256: "19ffb0a8bb7407875555e5e98d7343a633bb73707bae6c6a5f37c90014077875" + sha256: "76cd20bcfa72fabe50ea27eeaf165527f446f55d3033021462084b87805b4cac" url: "https://pub.dev" source: hosted - version: "19.5.0" + version: "20.0.0" flutter_local_notifications_linux: dependency: transitive description: name: flutter_local_notifications_linux - sha256: e3c277b2daab8e36ac5a6820536668d07e83851aeeb79c446e525a70710770a5 + sha256: dce0116868cedd2cdf768af0365fc37ff1cbef7c02c4f51d0587482e625868d0 url: "https://pub.dev" source: hosted - version: "6.0.0" + version: "7.0.0" flutter_local_notifications_platform_interface: dependency: transitive description: name: flutter_local_notifications_platform_interface - sha256: "277d25d960c15674ce78ca97f57d0bae2ee401c844b6ac80fcd972a9c99d09fe" + sha256: "23de31678a48c084169d7ae95866df9de5c9d2a44be3e5915a2ff067aeeba899" url: "https://pub.dev" source: hosted - version: "9.1.0" + version: "10.0.0" flutter_local_notifications_windows: dependency: transitive description: name: flutter_local_notifications_windows - sha256: "8d658f0d367c48bd420e7cf2d26655e2d1130147bca1eea917e576ca76668aaf" + sha256: "7ddd964fa85b6a23e96956c5b63ef55cdb9e5947b71b95712204db42ad46da61" url: "https://pub.dev" source: hosted - version: "1.0.3" + version: "2.0.0" flutter_localizations: dependency: "direct main" description: flutter diff --git a/pubspec.yaml b/pubspec.yaml index efa133ad0..50502a964 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -31,7 +31,7 @@ dependencies: sdk: flutter flutter_foreground_task: ^9.2.0 flutter_linkify: ^6.0.0 - flutter_local_notifications: ^19.5.0 + flutter_local_notifications: ^20.0.0 flutter_localizations: sdk: flutter flutter_map: ^8.2.2