[Messaging] Use tzplatform_getenv() to get path to messaging DB.

[Verification] TCT pass rate did not change.

Change-Id: I6123428f1e2250298bcfe73339f475b2f87d660f
Signed-off-by: Pawel Andruszkiewicz <p.andruszkie@samsung.com>

diff --git a/packaging/webapi-plugins.spec b/packaging/webapi-plugins.spec
index 330c5c2fb8ffa7ad84c11392efb5a45e5b1bb39f..355fcd601b7034c85ffa93d0e21629c26ebd3b61 100644 (file)
--- a/packaging/webapi-plugins.spec
+++ b/packaging/webapi-plugins.spec
@@ -293,6 +293,7 @@ BuildRequires: pkgconfig(capi-appfw-app-manager)
 BuildRequires: pkgconfig(capi-appfw-package-manager)
 BuildRequires: pkgconfig(capi-content-media-content)
 BuildRequires: pkgconfig(capi-media-metadata-extractor)
+BuildRequires: pkgconfig(libtzplatform-config)
 
 %if %{with wayland}
 %define display_type wayland

diff --git a/src/messaging/messaging.gyp b/src/messaging/messaging.gyp
index 7c76c443e3641f4d0d20ed9795bdf825381d3876..7edb5a62dafb7e08828c9e852b6a3f6d3b747ba5 100644 (file)
--- a/src/messaging/messaging.gyp
+++ b/src/messaging/messaging.gyp
@@ -22,6 +22,7 @@
             'tapi',
             'vconf',
             'db-util',
+            'libtzplatform-config',
         ],
       },
       'sources': [

diff --git a/src/messaging/messaging_database_manager.cc b/src/messaging/messaging_database_manager.cc
index 2452823899a7f72e8aa2e949b495f7a4d8aaecfb..74a0b46882ce851dd18cd017c8a5ba4debf83dbe 100755 (executable)
--- a/src/messaging/messaging_database_manager.cc
+++ b/src/messaging/messaging_database_manager.cc
@@ -24,6 +24,7 @@
 
 #include <msg_storage.h>
 #include <email-api.h>
+#include <tzplatform_config.h>
 
 #include "common/logger.h"
 #include "common/platform_exception.h"
@@ -204,7 +205,11 @@ msg_error_t MessagingDatabaseManager::connect()
         char strDBName[64];
 
         memset(strDBName, 0x00, sizeof(strDBName));
-        snprintf(strDBName, sizeof(strDBName), "%s", MSG_DB_NAME);
+        snprintf(strDBName, sizeof(strDBName), "%s/%s",
+                 tzplatform_getenv(TZ_SYS_DB), MSG_DB_NAME);
+
+        // this should match MSGFW_DB_NAME defined in msg-service/include/utils/MsgSqliteWrapper.h
+        SLoggerD("Using database: [%s]", strDBName);
 
         int err = db_util_open(strDBName, &sqlHandle, DB_UTIL_REGISTER_HOOK_METHOD);
 

diff --git a/src/messaging/messaging_database_manager.h b/src/messaging/messaging_database_manager.h
index 561de9afa8941167031bffd6244194a02379e218..91977c11826b5bfeeb6be30c3ad14265f3b4fe04 100755 (executable)
--- a/src/messaging/messaging_database_manager.h
+++ b/src/messaging/messaging_database_manager.h
@@ -32,7 +32,7 @@ namespace extension {
 namespace messaging {
 
 // =================================================================
-#define MSG_DB_NAME                     "/usr/dbspace/.msg_service.db"
+#define MSG_DB_NAME                     ".msg_service.db"
 #define MSG_MESSAGE_TABLE_NAME          "MSG_MESSAGE_TABLE"
 #define MSG_FOLDER_TABLE_NAME           "MSG_FOLDER_TABLE"
 #define MSG_ADDRESS_TABLE_NAME          "MSG_ADDRESS_TABLE"