[linux] Implemented close and destroy method. #2

Author: lijy91

lib/src/local_notifier.dart

@@ -74,7 +74,7 @@ class LocalNotifier {
 
   /// Immediately shows the notification to the user.
   Future<void> notify(LocalNotification notification) async {
-    if (Platform.isWindows && _appName == null) {
+    if ((Platform.isLinux || Platform.isWindows) && _appName == null) {
       throw Exception(
         'Missing appName, must call `localNotifier.setAppName` to set.',
       );

linux/local_notifier_plugin.cc

@@ -4,17 +4,25 @@
 #include <gtk/gtk.h>
 #include <sys/utsname.h>
 
+#include <algorithm>
 #include <cstring>
+#include <map>
+#include <vector>
 
 #include <libnotify/notify.h>
 
 #define LOCAL_NOTIFIER_PLUGIN(obj)                                     \
   (G_TYPE_CHECK_INSTANCE_CAST((obj), local_notifier_plugin_get_type(), \
                               LocalNotifierPlugin))
 
+LocalNotifierPlugin* plugin_instance;
+std::map<std::string, int> notification_id_map_;
+std::vector<NotifyNotification*> notifications_;
+
 struct _LocalNotifierPlugin {
   GObject parent_instance;
   FlPluginRegistrar* registrar;
+  FlMethodChannel* channel;
 };
 
 G_DEFINE_TYPE(LocalNotifierPlugin, local_notifier_plugin, g_object_get_type())
@@ -32,17 +40,113 @@ GdkWindow* get_gdk_window(LocalNotifierPlugin* self) {
   return gtk_widget_get_window(GTK_WIDGET(get_window(self)));
 }
 
+const char* _get_identifier(NotifyNotification* notification) {
+  int notification_id = -1;
+  g_object_get(G_OBJECT(notification), "id", &notification_id, NULL);
+
+  auto result = std::find_if(
+      notification_id_map_.begin(), notification_id_map_.end(),
+      [notification_id](const auto& e) { return e.second == notification_id; });
+
+  if (result != notification_id_map_.end())
+    return result->first.c_str();
+
+  return "";
+}
+
+void _on_notification_close(NotifyNotification* notification,
+                            gpointer user_data) {
+  const char* identifier = _get_identifier(notification);
+
+  g_autoptr(FlValue) result_data = fl_value_new_map();
+  fl_value_set_string_take(result_data, "notificationId",
+                           fl_value_new_string(identifier));
+  fl_method_channel_invoke_method(plugin_instance->channel,
+                                  "onLocalNotificationClose", result_data,
+                                  nullptr, nullptr, nullptr);
+}
+
+void _action_callback(NotifyNotification* notification,
+                      char* action,
+                      gpointer user_data) {
+  const char* identifier = _get_identifier(notification);
+
+  gint index = GPOINTER_TO_INT(user_data);
+
+  g_autoptr(FlValue) result_data = fl_value_new_map();
+  fl_value_set_string_take(result_data, "notificationId",
+                           fl_value_new_string(identifier));
+  fl_value_set_string_take(result_data, "actionIndex", fl_value_new_int(index));
+  fl_method_channel_invoke_method(plugin_instance->channel,
+                                  "onLocalNotificationClickAction", result_data,
+                                  nullptr, nullptr, nullptr);
+}
+
 static FlMethodResponse* notify(LocalNotifierPlugin* self, FlValue* args) {
+  const gchar* app_name =
+      fl_value_get_string(fl_value_lookup_string(args, "appName"));
+
+  const gchar* identifier =
+      fl_value_get_string(fl_value_lookup_string(args, "identifier"));
   const gchar* title =
       fl_value_get_string(fl_value_lookup_string(args, "title"));
-  const gchar* subtitle =
-      fl_value_get_string(fl_value_lookup_string(args, "subtitle"));
-  // const gchar *body = fl_value_get_string(fl_value_lookup_string(args,
-  // "body"));
+  const gchar* body = fl_value_get_string(fl_value_lookup_string(args, "body"));
+  FlValue* actions_value = fl_value_lookup_string(args, "actions");
+
+  notify_init(app_name);
+  NotifyNotification* notification = notify_notification_new(title, body, 0);
+  notify_notification_set_app_name(notification, app_name);
+
+  for (gint i = 0; i < fl_value_get_length(actions_value); i++) {
+    FlValue* action_item_value = fl_value_get_list_value(actions_value, i);
+    const char* action_text =
+        fl_value_get_string(fl_value_lookup_string(action_item_value, "text"));
+
+    notify_notification_add_action(notification, action_text,  // action
+                                   action_text,                // label
+                                   (NotifyActionCallback)_action_callback,
+                                   GINT_TO_POINTER(i),  // user_data,
+                                   NULL);
+  }
+
+  notify_notification_show(notification, 0);
+
+  g_signal_connect(notification, "closed", G_CALLBACK(_on_notification_close),
+                   NULL);
+
+  notifications_.push_back(notification);
 
-  notify_init("local_notifier");
-  NotifyNotification* n = notify_notification_new(title, subtitle, 0);
-  notify_notification_show(n, 0);
+  int notification_id = -1;
+  g_object_get(G_OBJECT(notification), "id", &notification_id, NULL);
+
+  notification_id_map_.erase(identifier);
+  notification_id_map_.insert(
+      std::pair<std::string, int>(identifier, notification_id));
+
+  g_autoptr(FlValue) result_data = fl_value_new_map();
+  fl_value_set_string_take(result_data, "notificationId",
+                           fl_value_new_string(identifier));
+  fl_method_channel_invoke_method(plugin_instance->channel,
+                                  "onLocalNotificationShow", result_data,
+                                  nullptr, nullptr, nullptr);
+
+  return FL_METHOD_RESPONSE(
+      fl_method_success_response_new(fl_value_new_bool(true)));
+}
+
+static FlMethodResponse* close(LocalNotifierPlugin* self, FlValue* args) {
+  const gchar* identifier =
+      fl_value_get_string(fl_value_lookup_string(args, "identifier"));
+
+  for (int i = 0; i < notifications_.size(); i++) {
+    NotifyNotification* notification = notifications_[i];
+    const char* item_identifier = _get_identifier(notification);
+    if (strcmp(identifier, item_identifier) == 0) {
+      notify_notification_close(notification, NULL);
+      notifications_.erase(notifications_.begin() + i);
+      break;
+    }
+  }
 
   return FL_METHOD_RESPONSE(
       fl_method_success_response_new(fl_value_new_bool(true)));
@@ -58,6 +162,8 @@ static void local_notifier_plugin_handle_method_call(
   FlValue* args = fl_method_call_get_args(method_call);
   if (strcmp(method, "notify") == 0) {
     response = notify(self, args);
+  } else if (strcmp(method, "close") == 0) {
+    response = close(self, args);
   } else {
     response = FL_METHOD_RESPONSE(fl_method_not_implemented_response_new());
   }
@@ -90,11 +196,13 @@ void local_notifier_plugin_register_with_registrar(
   plugin->registrar = FL_PLUGIN_REGISTRAR(g_object_ref(registrar));
 
   g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new();
-  g_autoptr(FlMethodChannel) channel =
+  plugin->channel =
       fl_method_channel_new(fl_plugin_registrar_get_messenger(registrar),
                             "local_notifier", FL_METHOD_CODEC(codec));
   fl_method_channel_set_method_call_handler(
-      channel, method_call_cb, g_object_ref(plugin), g_object_unref);
+      plugin->channel, method_call_cb, g_object_ref(plugin), g_object_unref);
+
+  plugin_instance = plugin;
 
   g_object_unref(plugin);
 }

test/local_notifier_test.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:local_notifier/local_notifier.dart';
+// import 'package:local_notifier/local_notifier.dart';
 
 void main() {
   const MethodChannel channel = MethodChannel('local_notifier');