[a11y] Support for "announce" of AccessibilityChannel (#75)

Author: JSUYA

flutter/shell/platform/tizen/BUILD.gn

@@ -35,6 +35,7 @@ config("flutter_tizen_config") {
     "${sysroot_path}/usr/include/efreet-1",
     "${sysroot_path}/usr/include/eina-1",
     "${sysroot_path}/usr/include/eina-1/eina",
+    "${sysroot_path}/usr/include/eldbus-1",
     "${sysroot_path}/usr/include/elementary-1",
     "${sysroot_path}/usr/include/emile-1",
     "${sysroot_path}/usr/include/eo-1",
@@ -140,6 +141,7 @@ template("embedder") {
       "ecore_wl2",
       "efl-extension",
       "eina",
+      "eldbus",
       "elementary",
       "eom",
       "evas",

flutter/shell/platform/tizen/channels/accessibility_channel.cc

@@ -4,8 +4,6 @@
 
 #include "accessibility_channel.h"
 
-#include <Elementary.h>
-
 #include "flutter/shell/platform/common/client_wrapper/include/flutter/standard_message_codec.h"
 #include "flutter/shell/platform/tizen/channels/encodable_value_holder.h"
 #include "flutter/shell/platform/tizen/logger.h"
@@ -15,14 +13,52 @@ namespace flutter {
 namespace {
 
 constexpr char kChannelName[] = "flutter/accessibility";
+constexpr char kAccessibilityDbus[] = "org.a11y.Bus";
+constexpr char kAccessibilityDbusPath[] = "/org/a11y/bus";
+constexpr char kAccessibilityDbusInterface[] = "org.a11y.Bus";
+constexpr char kAtspiDirectReadBus[] = "org.tizen.ScreenReader";
+constexpr char kAtspiDirectReadPath[] = "/org/tizen/DirectReading";
+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 << ")";
+    return;
+  }
+
+  if (!eldbus_message_arguments_get(message, "s", &socket_address) ||
+      !socket_address) {
+    FT_LOG(Error) << "Could not get A11Y Bus socket address.";
+    return;
+  }
+  *accessibility_bus = eldbus_private_address_connection_get(socket_address);
+}
+
 AccessibilityChannel::AccessibilityChannel(BinaryMessenger* messenger)
     : channel_(std::make_unique<BasicMessageChannel<EncodableValue>>(
           messenger,
           kChannelName,
           &StandardMessageCodec::GetInstance())) {
+  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);
+
   channel_->SetMessageHandler([&](const auto& message, auto reply) {
     if (std::holds_alternative<EncodableMap>(message)) {
       auto map = std::get<EncodableMap>(message);
@@ -33,8 +69,15 @@ AccessibilityChannel::AccessibilityChannel(BinaryMessenger* messenger)
         FT_LOG(Info) << "Received " << *type << " message.";
         if (*type == "announce" && data) {
           EncodableValueHolder<std::string> msg(data.value, "message");
-          if (msg) {
-            elm_atspi_bridge_utils_say(msg->c_str(), true, nullptr, nullptr);
+          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);
           }
         }
       }
@@ -45,6 +88,10 @@ AccessibilityChannel::AccessibilityChannel(BinaryMessenger* messenger)
 
 AccessibilityChannel::~AccessibilityChannel() {
   channel_->SetMessageHandler(nullptr);
+
+  eldbus_connection_unref(accessibility_bus_);
+  eldbus_connection_unref(session_bus_);
+  eldbus_object_unref(bus_);
 }
 
 }  // namespace flutter

flutter/shell/platform/tizen/channels/accessibility_channel.h

@@ -5,6 +5,8 @@
 #ifndef EMBEDDER_ACCESSIBILITY_CHANNEL_H_
 #define EMBEDDER_ACCESSIBILITY_CHANNEL_H_
 
+#include <Eldbus.h>
+
 #include <functional>
 #include <memory>
 
@@ -20,6 +22,10 @@ class AccessibilityChannel {
 
  private:
   std::unique_ptr<BasicMessageChannel<EncodableValue>> channel_;
+
+  Eldbus_Connection* session_bus_ = nullptr;
+  Eldbus_Connection* accessibility_bus_ = nullptr;
+  Eldbus_Object* bus_ = nullptr;
 };
 
 }  // namespace flutter

tools/generate_sysroot.py

@@ -71,6 +71,8 @@
   'eina',
   'eina-devel',
   'eina-tools',
+  'eldbus',
+  'eldbus-devel',
   'elementary',
   'elementary-devel',
   'emile-devel',