Replace eldbus with gdbus (#150)

gin7773 · xiaowei-guan · web-flow · commit 8d36c27e4044 · 2026-03-06T14:05:48.000+09:00
Co-authored-by: xiaowei guan &lt;60122246+xiaowei-guan@users.noreply.github.com&gt;
diff --git a/flutter/shell/platform/tizen/BUILD.gn b/flutter/shell/platform/tizen/BUILD.gn
@@ -25,13 +25,14 @@ config("flutter_tizen_config") {
     "${sysroot_path}/usr/include/efl-1",
     "${sysroot_path}/usr/include/eina-1",
     "${sysroot_path}/usr/include/eina-1/eina",
-    "${sysroot_path}/usr/include/eldbus-1",
     "${sysroot_path}/usr/include/eo-1",
     "${sysroot_path}/usr/include/feedback",
     "${sysroot_path}/usr/include/system",
     "${sysroot_path}/usr/include/tzsh",
     "${sysroot_path}/usr/include/vconf",
     "${sysroot_path}/usr/include/wayland-extension",
+    "${sysroot_path}/usr/include/glib-2.0",
+    "${sysroot_path}/usr/lib/glib-2.0/include",
   ]
 
   cflags_cc = [
@@ -117,7 +118,7 @@ template("embedder") {
       "ecore_input",
       "ecore_wl2",
       "eina",
-      "eldbus",
+      "gio-2.0",
       "feedback",
       "flutter_engine",
       "tbm",
diff --git a/flutter/shell/platform/tizen/channels/accessibility_channel.cc b/flutter/shell/platform/tizen/channels/accessibility_channel.cc
@@ -22,44 +22,83 @@ constexpr char kAtspiDirectReadInterface[] = "org.tizen.DirectReading";
 
 }  // namespace
 
-static void _accessibilityBusAddressGet(void* data,
-                                        const Eldbus_Message* message,
-                                        Eldbus_Pending* pending) {
-  Eldbus_Connection** accessibility_bus =
-      static_cast<Eldbus_Connection**>(data);
-  const char* error_name = nullptr;
-  const char* error_message = nullptr;
-  const char* socket_address = nullptr;
-
-  if (eldbus_message_error_get(message, &error_name, &error_message)) {
-    FT_LOG(Error) << "Eldbus message error. (" << error_name << " : "
-                  << error_message << ")";
+static void _readCommandCallback(GObject* source_object,
+                                 GAsyncResult* res,
+                                 gpointer user_data) {
+  g_autoptr(GError) error = nullptr;
+
+  g_dbus_connection_call_finish(G_DBUS_CONNECTION(source_object), res, &error);
+
+  if (error) {
+    FT_LOG(Error) << "ReadCommand failed: " << error->message;
+  } else {
+    FT_LOG(Info) << "ReadCommand succeeded";
+  }
+}
+
+void AccessibilityChannel::OnAccessibilityBusAddressGet(GObject* source_object,
+                                                        GAsyncResult* res,
+                                                        gpointer user_data) {
+  g_autoptr(GError) error = nullptr;
+  g_autoptr(GVariant) result = nullptr;
+
+  result = g_dbus_connection_call_finish(G_DBUS_CONNECTION(source_object), res,
+                                         &error);
+  if (error) {
+    FT_LOG(Error) << "Failed to connect session bus: " << error->message;
     return;
   }
 
-  if (!eldbus_message_arguments_get(message, "s", &socket_address) ||
-      !socket_address) {
-    FT_LOG(Error) << "Could not get A11Y Bus socket address.";
+  const gchar* socket_address = nullptr;
+  g_variant_get(result, "(&s)", &socket_address);
+
+  auto* self = static_cast<AccessibilityChannel*>(user_data);
+  self->accessibility_bus_ = g_dbus_connection_new_for_address_sync(
+      socket_address,
+      static_cast<GDBusConnectionFlags>(
+          G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_CLIENT |
+          G_DBUS_CONNECTION_FLAGS_MESSAGE_BUS_CONNECTION),
+      nullptr, nullptr, &error);
+  if (error) {
+    FT_LOG(Error) << "Failed to connect to A11Y Bus: " << error->message;
     return;
   }
-  *accessibility_bus = eldbus_private_address_connection_get(socket_address);
+
+  g_dbus_connection_set_exit_on_close(self->accessibility_bus_, FALSE);
+
+  FT_LOG(Info) << "Successfully connected to A11Y Bus at:  " << socket_address;
+}
+
+void AccessibilityChannel::OnSessionBusConnection(GObject* source_object,
+                                                  GAsyncResult* res,
+                                                  gpointer user_data) {
+  g_autoptr(GError) error = nullptr;
+  GDBusConnection* session_bus = g_bus_get_finish(res, &error);
+  if (error) {
+    FT_LOG(Error) << "Failed to get session bus: " << error->message;
+    return;
+  }
+
+  auto* self = static_cast<AccessibilityChannel*>(user_data);
+  if (self->session_bus_) {
+    g_object_unref(self->session_bus_);
+  }
+  self->session_bus_ = session_bus;
+
+  g_dbus_connection_call(
+      session_bus, kAccessibilityDbus, kAccessibilityDbusPath,
+      kAccessibilityDbusInterface, "GetAddress", nullptr, G_VARIANT_TYPE("(s)"),
+      G_DBUS_CALL_FLAGS_NONE, -1, nullptr,
+      (GAsyncReadyCallback)OnAccessibilityBusAddressGet, self);
 }
 
 AccessibilityChannel::AccessibilityChannel(BinaryMessenger* messenger)
     : channel_(std::make_unique<BasicMessageChannel<EncodableValue>>(
           messenger,
           kChannelName,
           &StandardMessageCodec::GetInstance())) {
-  eldbus_init();
-
-  session_bus_ = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SESSION);
-  bus_ = eldbus_object_get(session_bus_, kAccessibilityDbus,
-                           kAccessibilityDbusPath);
-
-  Eldbus_Message* method = eldbus_object_method_call_new(
-      bus_, kAccessibilityDbusInterface, "GetAddress");
-  eldbus_object_send(bus_, method, _accessibilityBusAddressGet,
-                     &accessibility_bus_, 100);
+  g_bus_get(G_BUS_TYPE_SESSION, nullptr,
+            (GAsyncReadyCallback)OnSessionBusConnection, this);
 
   channel_->SetMessageHandler([&](const auto& message, auto reply) {
     if (std::holds_alternative<EncodableMap>(message)) {
@@ -72,14 +111,23 @@ AccessibilityChannel::AccessibilityChannel(BinaryMessenger* messenger)
         if (*type == "announce" && data) {
           EncodableValueHolder<std::string> msg(data.value, "message");
           if (msg && accessibility_bus_) {
-            Eldbus_Message* eldbus_message = eldbus_message_method_call_new(
-                kAtspiDirectReadBus, kAtspiDirectReadPath,
-                kAtspiDirectReadInterface, "ReadCommand");
-            Eldbus_Message_Iter* iter = eldbus_message_iter_get(eldbus_message);
-            eldbus_message_iter_arguments_append(iter, "sb", msg->c_str(),
-                                                 true);
-            eldbus_connection_send(accessibility_bus_, eldbus_message, nullptr,
-                                   nullptr, -1);
+            FT_LOG(Info)
+                << "A11Y Bus pointer exists, calling ReadCommand with message: "
+                << msg->c_str();
+            GVariant* params = g_variant_new("(sb)", msg->c_str(), TRUE);
+            if (!params) {
+              FT_LOG(Error) << "Failed to create GVariant parameters";
+              return;
+            }
+            g_dbus_connection_call(
+                accessibility_bus_, kAtspiDirectReadBus, kAtspiDirectReadPath,
+                kAtspiDirectReadInterface, "ReadCommand", params, nullptr,
+                G_DBUS_CALL_FLAGS_NONE, -1, nullptr,
+                (GAsyncReadyCallback)_readCommandCallback, nullptr);
+          } else if (msg) {
+            FT_LOG(Error) << "A11Y Bus is not initialized. Cannot call "
+                             "ReadCommand for message: "
+                          << msg->c_str();
           }
         }
       }
@@ -91,11 +139,15 @@ AccessibilityChannel::AccessibilityChannel(BinaryMessenger* messenger)
 AccessibilityChannel::~AccessibilityChannel() {
   channel_->SetMessageHandler(nullptr);
 
-  eldbus_connection_unref(accessibility_bus_);
-  eldbus_connection_unref(session_bus_);
-  eldbus_object_unref(bus_);
+  if (accessibility_bus_) {
+    g_object_unref(accessibility_bus_);
+    accessibility_bus_ = nullptr;
+  }
 
-  eldbus_shutdown();
+  if (session_bus_) {
+    g_object_unref(session_bus_);
+    session_bus_ = nullptr;
+  }
 }
 
 }  // namespace flutter
diff --git a/flutter/shell/platform/tizen/channels/accessibility_channel.h b/flutter/shell/platform/tizen/channels/accessibility_channel.h
@@ -5,7 +5,7 @@
 #ifndef EMBEDDER_ACCESSIBILITY_CHANNEL_H_
 #define EMBEDDER_ACCESSIBILITY_CHANNEL_H_
 
-#include <Eldbus.h>
+#include <gio/gio.h>
 
 #include <functional>
 #include <memory>
@@ -20,12 +20,19 @@ class AccessibilityChannel {
   explicit AccessibilityChannel(BinaryMessenger* messenger);
   virtual ~AccessibilityChannel();
 
+ private:
+  static void OnAccessibilityBusAddressGet(GObject* source_object,
+                                           GAsyncResult* res,
+                                           gpointer user_data);
+  static void OnSessionBusConnection(GObject* source_object,
+                                     GAsyncResult* res,
+                                     gpointer user_data);
+
  private:
   std::unique_ptr<BasicMessageChannel<EncodableValue>> channel_;
 
-  Eldbus_Connection* session_bus_ = nullptr;
-  Eldbus_Connection* accessibility_bus_ = nullptr;
-  Eldbus_Object* bus_ = nullptr;
+  GDBusConnection* session_bus_ = nullptr;
+  GDBusConnection* accessibility_bus_ = nullptr;
 };
 
 }  // namespace flutter
diff --git a/tools/generate_sysroot.py b/tools/generate_sysroot.py
@@ -59,10 +59,9 @@
   'eina',
   'eina-devel',
   'eina-tools',
-  'eldbus',
-  'eldbus-devel',
   'eo-devel',
   'glib2-devel',
+  'libgio',
   'jsoncpp',
   'jsoncpp-devel',
   'libatk',
