summaryrefslogtreecommitdiffstats
path: root/map/map.cpp
diff options
context:
space:
mode:
authorRaquel Medina <raquel.medina@konsulko.com>2020-03-18 23:56:31 +0100
committerRaquel Medina <raquel.medina@konsulko.com>2020-03-23 14:02:28 +0100
commit0ed292d3ccf93c889734960676a321d1166d3f66 (patch)
treeb8d64d1685d2f4bf599ab3867a0d3ff557ff0479 /map/map.cpp
parent5c750385d02116a92fa4c120ccc26abb8267bc97 (diff)
rework message hierarchy
Rework message hierarchy with the final objective of splitting libqtappfw into several libraries. This commit carries the following changes: - Simplify message hierarchy, keeping abstract Message class, adding specialization for call and event messages, keeping ResponseMessage, and removing all module specific specializations. - Add MessageFactory class to create message objects. - Change messages life cycle: using smart pointers and removing QObject from message hierarchy (a Message is not a QObject anymore and thus 'deleteLater()' is not available). - Adapt all modules to use new message hierarchy. - Keep ResponseMessage original constructor to avoid breaking TaskManager. - Message constructors have been kept public, but will go private on a follow-up patch (once TaskManager class has been modified to use new MessageFactory). Bug-AGL: SPEC-3112 Signed-off-by: Raquel Medina <raquel.medina@konsulko.com> Change-Id: I3a7a6325209ddeca2293f1ac745371861a947bfb
Diffstat (limited to 'map/map.cpp')
-rw-r--r--map/map.cpp74
1 files changed, 37 insertions, 37 deletions
diff --git a/map/map.cpp b/map/map.cpp
index 666efa1..e7a4157 100644
--- a/map/map.cpp
+++ b/map/map.cpp
@@ -16,9 +16,10 @@
#include <QDebug>
-#include "message.h"
-#include "mapmessage.h"
+#include "callmessage.h"
+#include "eventmessage.h"
#include "responsemessage.h"
+#include "messagefactory.h"
#include "messageengine.h"
#include "map.h"
@@ -39,77 +40,76 @@ Map::~Map()
void Map::compose(QString recipient, QString message)
{
- MapMessage *tmsg = new MapMessage();
+ std::unique_ptr<Message> msg = MessageFactory::getInstance().createOutboundMessage(MessageId::Call);
+ CallMessage* btmsg = static_cast<CallMessage*>(msg.get());
QJsonObject parameter;
parameter.insert("recipient", recipient);
parameter.insert("message", message);
- tmsg->createRequest("compose", parameter);
- m_mloop->sendMessage(tmsg);
- delete tmsg;
+ btmsg->createRequest("bluetooth-map", "compose", parameter);
+ m_mloop->sendMessage(std::move(msg));
}
void Map::message(QString handle)
{
- MapMessage *tmsg = new MapMessage();
+ std::unique_ptr<Message> msg = MessageFactory::getInstance().createOutboundMessage(MessageId::Call);
+ CallMessage* btmsg = static_cast<CallMessage*>(msg.get());
QJsonObject parameter;
parameter.insert("handle", handle);
- tmsg->createRequest("message", parameter);
- m_mloop->sendMessage(tmsg);
- delete tmsg;
+ btmsg->createRequest("bluetooth-map", "message", parameter);
+ m_mloop->sendMessage(std::move(msg));
}
void Map::listMessages(QString folder)
{
- MapMessage *tmsg = new MapMessage();
+ std::unique_ptr<Message> msg = MessageFactory::getInstance().createOutboundMessage(MessageId::Call);
+ CallMessage* btmsg = static_cast<CallMessage*>(msg.get());
QJsonObject parameter;
parameter.insert("folder", folder);
- tmsg->createRequest("list_messages", parameter);
- m_mloop->sendMessage(tmsg);
- delete tmsg;
+ btmsg->createRequest("bluetooth-map", "list_messages", parameter);
+ m_mloop->sendMessage(std::move(msg));
}
void Map::onConnected()
{
- MapMessage *tmsg = new MapMessage();
+ std::unique_ptr<Message> msg = MessageFactory::getInstance().createOutboundMessage(MessageId::Call);
+ CallMessage* btmsg = static_cast<CallMessage*>(msg.get());
QJsonObject parameter;
parameter.insert("value", "notification");
- tmsg->createRequest("subscribe", parameter);
- m_mloop->sendMessage(tmsg);
- delete tmsg;
+ btmsg->createRequest("bluetooth-map", "subscribe", parameter);
+ m_mloop->sendMessage(std::move(msg));
listMessages();
}
void Map::onDisconnected()
{
- MapMessage *tmsg = new MapMessage();
+ std::unique_ptr<Message> msg = MessageFactory::getInstance().createOutboundMessage(MessageId::Call);
+ CallMessage* btmsg = static_cast<CallMessage*>(msg.get());
QJsonObject parameter;
parameter.insert("value", "notification");
- tmsg->createRequest("unsubscribe", parameter);
- m_mloop->sendMessage(tmsg);
- delete tmsg;
+ btmsg->createRequest("bluetooth-map", "unsubscribe", parameter);
+ m_mloop->sendMessage(std::move(msg));
}
-void Map::onMessageReceived(MessageType type, Message *msg)
+void Map::onMessageReceived(std::shared_ptr<Message> msg)
{
- if (type == MessageType::MapEventMessage) {
- MapMessage *tmsg = qobject_cast<MapMessage*>(msg);
+ if (msg->isEvent()) {
+ std::shared_ptr<EventMessage> tmsg = std::static_pointer_cast<EventMessage>(msg);
- if (tmsg->isNotificationEvent()) {
+ if (tmsg->eventApi() != "bluetooth-map")
+ return;
+ if (tmsg->eventName() == "notification") {
emit notificationEvent(tmsg->eventData().toVariantMap());
}
- } else if (msg->isReply() && type == MessageType::ResponseRequestMessage) {
- ResponseMessage *tmsg = qobject_cast<ResponseMessage*>(msg);
-
- if (tmsg->requestVerb() == "list_messages") {
- QString folder = tmsg->requestParameters().value("folder").toString();
- QVariantMap listing = tmsg->replyData().value("messages").toObject().toVariantMap();
+ } else if (msg->isReply()) {
+ auto rmsg = std::static_pointer_cast<ResponseMessage>(msg);
+ if (rmsg->requestVerb() == "list_messages") {
+ QString folder = rmsg->requestParameters().value("folder").toString();
+ QVariantMap listing = rmsg->replyData().value("messages").toObject().toVariantMap();
emit listMessagesResult(folder, listing);
- } else if (tmsg->requestVerb() == "message") {
- QString handle = tmsg->requestParameters().value("handle").toString();
- emit messageResult(handle, tmsg->replyData().toVariantMap());
+ } else if (rmsg->requestVerb() == "message") {
+ QString handle = rmsg->requestParameters().value("handle").toString();
+ emit messageResult(handle, rmsg->replyData().toVariantMap());
}
}
-
- msg->deleteLater();
}