From aaa41bf36c575f19932eabda58ec9991cedd9ba3 Mon Sep 17 00:00:00 2001
From: Mateusz Grzegorzek <mateusz.grzegorzek@mudita.com>
Date: Mon, 23 Aug 2021 10:34:07 +0200
Subject: [PATCH] [BH-740] Split ServiceDB

Fix `DBQuery` msg handling in ServiceDB
---
 products/PurePhone/services/db/ServiceDB.cpp | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/products/PurePhone/services/db/ServiceDB.cpp b/products/PurePhone/services/db/ServiceDB.cpp
index f71f6546c6469229bb7c9d70148d91d2950db4c0..9c4a3b2e418f43b2347dc925109549a884cba104 100644
--- a/products/PurePhone/services/db/ServiceDB.cpp
+++ b/products/PurePhone/services/db/ServiceDB.cpp
@@ -73,7 +73,7 @@ db::Interface *ServiceDB::getInterface(db::Interface::Name interface)
 sys::MessagePointer ServiceDB::DataReceivedHandler(sys::DataMessage *msgl, sys::ResponseMessage *resp)
 {
     auto responseMsg = std::static_pointer_cast<sys::ResponseMessage>(ServiceDBCommon::DataReceivedHandler(msgl, resp));
-    if (!responseMsg) {
+    if (responseMsg) {
         return responseMsg;
     }
     auto type = static_cast<MessageType>(msgl->messageType);
@@ -182,18 +182,6 @@ sys::MessagePointer ServiceDB::DataReceivedHandler(sys::DataMessage *msgl, sys::
         sendUpdateNotification(db::Interface::Name::Calllog, db::Query::Type::Update);
     } break;
 
-    case MessageType::DBQuery: {
-        auto msg = dynamic_cast<db::QueryMessage *>(msgl);
-        assert(msg);
-        db::Interface *interface = getInterface(msg->getInterface());
-        assert(interface != nullptr);
-        auto query     = msg->getQuery();
-        auto queryType = query->type;
-        auto result    = interface->runQuery(std::move(query));
-        responseMsg    = std::make_shared<db::QueryResponse>(std::move(result));
-        sendUpdateNotification(msg->getInterface(), queryType);
-    } break;
-
     case MessageType::DBServiceBackup: {
         auto time   = utils::time::Scoped("DBServiceBackup");
         auto msg    = static_cast<DBServiceMessageBackup *>(msgl);