2 files changed, 13 insertions(+), 0 deletions(-)

M module-services/service-bluetooth/ServiceBluetooth.cpp
M module-services/service-bluetooth/service-bluetooth/ServiceBluetooth.hpp

@@ 13,6 13,7 @@
 #include "service-bluetooth/messages/AudioVolume.hpp"
 #include "service-bluetooth/messages/AudioRouting.hpp"
 #include "service-bluetooth/messages/Connect.hpp"
+#include <service-bluetooth/messages/DeviceName.hpp>
 #include "service-bluetooth/messages/Disconnect.hpp"
 #include "service-bluetooth/messages/Status.hpp"
 #include "service-bluetooth/messages/SetStatus.hpp"


@@ 85,6 86,7 @@ sys::ReturnCodes ServiceBluetooth::InitHandler()
     connectHandler<message::bluetooth::Disconnect>();
     connectHandler<message::bluetooth::DisconnectResult>();
     connectHandler<message::bluetooth::RequestBondedDevices>();
+    connectHandler<message::bluetooth::RequestDeviceName>();
     connectHandler<message::bluetooth::RequestStatus>();
     connectHandler<message::bluetooth::SetDeviceName>();
     connectHandler<message::bluetooth::SetStatus>();


@@ 196,6 198,15 @@ auto ServiceBluetooth::handle(message::bluetooth::Unpair *msg) -> std::shared_pt
     return sys::MessageNone{};
 }
 
+auto ServiceBluetooth::handle([[maybe_unused]] message::bluetooth::RequestDeviceName *msg)
+    -> std::shared_ptr<sys::Message>
+{
+    auto deviceNameString =
+        std::visit(bluetooth::StringVisitor(), this->settingsHolder->getValue(bluetooth::Settings::DeviceName));
+
+    return std::make_shared<message::bluetooth::ResponseDeviceName>(std::move(deviceNameString));
+}
+
 auto ServiceBluetooth::handle(message::bluetooth::SetDeviceName *msg) -> std::shared_ptr<sys::Message>
 {
     auto newName = msg->getName();

@@ 39,6 39,7 @@ namespace message::bluetooth
     class RequestStatus;
     class SetStatus;
     class Unpair;
+    class RequestDeviceName;
     class SetDeviceName;
     class Connect;
     class ConnectResult;


@@ 84,6 85,7 @@ class ServiceBluetooth : public sys::Service
     [[nodiscard]] auto handle(message::bluetooth::SetStatus *msg) -> std::shared_ptr<sys::Message>;
     [[nodiscard]] auto handle(BluetoothPairMessage *msg) -> std::shared_ptr<sys::Message>;
     [[nodiscard]] auto handle(message::bluetooth::Unpair *msg) -> std::shared_ptr<sys::Message>;
+    [[nodiscard]] auto handle(message::bluetooth::RequestDeviceName *msg) -> std::shared_ptr<sys::Message>;
     [[nodiscard]] auto handle(message::bluetooth::SetDeviceName *msg) -> std::shared_ptr<sys::Message>;
     [[nodiscard]] auto handle(message::bluetooth::Connect *msg) -> std::shared_ptr<sys::Message>;
     [[nodiscard]] auto handle(message::bluetooth::ConnectResult *msg) -> std::shared_ptr<sys::Message>;