removed code for excluding calendar on wearable

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

diff --git a/include/sync_manager.h b/include/sync_manager.h
index 8dc29140e3fd870bc06900098dc4d5228874647f..e69ef30263dde154931ad962f024eced64332bdd 100644 (file)
--- a/include/sync_manager.h
+++ b/include/sync_manager.h
@@ -44,8 +44,8 @@ extern "C"
 
 /**
  *  @brief             This is calendar capability string.
- *  @since_tizen @if MOBILE 2.4 @endif
- *  @remarks   This capability is supported on Mobile profile only. If you want to receive notification about calendar DB change, add it through sync_manager_add_data_change_sync_job().
+ *  @since_tizen @if MOBILE 2.4 @endif WEARABLE 4.0 @endif
+ *  @remarks   If you want to receive notification about calendar DB change, add it through sync_manager_add_data_change_sync_job().
  *  @see               sync_manager_add_data_change_sync_job()
  */
 #define SYNC_SUPPORTS_CAPABILITY_CALENDAR      "http://tizen.org/sync/capability/calendar"

diff --git a/packaging/sync-manager.spec b/packaging/sync-manager.spec
index 676c72cbb031ec6566b21d171b3887befe11a1f0..4400a1a40274a3dfb089350ca5ff4e3021ebac73 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.2.24
+Version:   0.2.25
 Release:   1
 License:   Apache-2.0
 Summary:   Sync manager daemon
@@ -34,10 +34,7 @@ BuildRequires: pkgconfig(bundle)
 BuildRequires: pkgconfig(cynara-client)
 BuildRequires: pkgconfig(cynara-session)
 BuildRequires: pkgconfig(cynara-creds-gdbus)
-# If it is mobile, common, or "unified (undefined)"
-%if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "ivi"
 BuildRequires: pkgconfig(calendar-service2)
-%endif
 BuildRequires: pkgconfig(contacts-service2)
 BuildRequires: pkgconfig(capi-content-media-content)
 BuildRequires: pkgconfig(libtzplatform-config)
@@ -63,8 +60,6 @@ sync client provides sync adapter functionality to register sync adapters and to
 %define _pkgdir /usr
 %define _upgrade_script_path %{_pkgdir}/share/upgrade/scripts/
 %define _upgrade_script 500.sync-manager.sh
-#%define _bindir %{_pkgdir}/bin
-#%define _systemd_dir /usr/lib/systemd/system
 
 %prep
 %setup -q
@@ -73,15 +68,6 @@ cp %{SOURCE2} .
 %build
 _FEATURE_CONTAINER_ENABLE=OFF
 
-# If it is mobile, common, or "unified (undefined)"
-%if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "ivi"
-# Support runtime feature on/off
-_RUNTIME_PROFILE_TEST=ON
-%else
-# Always off.
-_RUNTIME_PROFILE_TEST=OFF
-%endif
-
 cmake \
        -DCMAKE_INSTALL_PREFIX=%{_pkgdir} \
        -DPACKAGE_NAME=%{name} \
@@ -89,10 +75,8 @@ cmake \
        -DLIBDIR=%{_libdir} \
        -DINCLUDEDIR=%{_includedir} \
        -D_FEATURE_CONTAINER_ENABLE:BOOL=${_FEATURE_CONTAINER_ENABLE} \
-       -D_RUNTIME_PROFILE_TEST:BOOL=${_RUNTIME_PROFILE_TEST} \
        -DVERSION=%{version}
 
-
 make %{?jobs:-j%jobs}
 
 %install
@@ -130,10 +114,6 @@ chmod 644 %{TZ_SYS_HOME}/%{TZ_SYS_DEFAULT_USER}/.applications/dbspace/.sync-mana
 chsmack -a "*" %{TZ_SYS_HOME}/%{TZ_SYS_DEFAULT_USER}/.applications/dbspace/.sync-manager.db
 chsmack -a "*" %{TZ_SYS_HOME}/%{TZ_SYS_DEFAULT_USER}/.applications/dbspace/.sync-manager.db-journal
 
-#chown system:system %{TZ_SYS_DATA}/sync-manager/
-#systemctl enable sync-manager.service
-#systemctl start sync-manager.service
-
 %postun -n libcore-sync-client -p /sbin/ldconfig
 %postun -n libcore-sync-client-devel -p /sbin/ldconfig
 
@@ -143,8 +123,6 @@ chsmack -a "*" %{TZ_SYS_HOME}/%{TZ_SYS_DEFAULT_USER}/.applications/dbspace/.sync
 %defattr(-,root,root,-)
 %config %{_sysconfdir}/dbus-1/session.d/org.tizen.sync.conf
 %{_bindir}/*
-#%{_unitdir}/*
-#%{TZ_SYS_DATA}/sync-manager/
 %{_unitdir_user}/sync-manager.service
 %{_unitdir_user}/default.target.wants/sync-manager.service
 %attr(0644,root,root) /usr/share/dbus-1/services/org.tizen.sync.service

diff --git a/src/sync-client/CMakeLists.txt b/src/sync-client/CMakeLists.txt
index 1ab752b34b3058c3e5fc1268aa7c5d2db463a53c..2791732047db3bf5a601f5947b86218d6b34bdc5 100644 (file)
--- a/src/sync-client/CMakeLists.txt
+++ b/src/sync-client/CMakeLists.txt
@@ -23,18 +23,10 @@ IF(NOT DEFINED PACKAGE_NAME)
 ENDIF(NOT DEFINED PACKAGE_NAME)
 
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
-#SET(LIBDIR "${PREFIX}/lib")
-#SET(INCLUDEDIR "${PREFIX}/include")
 SET(VERSION_MAJOR 1)
 SET(FULLVER "${VERSION_MAJOR}.0")
 
-IF(_RUNTIME_PROFILE_TEST)
-       ADD_DEFINITIONS("-D_RUNTIME_PROFILE_TEST=1")
-ENDIF(_RUNTIME_PROFILE_TEST)
-
-
 INCLUDE_DIRECTORIES(
-#              ./
                ${CMAKE_SOURCE_DIR}/include
                ${CMAKE_SOURCE_DIR}/common
 )

diff --git a/src/sync-client/sync_manager.c b/src/sync-client/sync_manager.c
index b809a76a05aabfbd60fac9c57cd89ebf6e31d416..5124a6254819dbeb461d6f2f8cd0453e578dde14 100644 (file)
--- a/src/sync-client/sync_manager.c
+++ b/src/sync-client/sync_manager.c
@@ -36,7 +36,7 @@
 #define SYNC_ADAPTER_DBUS_PATH "/org/tizen/sync/adapter"
 #define SYNC_ERROR_PREFIX "org.tizen.sync.Error"
 
-#ifdef _RUNTIME_PROFILE_TEST
+
 #include <system_info.h>
 typedef enum {
        TIZEN_PROFILE_UNKNOWN = 0,
@@ -81,13 +81,7 @@ static inline tizen_profile_t _get_tizen_profile()
 
        return profile;
 }
-#define _FEATURE_CALENDAR_ENABLE (_get_tizen_profile() == TIZEN_PROFILE_MOBILE)
-
-#else /* _RUNTIME_PROFILE_TEST */
-
-#define _FEATURE_CALENDAR_ENABLE (0)
 
-#endif /* _RUNTIME_PROFILE_TEST */
 
 typedef struct sync_manager_s {
        TizenSyncManager *ipcObj;
@@ -378,8 +372,7 @@ int sync_manager_add_periodic_sync_job(account_h account, const char *sync_job_n
 int sync_manager_add_data_change_sync_job(account_h account, const char *sync_capability, sync_option_e sync_option, bundle *sync_job_user_data, int *sync_job_id)
 {
        if (sync_capability != NULL) {
-               if (
-                       ((_FEATURE_CALENDAR_ENABLE) ? !(strcmp(sync_capability, "http://tizen.org/sync/capability/calendar")) : 0) ||
+               if (!(strcmp(sync_capability, "http://tizen.org/sync/capability/calendar")) ||
                        !(strcmp(sync_capability, "http://tizen.org/sync/capability/contact")) ||
                        !(strcmp(sync_capability, "http://tizen.org/sync/capability/image")) ||
                        !(strcmp(sync_capability, "http://tizen.org/sync/capability/video")) ||

diff --git a/src/sync-service/CMakeLists.txt b/src/sync-service/CMakeLists.txt
index ba7a852e42339b1063a88806d904c41b34045703..eeee79ccef5eda8b2a9e7d1261bcf86fbf72f287 100644 (file)
--- a/src/sync-service/CMakeLists.txt
+++ b/src/sync-service/CMakeLists.txt
@@ -68,10 +68,6 @@ SET(SRCS
 #      ADD_DEFINITIONS("-D_FEATURE_CONTAINER_ENABLE=1")
 #ENDIF(_FEATURE_CONTAINER_ENABLE)
 
-IF(_RUNTIME_PROFILE_TEST)
-       ADD_DEFINITIONS("-D_RUNTIME_PROFILE_TEST=1")
-ENDIF(_RUNTIME_PROFILE_TEST)
-
 ADD_DEFINITIONS("-DPACKAGE=\"${PACKAGE_NAME}\"")
 
 INCLUDE(FindPkgConfig)
@@ -95,6 +91,7 @@ SET(PACKAGES
                gio-unix-2.0
                alarm-service
                bundle
+               calendar-service2
                contacts-service2
                cynara-client
                cynara-session
@@ -106,10 +103,6 @@ IF(_FEATURE_CONTAINER_ENABLE)
        SET(PACKAGES ${PACKAGES} vasum)
 ENDIF(_FEATURE_CONTAINER_ENABLE)
 
-IF(_RUNTIME_PROFILE_TEST)
-       SET(PACKAGES ${PACKAGES} calendar-service2)
-ENDIF(_RUNTIME_PROFILE_TEST)
-
 pkg_check_modules(PKGS REQUIRED ${PACKAGES})
 
 FOREACH(flag ${PKGS_CFLAGS})
@@ -138,3 +131,4 @@ ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS} sync-manager-stub.c sync-adapter-stub.c)
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${PKGS_LDFLAGS} "-ldl")
 #TARGET_LINK_LIBRARIES(${PROJECT_NAME} core-sync-client)
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR})
+

diff --git a/src/sync-service/SyncManager_DataChangeSyncScheduler.cpp b/src/sync-service/SyncManager_DataChangeSyncScheduler.cpp
index a76d57860b879c78fd61f266c847838e309b30c6..50c08bf59cb1cd41ae257fcdbc9da52d4d08dd12 100644 (file)
--- a/src/sync-service/SyncManager_DataChangeSyncScheduler.cpp
+++ b/src/sync-service/SyncManager_DataChangeSyncScheduler.cpp
@@ -19,10 +19,8 @@
  * @brief   This is the implementation file for the DataChangeListener class.
  */
 
-#if defined(_RUNTIME_PROFILE_TEST)
-#include <calendar.h>
-#endif
 
+#include <calendar.h>
 #include <contacts.h>
 #include <media_content.h>
 #include "sync-error.h"
@@ -33,7 +31,6 @@
 
 
 /* LCOV_EXCL_START */
-#if defined(_RUNTIME_PROFILE_TEST)
 void OnCalendarBookChanged(const char* view_uri, void* user_data) {
        LOG_LOGD("On Calendar Book Changed");
 
@@ -56,7 +53,6 @@ void OnCalendarTodoChanged(const char* view_uri, void* user_data) {
        DataChangeSyncScheduler* pDCScheduler = (DataChangeSyncScheduler*) (user_data);
        pDCScheduler->HandleDataChangeEvent(SYNC_SUPPORTS_CAPABILITY_CALENDAR);
 }
-#endif
 
 
 void OnContactsDataChanged(const char* view_uri, void* user_data) {
@@ -117,7 +113,6 @@ DataChangeSyncScheduler::~DataChangeSyncScheduler(void) {
 /* LCOV_EXCL_STOP */
 
 
-#if defined(_RUNTIME_PROFILE_TEST)
 int
 DataChangeSyncScheduler::SubscribeCalendarCallback(void) {
        SYNC_LOGE_RET_RES(!calendar_subscription_started, SYNC_ERROR_NONE, "Calendar Callback Already Subscribed");
@@ -170,7 +165,6 @@ DataChangeSyncScheduler::SubscribeCalendarCallback(void) {
 
        return SYNC_ERROR_NONE;
 }
-#endif
 
 
 int
@@ -226,7 +220,6 @@ DataChangeSyncScheduler::SubscribeMediaContentCallback(void) {
 
 
 /* LCOV_EXCL_START */
-#if defined(_RUNTIME_PROFILE_TEST)
 int
 DataChangeSyncScheduler::UnSubscribeCalendarCallback(void) {
        SYNC_LOGE_RET_RES(calendar_subscription_started, SYNC_ERROR_NONE, "Calendar Callback Already UnSubscribed");
@@ -240,7 +233,6 @@ DataChangeSyncScheduler::UnSubscribeCalendarCallback(void) {
 
        return SYNC_ERROR_NONE;
 }
-#endif
 
 
 int
@@ -274,14 +266,12 @@ int
 DataChangeSyncScheduler::RegisterDataChangeListeners(void) {
        int err = SYNC_ERROR_NONE;
 
-       if (_FEATURE_CALENDAR_ENABLE) {
-               err = SubscribeCalendarCallback();
-               if (err != SYNC_ERROR_NONE) {
-                       /* LCOV_EXCL_START */
-                       LOG_LOGD("Registration of Calendar DataChangeListener Failed");
-                       return SYNC_ERROR_INVALID_OPERATION;
-                       /* LCOV_EXCL_STOP */
-               }
+       err = SubscribeCalendarCallback();
+       if (err != SYNC_ERROR_NONE) {
+               /* LCOV_EXCL_START */
+               LOG_LOGD("Registration of Calendar DataChangeListener Failed");
+               return SYNC_ERROR_INVALID_OPERATION;
+               /* LCOV_EXCL_STOP */
        }
 
        err = SubscribeContactsCallback();
@@ -309,12 +299,10 @@ int
 DataChangeSyncScheduler::DeRegisterDataChangeListeners(void) {
        int err = VALUE_UNDEFINED;
 
-       if (_FEATURE_CALENDAR_ENABLE) {
-               err = UnSubscribeCalendarCallback();
-               if (err != SYNC_ERROR_NONE) {
-                       LOG_LOGD("DeRegistration of Calendar DataChangeListener Failed");
-                       return SYNC_ERROR_INVALID_OPERATION;
-               }
+       err = UnSubscribeCalendarCallback();
+       if (err != SYNC_ERROR_NONE) {
+               LOG_LOGD("DeRegistration of Calendar DataChangeListener Failed");
+               return SYNC_ERROR_INVALID_OPERATION;
        }
 
        err = UnSubscribeContactsCallback();
@@ -376,3 +364,4 @@ DataChangeSyncScheduler::RemoveDataSyncJob(DataSyncJob* dataSyncJob) {
                }
        }
 }
+

diff --git a/src/sync-service/SyncManager_SyncDefines.h b/src/sync-service/SyncManager_SyncDefines.h
index 9285cfe836d78aaa55468c2f5b84951986296273..c49e31c59ca9d98b99778f0d820d93cb2382f276 100644 (file)
--- a/src/sync-service/SyncManager_SyncDefines.h
+++ b/src/sync-service/SyncManager_SyncDefines.h
@@ -231,10 +231,5 @@ typedef enum {
 } tizen_profile_t;
 extern tizen_profile_t _get_tizen_profile();
 
-#ifdef _RUNTIME_PROFILE_TEST
-#define _FEATURE_CALENDAR_ENABLE (_get_tizen_profile() == TIZEN_PROFILE_MOBILE)
-#else /* _RUNTIME_PROFILE_TEST */
-#define _FEATURE_CALENDAR_ENABLE (0)
-#endif /* _RUNTIME_PROFILE_TEST */
 
 #endif /* SYNC_SERVICE_SYNC_DEFINES_H */

diff --git a/src/sync-service/SyncManager_SyncService.cpp b/src/sync-service/SyncManager_SyncService.cpp
index 1882f41578cee64b201e7f6d05b5e4b6321855ee..0d1867b81a3f2089d19929b6ac337dc8b0fa9876 100644 (file)
--- a/src/sync-service/SyncManager_SyncService.cpp
+++ b/src/sync-service/SyncManager_SyncService.cpp
@@ -890,44 +890,26 @@ sync_manager_add_data_change_job(TizenSyncManager* pObject, GDBusMethodInvocatio
 
        int ret = SYNC_ERROR_NONE;
 
-       if (_FEATURE_CALENDAR_ENABLE) {
-               const char *capability = (char *)pCapabilityArg;
-               if (!strcmp(capability, "http://tizen.org/sync/capability/calendar") ||
-                       !strcmp(capability, "http://tizen.org/sync/capability/contact")) {
-                       if (!strcmp(capability, "http://tizen.org/sync/capability/calendar"))
-                               ret = _check_privilege_calendar_read(pInvocation);
-                       else
-                               ret = _check_privilege_contact_read(pInvocation);
-
-                       if (ret != SYNC_ERROR_NONE) {
-                               /* LCOV_EXCL_START */
-                               GError* error = NULL;
-                               if (!strcmp(capability, "http://tizen.org/sync/capability/calendar"))
-                                       error = g_error_new(_sync_error_quark(), ret, "sync service: calendar.read permission denied");
-                               else
-                                       error = g_error_new(_sync_error_quark(), ret, "sync service: contact.read permission denied");
-
-                               g_dbus_method_invocation_return_gerror(pInvocation, error);
-                               g_clear_error(&error);
-                               /* LCOV_EXCL_STOP */
-                               return true;
-                       }
-               }
-       } else {
-               const char *capability = (char *)pCapabilityArg;
-               if (!strcmp(capability, "http://tizen.org/sync/capability/contact")) {
+       const char *capability = (char *)pCapabilityArg;
+       if (!strcmp(capability, "http://tizen.org/sync/capability/calendar") ||
+               !strcmp(capability, "http://tizen.org/sync/capability/contact")) {
+               if (!strcmp(capability, "http://tizen.org/sync/capability/calendar"))
+                       ret = _check_privilege_calendar_read(pInvocation);
+               else
                        ret = _check_privilege_contact_read(pInvocation);
 
-                       if (ret != SYNC_ERROR_NONE) {
-                               /* LCOV_EXCL_START */
-                               GError* error = NULL;
+               if (ret != SYNC_ERROR_NONE) {
+                       /* LCOV_EXCL_START */
+                       GError* error = NULL;
+                       if (!strcmp(capability, "http://tizen.org/sync/capability/calendar"))
+                               error = g_error_new(_sync_error_quark(), ret, "sync service: calendar.read permission denied");
+                       else
                                error = g_error_new(_sync_error_quark(), ret, "sync service: contact.read permission denied");
 
-                               g_dbus_method_invocation_return_gerror(pInvocation, error);
-                               g_clear_error(&error);
-                               /* LCOV_EXCL_STOP */
-                               return true;
-                       }
+                       g_dbus_method_invocation_return_gerror(pInvocation, error);
+                       g_clear_error(&error);
+                       /* LCOV_EXCL_STOP */
+                       return true;
                }
        }