From 6e1f9ebda198da640cfbcd13d4b48ffb01fd2883 Mon Sep 17 00:00:00 2001 From: Mati Date: Tue, 11 Jun 2019 13:32:53 +0200 Subject: [PATCH] Removed test code, small update in ServiceDB's destructor. Ready to merge --- .../service-appmgr/ApplicationManager.cpp | 2 +- module-services/service-db/ServiceDB.cpp | 4 ++++ source/main.cpp | 21 ++----------------- 3 files changed, 7 insertions(+), 20 deletions(-) diff --git a/module-services/service-appmgr/ApplicationManager.cpp b/module-services/service-appmgr/ApplicationManager.cpp index fc0ab8030..8ea5538d0 100644 --- a/module-services/service-appmgr/ApplicationManager.cpp +++ b/module-services/service-appmgr/ApplicationManager.cpp @@ -84,7 +84,7 @@ sys::ReturnCodes ApplicationManager::InitHandler() { //search for application with specified name and run it //TODO name of the app should be Homescreen but for tests is is "ApplicationClock" - std::string runAppName = "ApplicationViewer"; + std::string runAppName = "ApplicationClock"; auto it = applications.find(runAppName); if( it!= applications.end()){ diff --git a/module-services/service-db/ServiceDB.cpp b/module-services/service-db/ServiceDB.cpp index ec0ce7993..20b08d03f 100644 --- a/module-services/service-db/ServiceDB.cpp +++ b/module-services/service-db/ServiceDB.cpp @@ -35,6 +35,10 @@ ServiceDB::ServiceDB() ServiceDB::~ServiceDB() { + settingsDB.reset(); + contactsDB.reset(); + smsDB.reset(); + Database::Deinitialize(); LOG_INFO("[ServiceDB] Cleaning resources"); } diff --git a/source/main.cpp b/source/main.cpp index a58d7476b..b98ca27f8 100644 --- a/source/main.cpp +++ b/source/main.cpp @@ -124,30 +124,13 @@ public: // Invoked upon receiving data message sys::Message_t DataReceivedHandler(sys::DataMessage* msgl) override{ - auto ret = DBServiceAPI::SettingsGet(this); - - ret.language = SettingsLanguage ::GERMAN; - ret.networkOperator = "MuditaConnectingPeople"; - - DBServiceAPI::SettingsUpdate(this,ret); - - auto records = DBServiceAPI::SMSGetLimitOffset(this,0,4); - - auto threads = DBServiceAPI::ThreadGetLimitOffset(this,0,4); - - auto contacts = DBServiceAPI::ContactGetLimitOffset(this,0,4); - - auto smsthread = DBServiceAPI::SMSGetLimitOffsetByThreadID(this,0,4,1); - - LOG_ERROR("Available heap: %lu",usermemGetFreeHeapSize()); - return std::make_shared( ); } // Invoked when timer ticked void TickHandler(uint32_t id) override{ - auto msg = std::make_shared(500); - sys::Bus::SendUnicast(msg,"Blinky",this); + //auto msg = std::make_shared(500); + //sys::Bus::SendUnicast(msg,"Blinky",this); LOG_DEBUG("Blinky service tick!"); }