change app control to aul for sync-service

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

diff --git a/packaging/sync-manager.spec b/packaging/sync-manager.spec
index dcdf6fd46233503a83b03a568f3861c1fd97a6bf..1bbfe6d88f0a21267fdf96dd8cdca7665795e10d 100644 (file)
--- a/packaging/sync-manager.spec
+++ b/packaging/sync-manager.spec
@@ -1,5 +1,5 @@
 Name:      sync-service
-Version:   0.1.17
+Version:   0.1.18
 Release:   1
 License:   Apache-2.0
 Summary:   Sync manager daemon

diff --git a/src/sync-client/sync_adapter.c b/src/sync-client/sync_adapter.c
index 5816c5d02c71a1e2b4c8f2da37a142c42b05b080..31d89ecbcfb0b640e92dfe487b7e00c3182f9fde 100644 (file)
--- a/src/sync-client/sync_adapter.c
+++ b/src/sync-client/sync_adapter.c
@@ -31,6 +31,7 @@
 #include "sync-log.h"
 #include "sync-error.h"
 
+
 typedef enum {
        SYNC_STATUS_SUCCESS = 0,
        SYNC_STATUS_CANCELLED =  -1,
@@ -39,7 +40,7 @@ typedef enum {
 } SyncSatus;
 
 
-#define SYNC_THREAD 0          /*As sync adapter itself runs in service app*/
+#define SYNC_THREAD 0          /* As sync adapter itself runs in service app */
 
 #define SYNC_MANAGER_DBUS_SERVICE "org.tizen.sync"
 #define SYNC_MANAGER_DBUS_PATH "/org/tizen/sync/manager"
@@ -85,12 +86,12 @@ __sync_adapter_on_start_sync(TizenSyncAdapter *pObject,
 
        g_sync_adapter->__syncRunning = true;
 
-       int ret = SYNC_STATUS_SUCCESS;
        account_h account = NULL;
        if (accountId != -1) {
                account_create(&account);
                account_query_account_by_account_id(accountId, &account);
        }
+
        bundle *sync_job_user_data = umarshal_bundle(pSyncJobUserData);
 
        bool is_sync_success;
@@ -99,6 +100,7 @@ __sync_adapter_on_start_sync(TizenSyncAdapter *pObject,
        else
                is_sync_success = g_sync_adapter->start_sync_cb(account, pSyncJobName, NULL, sync_job_user_data);
 
+       int ret = SYNC_STATUS_SUCCESS;
        if (!is_sync_success)
                ret = SYNC_STATUS_FAILURE;
 
@@ -106,7 +108,7 @@ __sync_adapter_on_start_sync(TizenSyncAdapter *pObject,
        g_sync_adapter->__syncRunning = false;
        bundle_free(sync_job_user_data);
        free(command_line);
-       LOG_LOGD("Sync completed");
+       LOG_LOGD("Sync operation completed");
 
        if (ret == SYNC_STATUS_FAILURE)
                return false;
@@ -152,8 +154,6 @@ __sync_adapter_on_stop_sync(
 /* flag == false => de-register */
 int __register_sync_adapter(bool flag)
 {
-       bool ret = true;
-
        GError *error = NULL;
        GDBusConnection *connection = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, &error);
        SYNC_LOGE_RET_RES(connection != NULL, SYNC_ERROR_IO_ERROR, "tizen_sync_manager_proxy_new_sync failed %s", error->message);
@@ -166,12 +166,14 @@ int __register_sync_adapter(bool flag)
                                                                                                                                        &error);
        SYNC_LOGE_RET_RES(error == NULL && ipcObj != NULL, SYNC_ERROR_IO_ERROR, "tizen_sync_manager_proxy_new_sync failed %s", error->message);
 
+       bool ret = true;
        char *command_line = proc_get_cmdline_self();
        if (flag) {
                ret = tizen_sync_manager_call_add_sync_adapter_sync(ipcObj, command_line, NULL, &error);
                SYNC_LOGE_RET_RES(ret && !error, SYNC_ERROR_QUOTA_EXCEEDED, "Register sync adapter failed %s", error->message);
-       } else
+       } else {
                tizen_sync_manager_call_remove_sync_adapter_sync(ipcObj, command_line, NULL, &error);
+       }
 
        free(command_line);
 
@@ -213,8 +215,9 @@ int sync_adapter_set_callbacks(sync_adapter_start_sync_cb on_start_cb, sync_adap
                        g_sync_adapter->sync_adapter_obj = NULL;
                        g_sync_adapter->__syncRunning = false;
                        g_sync_adapter->sync_adapter_obj = pSyncAdapter;
-               } else
+               } else {
                        return ret;
+               }
        }
 
        g_sync_adapter->start_sync_cb = on_start_cb;
@@ -228,11 +231,13 @@ int sync_adapter_unset_callbacks()
 {
        SYNC_LOGE_RET_RES(g_sync_adapter != NULL, SYNC_ERROR_SYSTEM, "sync_adapter_set_callbacks should be called first");
 
+       LOG_LOGD("sync_adapter_destroy");
+
        __register_sync_adapter(false);
+
        g_sync_adapter->start_sync_cb = NULL;
        g_sync_adapter->cancel_sync_cb = NULL;
 
-       LOG_LOGD("sync_adapter_destroy");
        if (g_sync_adapter) {
                free(g_sync_adapter);
                g_sync_adapter = NULL;

diff --git a/src/sync-client/sync_manager.c b/src/sync-client/sync_manager.c
index 3c9475f94a7824d746ff81a7bc4cbfbe3e093062..bb993604d251fab77f48b52e45d9e135c007bd7c 100644 (file)
--- a/src/sync-client/sync_manager.c
+++ b/src/sync-client/sync_manager.c
@@ -31,6 +31,7 @@
 #include "sync-log.h"
 #include "sync-error.h"
 
+
 #define SYNC_MANAGER_DBUS_PATH "/org/tizen/sync/manager"
 #define SYNC_ADAPTER_DBUS_PATH "/org/tizen/sync/adapter"
 #define SYNC_ERROR_PREFIX "org.tizen.sync.Error"
@@ -44,6 +45,7 @@ typedef struct sync_manager_s {
 
 static sync_manager_s *g_sync_manager;
 
+
 int read_proc(const char *path, char *buf, int size)
 {
        int fd;
@@ -55,23 +57,23 @@ int read_proc(const char *path, char *buf, int size)
        fd = open(path, O_RDONLY);
        if (fd < 0) {
                LOG_LOGD("fd = [%d]", fd);
-
                return -1;
        }
 
        ret = read(fd, buf, size - 1);
        if (ret <= 0) {
                close(fd);
-
                return -1;
-       } else
+       } else {
                buf[ret] = 0;
+       }
 
        close(fd);
 
        return ret;
 }
 
+
 char *proc_get_cmdline_self()
 {
        char cmdline[1024];
@@ -82,6 +84,7 @@ char *proc_get_cmdline_self()
                LOG_LOGD("Can not read /proc/self/cmdline");
                return NULL;
        }
+
        LOG_LOGD("sync client: cmdLine [%s]", cmdline);
 
        return strdup(cmdline);
@@ -107,12 +110,10 @@ static int _sync_get_error_code(bool is_success, GError *error)
 {
        if (!is_success) {
                LOG_LOGD("Received error Domain[%d] Message[%s] Code[%d]", error->domain, error->message, error->code);
-
                if (g_dbus_error_is_remote_error(error)) {
                        gchar *remote_error = g_dbus_error_get_remote_error(error);
                        if (remote_error) {
                                LOG_LOGD("Remote error [%s]", remote_error);
-
                                int error_enum_count = G_N_ELEMENTS(_sync_errors);
                                int i = 0;
                                for (i = 0; i < error_enum_count; i++) {
@@ -123,7 +124,7 @@ static int _sync_get_error_code(bool is_success, GError *error)
                                }
                        }
                }
-               /*All undocumented errors mapped to SYNC_ERROR_UNKNOWN*/
+               /* All undocumented errors mapped to SYNC_ERROR_UNKNOWN */
                return SYNC_ERROR_UNKNOWN;
        }
        return SYNC_ERROR_NONE;
@@ -134,9 +135,6 @@ static int initialize_connection()
 {
        SYNC_LOGE_RET_RES(g_sync_manager == NULL, SYNC_ERROR_NONE, "sync manager already connected");
 
-       pid_t pid = getpid();
-       char *appId = NULL;
-
        GDBusConnection *connection = NULL;
        GError *error = NULL;
        connection = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, &error);
@@ -147,16 +145,15 @@ static int initialize_connection()
                        "/org/tizen/sync/manager",
                        NULL,
                        &error);
+
        if (error != NULL) {
                LOG_LOGC("sync client: gdbus error [%s]", error->message);
                g_sync_manager = NULL;
-
                return SYNC_ERROR_IO_ERROR;
        }
 
        if (ipcObj == NULL) {
                g_sync_manager = NULL;
-
                return SYNC_ERROR_SYSTEM;
        }
 
@@ -164,6 +161,9 @@ static int initialize_connection()
        if (g_sync_manager == NULL)
                return SYNC_ERROR_OUT_OF_MEMORY;
 
+       pid_t pid = getpid();
+       char *appId = NULL;
+
        int ret = app_manager_get_app_id(pid, &appId);
        if (ret != APP_MANAGER_ERROR_NONE)
                appId = proc_get_cmdline_self();
@@ -178,6 +178,7 @@ static int initialize_connection()
 int get_interval(sync_period_e period)
 {
        int frequency = 0;
+
        switch (period) {
        case SYNC_PERIOD_INTERVAL_30MIN:
        {
@@ -252,20 +253,21 @@ int sync_manager_on_demand_sync_job(account_h account, const char *sync_job_name
                        return SYNC_ERROR_SYSTEM;
                }
                LOG_LOGC("appid [%s] accid [%d] sync_job_name [%s]", g_sync_manager->appid, id, sync_job_name);
-       } else
+       } else {
                LOG_LOGC("appid [%s] sync_job_name [%s]", g_sync_manager->appid, sync_job_name);
+       }
 
-       GError *error = NULL;
        GVariant *user_data = marshal_bundle(sync_job_user_data);
+       GError *error = NULL;
 
        bool is_success = tizen_sync_manager_call_add_on_demand_job_sync(g_sync_manager->ipcObj, g_sync_manager->appid, id, sync_job_name, sync_option, user_data, sync_job_id, NULL, &error);
        if (!is_success || error) {
                int error_code = _sync_get_error_code(is_success, error);
                LOG_LOGC("sync client: gdbus error [%s]", error->message);
                g_clear_error(&error);
-
                return error_code;
        }
+
        if (*sync_job_id == -1)
                return SYNC_ERROR_QUOTA_EXCEEDED;
 
@@ -293,20 +295,20 @@ int sync_manager_add_periodic_sync_job(account_h account, const char *sync_job_n
                        return SYNC_ERROR_SYSTEM;
                }
                LOG_LOGC("appid [%s] accid [%d] sync_job_name [%s]", g_sync_manager->appid, id, sync_job_name);
-       } else
+       } else {
                LOG_LOGC("appid [%s] sync_job_name [%s]", g_sync_manager->appid, sync_job_name);
+       }
 
        int sync_interval = get_interval(sync_period);
 
-       GError *error = NULL;
        GVariant *user_data = marshal_bundle(sync_job_user_data);
+       GError *error = NULL;
 
        bool is_success = tizen_sync_manager_call_add_periodic_job_sync(g_sync_manager->ipcObj, g_sync_manager->appid, id, sync_job_name, sync_interval, sync_option, user_data, sync_job_id, NULL, &error);
        if (!is_success || error) {
                int error_code = _sync_get_error_code(is_success, error);
                LOG_LOGC("sync client: gdbus error [%s]", error->message);
                g_clear_error(&error);
-
                return error_code;
        }
 
@@ -352,18 +354,18 @@ int sync_manager_add_data_change_sync_job(account_h account, const char *sync_ca
                        return SYNC_ERROR_SYSTEM;
                }
                LOG_LOGC("appid [%s] accid [%d] capability [%s]", g_sync_manager->appid, id, sync_capability);
-       } else
+       } else {
                LOG_LOGC("appid [%s] capability [%s]", g_sync_manager->appid, sync_capability);
+       }
 
-       GError *error = NULL;
        GVariant *user_data = marshal_bundle(sync_job_user_data);
+       GError *error = NULL;
 
        bool is_success = tizen_sync_manager_call_add_data_change_job_sync(g_sync_manager->ipcObj, g_sync_manager->appid, id, sync_capability, sync_option, user_data, sync_job_id, NULL, &error);
        if (!is_success || error) {
                int error_code = _sync_get_error_code(is_success, error);
                LOG_LOGC("sync client: gdbus error [%s]", error->message);
                g_clear_error(&error);
-
                return error_code;
        }
 
@@ -383,13 +385,12 @@ int sync_manager_remove_sync_job(int sync_job_id)
        LOG_LOGC("sync client: [%s] removing sync job with sync_job_id [%d]", g_sync_manager->appid, sync_job_id);
 
        GError *error = NULL;
-       bool is_success = tizen_sync_manager_call_remove_job_sync(g_sync_manager->ipcObj, g_sync_manager->appid, sync_job_id, NULL, &error);
 
+       bool is_success = tizen_sync_manager_call_remove_job_sync(g_sync_manager->ipcObj, g_sync_manager->appid, sync_job_id, NULL, &error);
        if (!is_success || error) {
                int error_code = _sync_get_error_code(is_success, error);
                LOG_LOGC("sync client: gdbus error [%s]", error->message);
                g_clear_error(&error);
-
                return error_code;
        }
 
@@ -409,15 +410,14 @@ int sync_manager_foreach_sync_job(sync_manager_sync_job_cb sync_job_cb, void *us
 
        g_sync_manager->sync_job_cb = sync_job_cb;
 
-       GError *error = NULL;
        GVariant *sync_job_list_variant = NULL;
+       GError *error = NULL;
        gboolean is_success = tizen_sync_manager_call_get_all_sync_jobs_sync(g_sync_manager->ipcObj, g_sync_manager->appid, &sync_job_list_variant, NULL, &error);
 
        if (!is_success || error) {
                int error_code = _sync_get_error_code(is_success, error);
                LOG_LOGC("sync client: gdbus error [%s]", error->message);
                g_clear_error(&error);
-
                return error_code;
        } else {
                umarshal_sync_job_list(sync_job_list_variant, sync_job_cb, user_data);
@@ -437,7 +437,6 @@ int _sync_manager_enable_sync()
        tizen_sync_manager_call_set_sync_status_sync(g_sync_manager->ipcObj, true, NULL, &error);
        if (error != NULL) {
                LOG_LOGC("sync client: gdbus error [%s]", error->message);
-
                return SYNC_ERROR_IO_ERROR;
        }
 
@@ -454,7 +453,6 @@ int _sync_manager_disable_sync()
        tizen_sync_manager_call_set_sync_status_sync(g_sync_manager->ipcObj, false, NULL, &error);
        if (error != NULL) {
                LOG_LOGC("sync client: gdbus error [%s]", error->message);
-
                return SYNC_ERROR_IO_ERROR;
        }
 

diff --git a/src/sync-service/SyncManager_RepositoryEngine.cpp b/src/sync-service/SyncManager_RepositoryEngine.cpp
index fe063f47b81be5a399dfe7c8a4acdb16eff00cc0..f91ff033df03e07c441dab4fe27bd6ca4c316cb1 100644 (file)
--- a/src/sync-service/SyncManager_RepositoryEngine.cpp
+++ b/src/sync-service/SyncManager_RepositoryEngine.cpp
@@ -492,22 +492,35 @@ RepositoryEngine::ReadSyncAdapters(void) {
                cur = cur->xmlChildrenNode;
                while (cur != NULL) {
                        if (!xmlStrcmp(cur->name, XML_NODE_SYNCADAPTER)) {
-                               xmlChar* pServiceAppId = xmlGetProp(cur, XML_ATTR_SYNCADAPTER_SERVICE_APP_ID);
+                               xmlChar* pServiceAppUID = xmlGetProp(cur, XML_ATTR_SYNCADAPTER_SERVICE_APP_ID);
                                xmlChar* pPackageId = xmlGetProp(cur, XML_ATTR_PACKAGE_ID);
                                xmlChar* pAppStatus = xmlGetProp(cur, XML_ATTR_APP_STATUS);
 
+                               char pAppUID[100];
+                               if (!strstr((char*)pServiceAppUID, "#"))
+                                       snprintf(pAppUID, 100, "%s#%d", pServiceAppUID, 5001);
+                               else
+                                       strcpy(pAppUID, (char*)pServiceAppUID);
+
+                               char *pServiceAppId;
+                               pServiceAppId = strtok((char*)pServiceAppUID, "#");
+
+                               LOG_LOGD("pAppUID [%s], pServiceAppId [%s]", pAppUID, pServiceAppId);
+
                                pkgmgrinfo_appinfo_h handle_appinfo;
                                if (pkgmgrinfo_appinfo_get_appinfo((char*)pServiceAppId, &handle_appinfo) == PMINFO_R_OK) {
                                        if (!pAppStatus)
-                                               pAggregator->SetAppStatus((char*)pServiceAppId, "enabled");
+                                               pAggregator->SetAppStatus((char*)pAppUID, "enabled");
                                        else
-                                               pAggregator->SetAppStatus((char*)pServiceAppId, (char*)pAppStatus);
+                                               pAggregator->SetAppStatus((char*)pAppUID, (char*)pAppStatus);
 
-                                       pAggregator->AddSyncAdapter((char*)pPackageId, (char*)pServiceAppId);
+                                       pAggregator->AddSyncAdapter((char*)pPackageId, (char*)pAppUID);
                                        pkgmgrinfo_appinfo_destroy_appinfo(handle_appinfo);
                                } else {
                                        pAggregator->HandlePackageUninstalled((char*)pPackageId);
                                }
+                               if (pServiceAppId)
+                                       free(pServiceAppId);
                        }
                        cur = cur->next;
                }

diff --git a/src/sync-service/SyncManager_SyncAdapterAggregator.cpp b/src/sync-service/SyncManager_SyncAdapterAggregator.cpp
index d4269455b0714ccca775dc9eae69e0c5263ce90d..37e3d17646b9e299f2aa2bb1955e7a024c2f8cf7 100644 (file)
--- a/src/sync-service/SyncManager_SyncAdapterAggregator.cpp
+++ b/src/sync-service/SyncManager_SyncAdapterAggregator.cpp
@@ -51,29 +51,41 @@ SyncAdapterAggregator::~SyncAdapterAggregator(void) {
 
 /* LCOV_EXCL_START */
 void
-SyncAdapterAggregator::SetAppStatus(const char* pServiceAppId, const char* pAppStatus) {
-       /* Update the application's status */
+SyncAdapterAggregator::SetAppStatus(const char* pServiceAppUID, const char* pAppStatus) {
+       /* Update the application status */
        for (map<string, string>::iterator iter = __syncAppStatus.begin(); iter != __syncAppStatus.end(); ++iter) {
                string appID = iter->first;
-               if (!strcmp(pServiceAppId, appID.c_str())) {
+               if (!strcmp(pServiceAppUID, appID.c_str())) {
                        LOG_LOGD("Sync status already exist and it is set as [%s]", pAppStatus);
                        iter->second = pAppStatus;
                        return;
                }
        }
        LOG_LOGD("Sync status is set as [%s]", pAppStatus);
-       __syncAppStatus.insert(pair<string, string> (pServiceAppId, pAppStatus));
+       __syncAppStatus.insert(pair<string, string> (pServiceAppUID, pAppStatus));
 }
 /* LCOV_EXCL_STOP */
 
 
 void
-SyncAdapterAggregator::AddSyncAdapter(const char* pPackageId, const char* pServiceAppId) {
+SyncAdapterAggregator::AddSyncAdapter(const char* pPackageId, const char* pServiceAppUID) {
        if (HasSyncAdapter(pPackageId)) {
                LOG_LOGD("Sync adapter already registered for package [%s]", pPackageId);       /* LCOV_EXCL_LINE */
        } else {
-               LOG_LOGD("Registering sync-adapter [%s] for package [%s]", pServiceAppId, pPackageId);
-               __syncAdapterList.insert(pair<string, string> (pPackageId, pServiceAppId));
+               LOG_LOGD("Registering sync-adapter [%s] for package [%s]", pServiceAppUID, pPackageId);
+               __syncAdapterList.insert(pair<string, string> (pPackageId, pServiceAppUID));
+
+               /* Check the application status was written */
+               for (map<string, string>::iterator iter = __syncAppStatus.begin(); iter != __syncAppStatus.end(); ++iter) {
+                       string appID = iter->first;
+                       if (!strcmp(pServiceAppUID, appID.c_str())) {
+                               LOG_LOGD("Sync status already exist");
+                               return;
+                       }
+               }
+
+               LOG_LOGD("Sync status does not exist and it is set as default value");
+               __syncAppStatus.insert(pair<string, string> (pServiceAppUID, "enabled"));
        }
 }
 
@@ -101,10 +113,11 @@ SyncAdapterAggregator::GetSyncAdapter(const char* pAppId) {
 
        map<string, string>::iterator it = __syncAdapterList.find(PkgId.c_str());
        if (it != __syncAdapterList.end()) {
+               LOG_LOGD("Sync adapter is found for account provider id [%s]", it->second.c_str());
                return it->second.c_str();
        }
 
-       LOG_LOGD("Sync adapter not found for account provider id %s", pAppId);
+       LOG_LOGD("Sync adapter not found for account provider id [%s]", pAppId);
 
        return NULL;
 }

diff --git a/src/sync-service/SyncManager_SyncJobDispatcher.cpp b/src/sync-service/SyncManager_SyncJobDispatcher.cpp
index 4c7da62f6129dbd705e94adc80a0c16456713092..94a5a038d8b6fc9617aeb8c3be3e4a0518d29099 100644 (file)
--- a/src/sync-service/SyncManager_SyncJobDispatcher.cpp
+++ b/src/sync-service/SyncManager_SyncJobDispatcher.cpp
@@ -66,17 +66,16 @@ SyncJobDispatcher::~SyncJobDispatcher(void) {
 
 int
 SyncJobDispatcher::DispatchSyncJob(SyncJob* syncJob) {
-       int ret = SYNC_ERROR_NONE;
        LOG_LOGD("Dispatching sync job [%s], [%s]", syncJob->__appId.c_str(), syncJob->__syncJobName.c_str());
 
        bool isDataSync = (syncJob->GetSyncType() == SYNC_TYPE_DATA_CHANGE);
+       int ret = SYNC_ERROR_NONE;
        ret = SyncService::GetInstance()->TriggerStartSync(syncJob->__appId.c_str(), syncJob->__accountId, syncJob->__syncJobName.c_str(), isDataSync, syncJob->__pExtras);
        SYNC_LOGE_RET_RES(ret == SYNC_ERROR_NONE, ret, "Failed to start sync job")
 
        if (SyncManager::GetInstance()->__pCurrentSyncJobQueue) {
                pthread_mutex_lock(&(SyncManager::GetInstance()->__currJobQueueMutex));
                LOG_LOGD("Add to Active Sync queue");
-
                SyncManager::GetInstance()->__pCurrentSyncJobQueue->AddSyncJobToCurrentSyncQueue(syncJob);
                pthread_mutex_unlock(&(SyncManager::GetInstance()->__currJobQueueMutex));
        }

diff --git a/src/sync-service/SyncManager_SyncManager.cpp b/src/sync-service/SyncManager_SyncManager.cpp
index dcd3a088ad302bd534d18d94e200c4dc489e6d61..0cf51de8b2f221387ad3daca55d8d931f2486800 100644 (file)
--- a/src/sync-service/SyncManager_SyncManager.cpp
+++ b/src/sync-service/SyncManager_SyncManager.cpp
@@ -974,9 +974,9 @@ SyncManager::SendCancelSyncsMessage(SyncJob* pJob) {
 
 
 void
-SyncManager::OnResultReceived(SyncStatus res, string appId, string packageId, const char* syncJobName) {
+SyncManager::OnResultReceived(SyncStatus res, string svcAppUID, string packageId, const char* syncJobName) {
        string key;
-       key.append("id:").append(appId).append(syncJobName);
+       key.append("id:").append(svcAppUID).append(syncJobName);
 
        LOG_LOGD("Close Sync context for key %s", key.c_str());
 
@@ -984,7 +984,7 @@ SyncManager::OnResultReceived(SyncStatus res, string appId, string packageId, co
        CurrentSyncContext *pCurrSyncContext = __pCurrentSyncJobQueue->GetCurrJobfromKey(key);
        pthread_mutex_unlock(&__currJobQueueMutex);
        if (pCurrSyncContext == NULL) {
-               LOG_LOGD("Sync context cant be found for %s", key.c_str());
+               LOG_LOGD("Sync context can't be found for %s", key.c_str());
        } else {
                g_source_remove(pCurrSyncContext->GetTimerId());
                SyncJob* pJob = pCurrSyncContext->GetSyncJob();

diff --git a/src/sync-service/SyncManager_SyncManager.h b/src/sync-service/SyncManager_SyncManager.h
index 45f01002e0c5d40a8e27ed48bb966ed2492c6269..b93fdfec351fa161f2d9a1778f821b79bec171d3 100644 (file)
--- a/src/sync-service/SyncManager_SyncManager.h
+++ b/src/sync-service/SyncManager_SyncManager.h
@@ -124,7 +124,7 @@ public:
 
        void AlertForChange();
 
-       void OnResultReceived(SyncStatus res, string svcAppId, string packageId, const char* syncJobName);
+       void OnResultReceived(SyncStatus res, string svcAppUID, string packageId, const char* syncJobName);
 
        string GetPkgIdByAppId(const char* pAppId);
 

diff --git a/src/sync-service/SyncManager_SyncService.cpp b/src/sync-service/SyncManager_SyncService.cpp
index f7b87a506399848c7dc5ca7d9ae53950e9254b0e..2902b2a710732ae19f4c2e41c9405354ac1285d6 100644 (file)
--- a/src/sync-service/SyncManager_SyncService.cpp
+++ b/src/sync-service/SyncManager_SyncService.cpp
@@ -343,33 +343,54 @@ gboolean sync_adapter_handle_send_result(TizenSyncAdapter* pObject, GDBusMethodI
 
 /* LCOV_EXCL_START */
 int
-SyncService::TriggerStartSync(const char* appId, int accountId, const char* syncJobName, bool isDataSync, bundle* pExtras) {
-       LOG_LOGD("appId [%s] jobname [%s]", appId, syncJobName);
+SyncService::TriggerStartSync(const char* appUID, int accountId, const char* syncJobName, bool isDataSync, bundle* pExtras) {
+       LOG_LOGD("appUID [%s] syncJobName [%s]", appUID, syncJobName);
+
+       char pAppId[strlen(appUID) + 1] = { 0, };
+       strcpy(pAppId, appUID);
+
+       char pServiceAppId[strlen(pAppId) + 1] = { 0, };
+       char *temp;
+       int uid = -1;
+       int stage = 1;
+
+       /* Divide appId#uid */
+       temp = strtok(pAppId, "#");
+       while (temp != NULL) {
+               if (stage == 1) {
+                       strcpy(pServiceAppId, temp);
+                       LOG_LOGD("step %d. pServiceAppId [%s]", stage, pServiceAppId);
+               } else if (stage == 2) {
+                       uid = atoi(temp);
+                       LOG_LOGD("step %d. uid [%d]", stage, uid);
+               }
+               stage++;
+               temp = strtok(NULL, "#");
+       }
 
-       app_control_h app_control;
        int ret = SYNC_ERROR_NONE;
+       ret = aul_app_get_status_for_uid(pServiceAppId, uid);
+       if (ret == -1) {
+               /* Send launch request to wake application */
+               LOG_LOGD("[%s] is not running, launch the app and wait for signal", pServiceAppId);
 
-       bool isRunning = false;
-       app_manager_is_running(appId, &isRunning);
-       if (!isRunning) {
-               LOG_LOGD("app is not running, launch the app and wait for signal");
-               ret = app_control_create(&app_control);
-               SYNC_LOGE_RET_RES(ret == APP_CONTROL_ERROR_NONE, SYNC_ERROR_SYSTEM, "app control create failed %d", ret);
-
-               ret = app_control_set_app_id(app_control, appId);
-               if (ret != APP_CONTROL_ERROR_NONE) {
-                       app_control_destroy(app_control);
-                       SYNC_LOGE_RET_RES(ret == APP_CONTROL_ERROR_NONE, SYNC_ERROR_SYSTEM, "app control error [%d : %s]", ret, get_error_message(ret));
-               }
+               /*
+               // for setting background launch
+               ret = aul_svc_set_background_launch(pExtras, true);
+               SYNC_LOGE_RET_RES(ret >= AUL_R_OK, SYNC_ERROR_SYSTEM, "ERROR : aul_svc_set_background_launch() failed for appId[%s], result[%d : %s]", pServiceAppId, ret, get_error_message(ret));
+               */
+
+               ret = aul_launch_app_for_uid(pServiceAppId, pExtras, uid);
+               SYNC_LOGE_RET_RES(ret >= AUL_R_OK, SYNC_ERROR_SYSTEM, "ERROR : aul_launch_app_for_uid() failed for appId[%s], result[%d : %s]", pServiceAppId, ret, get_error_message(ret));
 
                sa_app_id.clear();
-               ret = app_control_send_launch_request(app_control, NULL, NULL);
-               SYNC_LOGE_RET_RES(ret == APP_CONTROL_ERROR_NONE, SYNC_ERROR_SYSTEM, "app control launch request failed %d", ret);
 
                return SYNC_ERROR_SYSTEM;
        } else {
-               LOG_LOGD("app is already running");
-               TizenSyncAdapter* pSyncAdapter = (TizenSyncAdapter*) g_hash_table_lookup(g_hash_table, appId);
+               LOG_LOGD("[%s] app is already running", pServiceAppId);
+
+               /* Find pSyncAdapter in hash table with appId#uid */
+               TizenSyncAdapter* pSyncAdapter = (TizenSyncAdapter*) g_hash_table_lookup(g_hash_table, appUID);
 
                if (!pSyncAdapter) {
                        LOG_LOGD("Sync adapter entry not found. Preparing sync adapter object");
@@ -377,7 +398,7 @@ SyncService::TriggerStartSync(const char* appId, int accountId, const char* sync
                        app_context_h app_context = NULL;
                        pid_t pid;
 
-                       int ret = app_manager_get_app_context(appId, &app_context);
+                       int ret = app_manager_get_app_context(pServiceAppId, &app_context);
                        SYNC_LOGE_RET_RES(ret == APP_MANAGER_ERROR_NONE, SYNC_ERROR_SYSTEM, "getting app_context is failed");
 
                        ret = app_context_get_pid(app_context, &pid);
@@ -395,8 +416,9 @@ SyncService::TriggerStartSync(const char* appId, int accountId, const char* sync
                                if (g_dbus_interface_skeleton_export(interface, gdbusConnection, obj_path, &error)) {
                                        g_signal_connect(pSyncAdapter, "handle-send-result", G_CALLBACK(sync_adapter_handle_send_result), NULL);
 
-                                       LOG_LOGD("inserting sync adapter ipc %s %x", appId, pSyncAdapter);
-                                       g_hash_table_insert(g_hash_table, strdup(appId), pSyncAdapter);
+                                       /* appId#uid */
+                                       LOG_LOGD("inserting sync adapter ipc %s %x", appUID, pSyncAdapter);
+                                       g_hash_table_insert(g_hash_table, strdup(appUID), pSyncAdapter);
                                } else {
                                        SYNC_LOGE_RET_RES(!(error->message), SYNC_ERROR_SYSTEM, "export failed [%s]", error->message);
                                        return SYNC_ERROR_SYSTEM;
@@ -415,10 +437,10 @@ SyncService::TriggerStartSync(const char* appId, int accountId, const char* sync
 
 
 void
-SyncService::TriggerStopSync(const char* appId, int accountId, const char* syncJobName, bool isDataSync, bundle* pExtras) {
-       LOG_LOGD("Trigger stop sync %s", appId);
+SyncService::TriggerStopSync(const char* appUID, int accountId, const char* syncJobName, bool isDataSync, bundle* pExtras) {
+       LOG_LOGD("Trigger stop sync [%s]", appUID);
 
-       TizenSyncAdapter* pSyncAdapter = (TizenSyncAdapter*) g_hash_table_lookup(g_hash_table, appId);
+       TizenSyncAdapter* pSyncAdapter = (TizenSyncAdapter*) g_hash_table_lookup(g_hash_table, appUID);
        if (!pSyncAdapter) {
                LOG_LOGD("Failed to lookup syncadapter");
                return;
@@ -447,7 +469,7 @@ SyncService::RequestOnDemandSync(const char* pPackageId, const char* pSyncJobNam
                LOG_LOGD("Sync request with job name [%s] already found. Sync job id [%d]", pSyncJobName, syncJobId);
 
                pSyncJobEntry->Reset(accountId, pExtras, syncOption);
-               LOG_LOGD("sync parameters are updated with new parameters", pSyncJobName);
+               LOG_LOGD("sync parameters are updated with new parameters [%s]", pSyncJobName);
        } else {
                syncJobId = pSyncJobsAggregator->GenerateSyncJobId(pPackageId);
                SYNC_LOGE_RET_RES(syncJobId <= SYNC_JOB_LIMIT, SYNC_ERROR_QUOTA_EXCEEDED, "Sync job quota exceeded");
@@ -456,9 +478,8 @@ SyncService::RequestOnDemandSync(const char* pPackageId, const char* pSyncJobNam
                ret = __pSyncManagerInstance->AddOnDemandSync(pPackageId, pSyncJobName, accountId, pExtras, syncOption, syncJobId);
        }
 
-       if (ret == SYNC_ERROR_NONE) {
+       if (ret == SYNC_ERROR_NONE)
                *pSyncJobId = syncJobId;
-       }
 
        return ret;
 }
@@ -497,9 +518,8 @@ SyncService::RequestPeriodicSync(const char* pPackageId, const char* pSyncJobNam
                ret = __pSyncManagerInstance->AddPeriodicSyncJob(pPackageId, pSyncJobName, accountId, pExtras, syncOption, syncJobId, pollFrequency);
        }
 
-       if (ret == SYNC_ERROR_NONE) {
+       if (ret == SYNC_ERROR_NONE)
                *pSyncJobId = syncJobId;
-       }
 
        return ret;
 }
@@ -534,9 +554,9 @@ SyncService::RequestDataSync(const char* pPackageId, const char* pSyncJobName, i
                ret = __pSyncManagerInstance->AddDataSyncJob(pPackageId, pSyncJobName, accountId, pExtras, syncOption, syncJobId, pCapability);
        }
 
-       if (ret == SYNC_ERROR_NONE) {
+       if (ret == SYNC_ERROR_NONE)
                *pSyncJobId = syncJobId;
-       }
+
        return ret;
 }
 
@@ -665,10 +685,13 @@ sync_adapter_handle_send_result(TizenSyncAdapter* pObject, GDBusMethodInvocation
                pkgIdStr = SyncManager::GetInstance()->GetPkgIdByCommandline(pCommandLine);
        }
 
+       char pServiceAppUID[100];
+       snprintf(pServiceAppUID, 100, "%s#%d", pAppId, getuid());
+       LOG_LOGD("pid[%d], pServiceAppUID [%s]", (int)pid, pServiceAppUID);
+
        if (!pkgIdStr.empty()) {
                LOG_LOGD("Sync result received from [%s]: sync_job_name [%s] result [%d]", pAppId, sync_job_name, sync_result);
-
-               SyncManager::GetInstance()->OnResultReceived((SyncStatus)sync_result, pAppId, pkgIdStr, sync_job_name);
+               SyncManager::GetInstance()->OnResultReceived((SyncStatus)sync_result, pServiceAppUID, pkgIdStr, sync_job_name);
                free(pAppId);
        } else {
                LOG_LOGD("sync service: Get package Id fail %d", ret);
@@ -676,9 +699,6 @@ sync_adapter_handle_send_result(TizenSyncAdapter* pObject, GDBusMethodInvocation
 
        tizen_sync_adapter_complete_send_result(pObject, pInvocation);
 
-       /// Syncadapter may kill self after sync.
-       /// aul_terminate_pid(pid);
-
        return true;
 }
 
@@ -768,9 +788,7 @@ sync_manager_remove_job(TizenSyncManager* pObject, GDBusMethodInvocation* pInvoc
        guint pid = get_caller_pid(pInvocation);
        string pkgIdStr;
        char* pAppId;
-       int ret = APP_MANAGER_ERROR_NONE;
-
-       ret = app_manager_get_app_id(pid, &pAppId);
+       int ret = app_manager_get_app_id(pid, &pAppId);
        if (ret == APP_MANAGER_ERROR_NONE) {
                pkgIdStr = SyncManager::GetInstance()->GetPkgIdByAppId(pAppId);
                free(pAppId);
@@ -780,6 +798,7 @@ sync_manager_remove_job(TizenSyncManager* pObject, GDBusMethodInvocation* pInvoc
                pkgIdStr = SyncManager::GetInstance()->GetPkgIdByCommandline(pCommandLine);
                /* LCOV_EXCL_STOP */
        }
+
        if (!pkgIdStr.empty()) {
                LOG_LOGD("package id [%s]", pkgIdStr.c_str());
                ret = SyncManager::GetInstance()->RemoveSyncJob(pkgIdStr, sync_job_id);
@@ -831,9 +850,7 @@ sync_manager_add_periodic_job(TizenSyncManager* pObject, GDBusMethodInvocation*
 
        guint pid = get_caller_pid(pInvocation);
        string pkgIdStr;
-       int sync_job_id = 0;
        char* pAppId;
-
        ret = app_manager_get_app_id(pid, &pAppId);
        if (ret == APP_MANAGER_ERROR_NONE) {
                pkgIdStr = SyncManager::GetInstance()->GetPkgIdByAppId(pAppId);
@@ -844,6 +861,8 @@ sync_manager_add_periodic_job(TizenSyncManager* pObject, GDBusMethodInvocation*
                pkgIdStr = SyncManager::GetInstance()->GetPkgIdByCommandline(pCommandLine);
                /* LCOV_EXCL_STOP */
        }
+
+       int sync_job_id = 0;
        if (!pkgIdStr.empty()) {
                LOG_LOGD("Params acc[%d] name[%s] option[%d] period[%d] package[%s]", accountId, pSyncJobName, sync_option, sync_interval, pkgIdStr.c_str());
                bundle* pBundle = umarshal_bundle(pSyncJobUserData);
@@ -933,7 +952,6 @@ sync_manager_add_data_change_job(TizenSyncManager* pObject, GDBusMethodInvocatio
 
        guint pid = get_caller_pid(pInvocation);
        string pkgIdStr;
-       int sync_job_id = 0;
        char* pAppId;
 
        ret = app_manager_get_app_id(pid, &pAppId);
@@ -946,6 +964,8 @@ sync_manager_add_data_change_job(TizenSyncManager* pObject, GDBusMethodInvocatio
                pkgIdStr = SyncManager::GetInstance()->GetPkgIdByCommandline(pCommandLine);
                /* LCOV_EXCL_STOP */
        }
+
+       int sync_job_id = 0;
        if (!pkgIdStr.empty()) {
                LOG_LOGD("Params account [%d] job_name [%s] sync_option[%d] sync_job_id[%d] package [%s] ", accountId, pCapabilityArg, sync_option, sync_job_id, pkgIdStr.c_str());
 
@@ -1097,20 +1117,21 @@ sync_manager_add_sync_adapter(TizenSyncManager* pObject, GDBusMethodInvocation*
                        return true;
                        /* LCOV_EXCL_STOP */
                }
+
                if (pAggregator->HasSyncAdapter(pkgIdStr.c_str())) {
                        /* LCOV_EXCL_START */
                        const char *registered_app_id = pAggregator->GetSyncAdapter(pkgIdStr.c_str());
                        LOG_LOGD("registered appId is [%s]", registered_app_id);
                        LOG_LOGD("caller appId is [%s]", pAppId);
-                       if (strcmp(pAppId, registered_app_id)) {
+                       if (strncmp(pAppId, registered_app_id, strlen(pAppId))) {
                                GError* error = g_error_new(_sync_error_quark(), SYNC_ERROR_QUOTA_EXCEEDED, "Sync adapter already registered");
                                g_dbus_method_invocation_return_gerror(pInvocation, error);
                                g_clear_error(&error);
                                return false;
                        } else {
-                               check_jobs = true; // Probably sync service may have started this service. Alert sync manager for scheduling pending jobs.
-                       /* LCOV_EXCL_STOP */
+                               check_jobs = true; /* Probably sync service may have started this service. Alert sync manager for scheduling pending jobs */
                        }
+                       /* LCOV_EXCL_STOP */
                }
 
                char object_path[50];
@@ -1123,10 +1144,15 @@ sync_manager_add_sync_adapter(TizenSyncManager* pObject, GDBusMethodInvocation*
                        interface = G_DBUS_INTERFACE_SKELETON(syncAdapterObj);
                        if (g_dbus_interface_skeleton_export(interface, gdbusConnection, object_path, &error)) {
                                g_signal_connect(syncAdapterObj, "handle-send-result", G_CALLBACK(sync_adapter_handle_send_result), NULL);
-                               pAggregator->AddSyncAdapter(pkgIdStr.c_str(), pAppId);
 
-                               LOG_LOGD("inserting sync adapter ipc %s", pAppId);
-                               g_hash_table_insert(g_hash_table, strdup(pAppId), syncAdapterObj);
+                               char pAppUID[100];
+                               snprintf(pAppUID, 100, "%s#%d", pAppId, getuid());
+
+                               /* Add sync adapter as form of appId#uid */
+                               pAggregator->AddSyncAdapter(pkgIdStr.c_str(), pAppUID);
+
+                               LOG_LOGD("inserting sync adapter ipc %s", pAppUID);
+                               g_hash_table_insert(g_hash_table, strdup(pAppUID), syncAdapterObj);
 
                                ret = SYNC_ERROR_NONE;
                        } else {
@@ -1179,8 +1205,8 @@ sync_manager_remove_sync_adapter(TizenSyncManager* pObject, GDBusMethodInvocatio
 
        char* pAppId;
        int ret = APP_MANAGER_ERROR_NONE;
-
        ret = app_manager_get_app_id(pid, &pAppId);
+
        if (ret == APP_MANAGER_ERROR_NONE) {
                pkgIdStr = SyncManager::GetInstance()->GetPkgIdByAppId(pAppId);
        } else {
@@ -1196,13 +1222,16 @@ sync_manager_remove_sync_adapter(TizenSyncManager* pObject, GDBusMethodInvocatio
                pAggregator->RemoveSyncAdapter(pkgIdStr.c_str());
                LOG_LOGD("Sync adapter removed for package [%s]", pkgIdStr.c_str());
        } else {
-               LOG_LOGD("sync service: Get package Id fail %d", ret);  /* LCOV_EXCL_LINE */
+               LOG_LOGD("sync service: Get package Id fail [%d]", ret);        /* LCOV_EXCL_LINE */
        }
 
-       TizenSyncAdapter* pSyncAdapter = (TizenSyncAdapter*) g_hash_table_lookup(g_hash_table, pAppId);
+       char pAppUID[100];
+       snprintf(pAppUID, 100, "%s#%d", pAppId, getuid());
+
+       TizenSyncAdapter* pSyncAdapter = (TizenSyncAdapter*) g_hash_table_lookup(g_hash_table, pAppUID);
        if (pSyncAdapter == NULL) {
                /* LCOV_EXCL_START */
-               LOG_LOGD("Failed to lookup syncadapter gdbus object for [%s]", pAppId);
+               LOG_LOGD("Failed to lookup syncadapter gdbus object for [%s]", pAppUID);
                char object_path[50];
                snprintf(object_path, 50, "%s%d", SYNC_ADAPTER_DBUS_PATH, pid);
 
@@ -1215,7 +1244,7 @@ sync_manager_remove_sync_adapter(TizenSyncManager* pObject, GDBusMethodInvocatio
                                g_signal_connect(syncAdapterObj, "handle-send-result", G_CALLBACK(sync_adapter_handle_send_result), NULL);
                                pAggregator->RemoveSyncAdapter(pkgIdStr.c_str());
 
-                               LOG_LOGD("deletting sync adapter ipc %s", pAppId);
+                               LOG_LOGD("deletting sync adapter ipc [%s]", pAppUID);
 
                                ret = SYNC_ERROR_NONE;
                        } else {

diff --git a/src/sync-service/SyncManager_SyncService.h b/src/sync-service/SyncManager_SyncService.h
index a2b2d0cf9ce5da5235e7ec9901f7be94645807fe..3bb6e826ec619f5a33b979601c2814876842c849 100644 (file)
--- a/src/sync-service/SyncManager_SyncService.h
+++ b/src/sync-service/SyncManager_SyncService.h
@@ -42,9 +42,9 @@ class SyncService
 public:
        int StartService(void);
 
-       int TriggerStartSync(const char* appId, int accountId, const char* syncJobName, bool isDataSync, bundle* pExtras);
+       int TriggerStartSync(const char* appUID, int accountId, const char* syncJobName, bool isDataSync, bundle* pExtras);
 
-       void TriggerStopSync(const char* appId, int accountId, const char* syncJobName, bool isDataSync, bundle* pExtras);
+       void TriggerStopSync(const char* appUID, int accountId, const char* syncJobName, bool isDataSync, bundle* pExtras);
 
        int RequestOnDemandSync(const char* pPackageId, const char* pSyncJobName, int accountId, bundle* pExtras, int syncOption, int* pSyncJobId);