remove legacy xml files and directory after moving sync data to the DB file

Change-Id: If7ac0bfac2d4deebaa33049fa56263b50b1a353c
Signed-off-by: Ickhee Woo <ickhee.woo@samsung.com>

diff --git a/packaging/sync-manager.spec b/packaging/sync-manager.spec
index e64314ce112b38086420fd6ea322867b300d0e1a..63c1055d79721fc3ad69860e67e6d1dbbb0b72b9 100644 (file)
--- a/packaging/sync-manager.spec
+++ b/packaging/sync-manager.spec
@@ -2,7 +2,7 @@
 %global __provides_exclude_from ^.*\\.extension-calendar
 
 Name:      sync-service
-Version:   0.3.28
+Version:   0.3.29
 Release:   1
 License:   Apache-2.0
 Summary:   Sync manager daemon

diff --git a/src/sync-service/SyncManager_RepositoryEngine.cpp b/src/sync-service/SyncManager_RepositoryEngine.cpp
index f0575772a5c102d114f1452f1a3844dd9b4a5642..bcfc370e344e8bf38d6c7a91c4a2cb55f58205c4 100644 (file)
--- a/src/sync-service/SyncManager_RepositoryEngine.cpp
+++ b/src/sync-service/SyncManager_RepositoryEngine.cpp
@@ -46,8 +46,9 @@
 {
 */
 
-#define PATH_SYNCJOBS tzplatform_mkpath(TZ_USER_DATA, "/sync-manager/syncjobs.xml")
 #define PATH_SYNCADAPTERS tzplatform_mkpath(TZ_USER_DATA, "/sync-manager/syncadapters.xml")
+#define PATH_SYNCJOBS tzplatform_mkpath(TZ_USER_DATA, "/sync-manager/syncjobs.xml")
+#define PATH_SYNCDIR tzplatform_mkpath(TZ_USER_DATA, "/sync-manager")
 
 static const char *CREATE_SYNC_ADAPTER_TABLE = "CREATE TABLE if not exists syncadapter (SvcAppId TEXT, PkgName TEXT, UserId TEXT, DoA TEXT, AppStatus TEXT, ProcId TEXT);";
 static const char *CREATE_SYNC_JOB_TABLE = "CREATE TABLE if not exists syncjob (SvcAppId TEXT, PkgName TEXT, UserId TEXT, AppStatus TEXT, SyncJobId TEXT, SyncType TEXT, AccountId TEXT, JobName TEXT, Interval TEXT, Expedit TEXT, NoRetry TEXT, UserDataKey TEXT, UserDataValue TEXT);";
@@ -259,6 +260,20 @@ RepositoryEngine::CheckAdapterStatus(const char *PackageName) {
 }
 
 
+static void
+RemoveLegacySyncData(const char *pCommandLine) {
+       char cmd[128];
+       memset(cmd, 0x00, sizeof(cmd));
+       snprintf(cmd, sizeof(cmd) - 1, "%s", pCommandLine);
+
+       int ret = remove(cmd);
+       if (ret == 0)
+               LOG_LOGD("rm %s : success", cmd);
+       else
+               LOG_LOGD("rm %s : failed", cmd);
+}
+
+
 void
 RepositoryEngine::ReadSyncJobsData(void) {
        LOG_LOGD("Reading Sync jobs");
@@ -354,6 +369,9 @@ RepositoryEngine::ReadSyncJobsData(void) {
        xmlCleanupParser();
 
        LOG_LOGD("sync jobs are figured out");
+
+       RemoveLegacySyncData(PATH_SYNCJOBS);
+       RemoveLegacySyncData(PATH_SYNCDIR);
 }
 
 
@@ -452,6 +470,8 @@ RepositoryEngine::ReadSyncAdapters(void) {
        xmlCleanupParser();
 
        LOG_LOGD("sync adapters are initialized");
+
+       RemoveLegacySyncData(PATH_SYNCADAPTERS);
 }
 
 

diff --git a/src/sync-service/SyncManager_SyncManager.cpp b/src/sync-service/SyncManager_SyncManager.cpp
index 66f214412a9dbd2f3b8a5e463320226c7c69a42c..12ec211d7a5140018f9184449c4d6e6c96918567 100644 (file)
--- a/src/sync-service/SyncManager_SyncManager.cpp
+++ b/src/sync-service/SyncManager_SyncManager.cpp
@@ -46,8 +46,6 @@
 #define VCONF_HOME_SCREEN  "db/setting/homescreen/package_name"
 #define VCONF_LOCK_SCREEN  "file/private/lockscreen/pkgname"
 
-#define SYNC_DATA_DIR tzplatform_mkpath(TZ_USER_DATA, "/sync-manager")
-
 int DELAY_RETRY_SYNC_IN_PROGRESS_IN_SECONDS = 10;
 #define ID_FOR_ACCOUNT_LESS_SYNC -2
 
@@ -725,10 +723,6 @@ SyncManager::Construct(void) {
 
        int upsMode;
 
-       if (-1 == access(SYNC_DATA_DIR, F_OK)) {
-               mkdir(SYNC_DATA_DIR, 755);      /* LCOV_EXCL_LINE */
-       }
-
        ret = vconf_get_int(VCONFKEY_SETAPPL_PSMODE, &upsMode);
        LOG_LOGE_BOOL(ret == VCONF_OK, "vconf_get_int failed %d", ret);
        __isUPSModeEnabled = (upsMode == SETTING_PSMODE_EMERGENCY) ? true : false;