support recent comms and contacts

1 files changed, 7 insertions, 3 deletions

diff --git a/saltoqd/toqmanager.cpp b/saltoqd/toqmanager.cpp
index 27331da..3f850d1 100644
--- a/saltoqd/toqmanager.cpp
+++ b/saltoqd/toqmanager.cpp
@@ -7,10 +7,13 @@
 #include "fmsmanager.h"
 #include "storagemanager.h"
 #include "musicmanager.h"
+#include "contactsmanager.h"
 #include "commmanager.h"
 #include "voicecallmanager.h"
 #include "weathermanager.h"
 
+static const bool PROTO_DEBUG = true;
+
 ToqManager::ToqManager(const QBluetoothAddress &address, QObject *parent) :
 	QObject(parent),
 	_conn(new ToqConnection(address, this)),
@@ -20,7 +23,8 @@ ToqManager::ToqManager(const QBluetoothAddress &address, QObject *parent) :
 	_fmsManager(new FmsManager(_obex, this)),
 	_storageManager(new StorageManager(_obex, this)),
 	_musicManager(new MusicManager(this)),
-	_commManager(new CommManager(_storageManager, this)),
+	_contactsManager(new ContactsManager(_storageManager, this)),
+	_commManager(new CommManager(_storageManager, _contactsManager, this)),
 	_voiceCallManager(new VoiceCallManager(this)),
 	_weatherManager(new WeatherManager(_fmsManager, this))
 {
@@ -40,7 +44,7 @@ void ToqManager::setEndpointListener(ToqConnection::Endpoint ep, EndpointHandler
 
 void ToqManager::sendMessage(const ToqConnection::Message &msg)
 {
-	if (1) {
+	if (PROTO_DEBUG) {
 		QString json = QString::fromUtf8(msg.payload.toJson(QJsonDocument::Compact));
 		qDebug() << "Sending message to" << ToqConnection::nameOfEndpoint(msg.destination) << "from" << ToqConnection::nameOfEndpoint(msg.source) << "type" << msg.type << json;
 	}
@@ -73,7 +77,7 @@ void ToqManager::handleToqMessage(const ToqConnection::Message &msg)
 {
 	EndpointHandler *handler = _handlers.value(msg.destination, 0);
 
-	if (1) {
+	if (PROTO_DEBUG) {
 		QString json = QString::fromUtf8(msg.payload.toJson(QJsonDocument::Compact));
 		qDebug() << "Received message to" << ToqConnection::nameOfEndpoint(msg.destination) << "from" << ToqConnection::nameOfEndpoint(msg.destination) << "type" << msg.type << json;
 	}