[flutter_local_notifications] linux support #888
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,12 +16,12 @@ import 'platform_specifics/ios/enums.dart'; | |
| import 'platform_specifics/ios/initialization_settings.dart'; | ||
| import 'platform_specifics/ios/method_channel_mappers.dart'; | ||
| import 'platform_specifics/ios/notification_details.dart'; | ||
| import 'platform_specifics/linux/initialization_settings.dart'; | ||
| import 'platform_specifics/linux/method_channel_mappers.dart'; | ||
| import 'platform_specifics/linux/notification_details.dart'; | ||
| import 'platform_specifics/macos/initialization_settings.dart'; | ||
| import 'platform_specifics/macos/method_channel_mappers.dart'; | ||
| import 'platform_specifics/macos/notification_details.dart'; | ||
| import 'type_mappers.dart'; | ||
| import 'typedefs.dart'; | ||
| import 'types.dart'; | ||
|
|
@@ -667,21 +667,24 @@ class MacOSFlutterLocalNotificationsPlugin | |
| class LinuxFlutterLocalNotificationsPlugin | ||
|
There was a problem hiding this comment. there are some analysis warnings here and there in |
||
| extends MethodChannelFlutterLocalNotificationsPlugin { | ||
| SelectNotificationCallback _onSelectNotification; | ||
| final Map<int, Map<String, LinuxNotificationButtonHandler>> | ||
| _notificationButtonHandlerMap = | ||
| <int, Map<String, LinuxNotificationButtonHandler>>{}; | ||
| final Map<int, Map<String, LinuxNotificationButtonHandler>> | ||
| _periodicNotificationButtonHandlerMap = | ||
| <int, Map<String, LinuxNotificationButtonHandler>>{}; | ||
|
|
||
| Future<bool> initialize( | ||
| LinuxInitializationSettings initializationSettings, { | ||
| SelectNotificationCallback onSelectNotification, | ||
| }) async { | ||
| _onSelectNotification = onSelectNotification; | ||
| _channel.setMethodCallHandler(_handleMethod); | ||
| return await _channel.invokeMethod( | ||
| 'initialize', initializationSettings?.toMap()); | ||
| } | ||
|
|
||
| @override | ||
| Future<void> show( | ||
| int id, | ||
| String title, | ||
|
|
@@ -690,11 +693,11 @@ class LinuxFlutterLocalNotificationsPlugin | |
| String payload, | ||
| }) { | ||
| validateId(id); | ||
| _notificationButtonHandlerMap[id] = notificationDetails != null | ||
| ? <String, LinuxNotificationButtonHandler> { | ||
| for (final LinuxNotificationButton button in notificationDetails.buttons) | ||
| button.buttonId : button.handler, | ||
| } : null; | ||
| return _channel.invokeMethod('show', <String, Object> { | ||
|
There was a problem hiding this comment. This should be the only method that specifies It also prevents the show method on the C++ side from being responsible for triggering notifications in multiple ways as is the case right now. This makes it more risky to change code as a common method is being used for the various plugin APIs. I get why it was done as I did a similar thing in the past but that caused issues with maintenance. Making the change should also resolve the comment @jpnurmi raised on how the implementation of |
||
| 'id': id, | ||
| 'title': title, | ||
|
|
@@ -704,6 +707,7 @@ class LinuxFlutterLocalNotificationsPlugin | |
| }); | ||
| } | ||
|
|
||
| @override | ||
| Future<void> periodicallyShow( | ||
| int id, | ||
| String title, | ||
|
|
@@ -713,11 +717,11 @@ class LinuxFlutterLocalNotificationsPlugin | |
| String payload, | ||
| }) { | ||
| validateId(id); | ||
| _periodicNotificationButtonHandlerMap[id] = notificationDetails != null | ||
| ? <String, LinuxNotificationButtonHandler> { | ||
| for (final LinuxNotificationButton button in notificationDetails.buttons) | ||
| button.buttonId : button.handler, | ||
| } : null; | ||
| return _channel.invokeMethod('show', <String, Object> { | ||
| 'id': id, | ||
| 'title': title, | ||
|
|
@@ -739,7 +743,13 @@ class LinuxFlutterLocalNotificationsPlugin | |
| }) async { | ||
| validateId(id); | ||
| validateDateIsInTheFuture(scheduledDate); | ||
| _periodicNotificationButtonHandlerMap[id] = notificationDetails != null | ||
| ? <String, LinuxNotificationButtonHandler> { | ||
| for (final LinuxNotificationButton button in notificationDetails.buttons) | ||
| button.buttonId : button.handler, | ||
| } : null; | ||
| final Map<String, Object> serializedPlatformSpecifics | ||
| = notificationDetails?.toMap(); | ||
| await _channel.invokeMethod( | ||
| 'show', | ||
| <String, Object>{ | ||
|
|
@@ -754,48 +764,54 @@ class LinuxFlutterLocalNotificationsPlugin | |
| ..addAll(scheduledDate.toMap())); | ||
| } | ||
|
|
||
| @override | ||
| Future<void> cancel(int id) { | ||
| validateId(id); | ||
| if (_notificationButtonHandlerMap.remove(id) != null) { | ||
| return _channel.invokeMethod('cancel', id); | ||
| } else if (_periodicNotificationButtonHandlerMap.remove(id) != null) { | ||
| return _channel.invokeMethod('cancelPeriodicNotification', id); | ||
|
There was a problem hiding this comment. Call |
||
| } else { | ||
| throw ArgumentError.value(id, 'id', 'id is invalid'); | ||
| } | ||
| } | ||
|
|
||
| @override | ||
| Future<void> cancelAll() async { | ||
| for (final int id in _notificationButtonHandlerMap.keys) { | ||
|
There was a problem hiding this comment. What happens if the user triggers a notification that is displayed, leaves the notification there and restarts the app? If I'm not mistaken, looks as though cancelling notifications and handling buttons would rely on having the same app session active. FYI that cancelling notifications and handling when the user taps on a notification (note: other platforms don't support action buttons at the moment) for all other platforms can be done even if the user restarted the app so if what I described is indeed how it works right now (as I'm still having some trouble with my Linux environment to test) then a solution will need to be found for Linux to behave the same. I imagine, this would potentially need to rely on persisting some information about the notification |
||
| await _channel.invokeMethod('cancel', id); | ||
| } | ||
| for (final int id in _periodicNotificationButtonHandlerMap.keys) { | ||
| await _channel.invokeMethod('cancelPeriodicNotification', id); | ||
| } | ||
| _notificationButtonHandlerMap.clear(); | ||
| _periodicNotificationButtonHandlerMap.clear(); | ||
| } | ||
|
|
||
| Future<void> _handleMethod(MethodCall call) { | ||
| switch (call.method) { | ||
| case 'selectNotification': | ||
| final Map<dynamic, dynamic> args = call.arguments; | ||
| _notificationButtonHandlerMap.remove(args['id']); | ||
| _onSelectNotification(args['payload']); | ||
| break; | ||
| case 'selectNotificationButton': | ||
| final Map<dynamic, dynamic> args = call.arguments; | ||
| final int id = args['id']; | ||
| final String buttonId = args['buttonId']; | ||
| final Map<String, LinuxNotificationButtonHandler> buttonHandlerMap | ||
| = _notificationButtonHandlerMap.remove(id) | ||
| ?? _periodicNotificationButtonHandlerMap[id]; | ||
| assert(buttonHandlerMap != null, 'Handler map is corrupted'); | ||
| final LinuxNotificationButtonHandler handler = | ||
| buttonHandlerMap[buttonId]; | ||
| if (handler != null) { | ||
| handler(id, buttonId); | ||
| } | ||
| break; | ||
| default: | ||
| return Future<void>.error('Method not defined'); | ||
| } | ||
| return Future<void>.value(); | ||
| } | ||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,7 +23,8 @@ class LinuxFileIcon implements LinuxIcon { | |
| } | ||
|
|
||
| /// Represents an icon from binary data | ||
| /// The binary data should be in an image file format which supported by glib, | ||
| /// such as common formats like jpg and png | ||
| class BytesLinuxIcon implements LinuxIcon { | ||
|
There was a problem hiding this comment. This reads slight awkward. Could this perhaps be renamed to something else like |
||
| const BytesLinuxIcon(this.data); | ||
|
|
||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
add the same one-liner doc as the others around, to avoid affecting pub score?