share MessageEngine instance

Share MessageEngine instance among clients in the
same process using a common socket (same url).

- add MessageEngineFactory class;
- extend std::unordered_map<> to use QString as
key;
- use std::shared_ptr<MessageEngine> to share
ownership among MessageEngineFactory and the
engine clients;
- force MessagEngine parent object null to avoid
life cycle dependency on a parent;
- protect insertions & deletions in m_calls map;

Also, not directly related but as part of testing
these changes: cleanup on voice to remove
superflous model sorting (there's just one voice
model for alexa voice agent).

Bug-AGL: SPEC-3112
Signed-off-by: Raquel Medina <raquel.medina@konsulko.com>
Change-Id: Ie2304453dc37723dac13d256286eeb85f84ca2ab

2 files changed, 6 insertions, 7 deletions

diff --git a/telephony/telephony.cpp b/telephony/telephony.cpp
index 3efecc7..b31462c 100644
--- a/telephony/telephony.cpp
+++ b/telephony/telephony.cpp
@@ -20,24 +20,23 @@
 #include "eventmessage.h"
 #include "messagefactory.h"
 #include "messageengine.h"
+#include "messageenginefactory.h"
 #include "telephony.h"
 
 
 Telephony::Telephony (QUrl &url, QObject * parent) :
 	QObject(parent),
 	m_connected(false),
-	m_mloop(nullptr),
 	m_call_state("disconnected")
 {
-	m_mloop = new MessageEngine(url);
-	QObject::connect(m_mloop, &MessageEngine::connected, this, &Telephony::onConnected);
-	QObject::connect(m_mloop, &MessageEngine::disconnected, this, &Telephony::onDisconnected);
-	QObject::connect(m_mloop, &MessageEngine::messageReceived, this, &Telephony::onMessageReceived);
+	m_mloop = MessageEngineFactory::getInstance().getMessageEngine(url);
+	QObject::connect(m_mloop.get(), &MessageEngine::connected, this, &Telephony::onConnected);
+	QObject::connect(m_mloop.get(), &MessageEngine::disconnected, this, &Telephony::onDisconnected);
+	QObject::connect(m_mloop.get(), &MessageEngine::messageReceived, this, &Telephony::onMessageReceived);
 }
 
 Telephony::~Telephony()
 {
-	delete m_mloop;
 }
 
 void Telephony::dial(QString number)
diff --git a/telephony/telephony.h b/telephony/telephony.h
index ca1e52a..2aecc86 100644
--- a/telephony/telephony.h
+++ b/telephony/telephony.h
@@ -71,7 +71,7 @@ class Telephony : public QObject
 	private:
 		bool m_connected;
 		bool m_online;
-		MessageEngine *m_mloop;
+		std::shared_ptr<MessageEngine> m_mloop;
 		QString m_call_state;
 		QString m_clip;
 		QString m_colp;