Merge branch 'tizen_5.5' into tizen

Change-Id: I6372c055249dd2a845fa36f8f1992ec964d59c13

diff --git a/consumer/CMakeLists.txt b/consumer/CMakeLists.txt
index 0e554b0..f98cc42 100644 (file)
--- a/consumer/CMakeLists.txt
+++ b/consumer/CMakeLists.txt
@@ -10,7 +10,7 @@ INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/include)
 FOREACH(flag ${pkgs_CFLAGS})
     SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
 ENDFOREACH(flag)
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Wall")
 
 ## Add definitions ##
 ADD_DEFINITIONS("-DPREFIX=\"${PREFIX}\"")

diff --git a/packaging/capi-ui-sticker.spec b/packaging/capi-ui-sticker.spec
index 40d7ac6..1fbe232 100644 (file)
--- a/packaging/capi-ui-sticker.spec
+++ b/packaging/capi-ui-sticker.spec
@@ -1,6 +1,6 @@
 Name:       capi-ui-sticker
 Summary:    Sticker client library and daemon
-Version:    0.1.44
+Version:    0.1.46
 Release:    1
 Group:      Graphics & UI Framework/Input
 License:    Apache-2.0

diff --git a/provider/CMakeLists.txt b/provider/CMakeLists.txt
index 9eb6d49..ea3c48a 100644 (file)
--- a/provider/CMakeLists.txt
+++ b/provider/CMakeLists.txt
@@ -10,7 +10,7 @@ INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/include)
 FOREACH(flag ${pkgs_CFLAGS})
     SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
 ENDFOREACH(flag)
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Wall")
 
 ## Add definitions ##
 ADD_DEFINITIONS("-DPREFIX=\"${PREFIX}\"")

diff --git a/receiver/CMakeLists.txt b/receiver/CMakeLists.txt
index 90c3837..4797abb 100644 (file)
--- a/receiver/CMakeLists.txt
+++ b/receiver/CMakeLists.txt
@@ -35,8 +35,8 @@ ENDFOREACH(flag)
 
 ADD_DEFINITIONS("-DEXPORTED=__attribute__((visibility(\"default\")))")
 
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIE")
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS} -fPIE")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Wall -fPIE")
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS} -Wall -fPIE")
 SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -pie")
 
 FIND_PROGRAM(UNAME NAMES uname)

diff --git a/receiver/inc/sticker_info.h b/receiver/inc/sticker_info.h
index 9784b5a..8deac5e 100644 (file)
--- a/receiver/inc/sticker_info.h
+++ b/receiver/inc/sticker_info.h
@@ -21,5 +21,6 @@ void insert_sticker_data(const char *filepath, const char *keyword, const char *
 int create_sticker_provider_handle(void);
 void destroy_sticker_provider_handle(void);
 void delete_sticker_data(const char *fileName);
+void delete_all_bitmoji_stickers();
 
 #endif /* __STICKER_INFO_H__ */

diff --git a/receiver/src/ft.cpp b/receiver/src/ft.cpp
index 98870c8..044c21e 100644 (file)
--- a/receiver/src/ft.cpp
+++ b/receiver/src/ft.cpp
@@ -66,7 +66,8 @@ using namespace std;
 
 enum {
     SYNC_START_RSP_SUCCESS = 1000,
-    SYNC_START_RSP_NO_STICKER = 1001
+    SYNC_START_RSP_NO_STICKER = 1001,
+    SYNC_START_RSP_BITMOJI_ALL_DELETE = 1002
 };
 
 struct sap_info_s {
@@ -93,7 +94,7 @@ static int sync_complete_flags = 0;
 static void save_last_sync_time()
 {
     // save last sync time in preference
-    double current_time = ecore_time_get();
+    double current_time = ecore_time_unix_get();
     if (preference_set_double(LAST_SYNC_TIME, current_time) == PREFERENCE_ERROR_NONE) {
         LOGI("Succeed to set last sync time : %f", current_time);
     }
@@ -633,7 +634,7 @@ static void send_sync_start_response(int result_code)
     int feature_flag = 0;
     string response_to_app;
     switch (result_code) {
-        case SYNC_START_RSP_SUCCESS:
+        case SYNC_START_RSP_SUCCESS || SYNC_START_RSP_BITMOJI_ALL_DELETE:
         {
             response_to_app = "success";
             if (current_request.category == string("arsticker"))
@@ -753,7 +754,7 @@ on_data_received(sap_socket_h socket, unsigned short int channel_id, unsigned in
 
         send_sync_start_response(result_code);
 
-        if (result_code != SYNC_START_RSP_SUCCESS) {
+        if (result_code == SYNC_START_RSP_NO_STICKER) {
             if (!process_request_queue()) {
 #ifdef VCONFKEY_STICKER_SUPPORTED_FEATURE
                 int feature_flag = 0;
@@ -780,11 +781,24 @@ on_data_received(sap_socket_h socket, unsigned short int channel_id, unsigned in
 #endif /* VCONFKEY_STICKER_SUPPORTED_FEATURE */
 
                 set_sync_progressing(FALSE);
-                if (result_code == SYNC_START_RSP_NO_STICKER)
-                    save_last_sync_time();
+                save_last_sync_time();
 
                 quit();
             }
+        } else if (result_code == SYNC_START_RSP_BITMOJI_ALL_DELETE) {
+            LOGD("Delete all bitmoji stickers");
+            if (create_sticker_provider_handle() == STICKER_ERROR_NONE) {
+                delete_all_bitmoji_stickers();
+                destroy_sticker_provider_handle();
+            }
+
+            set_sync_progressing(FALSE);
+            save_last_sync_time();
+
+            if (!process_request_queue()) {
+                sync_success_cnt = 0;
+                quit();
+            }
         }
     } else if (msg_id == STICKER_SEND_START_REQ) {
         LOGD("msg : %s", msg_id.c_str());

diff --git a/receiver/src/main.cpp b/receiver/src/main.cpp
index 6a7cb61..34b9837 100644 (file)
--- a/receiver/src/main.cpp
+++ b/receiver/src/main.cpp
@@ -98,14 +98,14 @@ static bool check_sync_time_condition()
         }
 
         // compare time
-        LOGD("current time : %f, last_sync_time : %f", ecore_time_get(), last_sync_time);
+        LOGD("current time : %f, last_sync_time : %f", ecore_time_unix_get(), last_sync_time);
 
-        if (ecore_time_get() - last_sync_time > MAX_WAIT_TIME) {
+        if (ecore_time_unix_get() - last_sync_time > MAX_WAIT_TIME) {
             initialize_sap();
             request_show_sync_notification();
             result = false;
         } else {
-            if (ecore_time_get() - last_sync_time > SYNC_INTERVAL)
+            if (ecore_time_unix_get() - last_sync_time > SYNC_INTERVAL)
                 result = true;
             else
                 result = false;

diff --git a/receiver/src/sticker_info.cpp b/receiver/src/sticker_info.cpp
index 2d5e58d..2b59d57 100644 (file)
--- a/receiver/src/sticker_info.cpp
+++ b/receiver/src/sticker_info.cpp
@@ -142,4 +142,35 @@ void delete_sticker_data(const char *fileName)
     ret = sticker_provider_delete_data_by_uri(sticker_provider, fileName);
     if (ret != STICKER_ERROR_NONE)
         LOGE("Failed to delete sticker. ret : %d", ret);
+}
+
+static void _delete_all_bitmoji_stickers_cb(sticker_data_h data_handle, void *user_data)
+{
+    int ret;
+    char *group = NULL;
+
+    ret = sticker_data_get_group_name(data_handle, &group);
+    if (ret != STICKER_ERROR_NONE)
+        LOGE("Failed to get group name. ret : %d", ret);
+
+    if (strcmp(group, "bitmoji") == 0) {
+        ret = sticker_provider_delete_data(sticker_provider, data_handle);
+        if (ret != STICKER_ERROR_NONE)
+            LOGE("Failed to delete sticker. ret : %d", ret);
+    }
+}
+
+void delete_all_bitmoji_stickers()
+{
+    int ret;
+    int total_cnt;
+    int result;
+
+    ret = sticker_provider_get_sticker_count(sticker_provider, &total_cnt);
+    if (ret != STICKER_ERROR_NONE)
+        LOGE("Failed to get sticker count. ret : %d", ret);
+
+    ret = sticker_provider_data_foreach_all(sticker_provider, 0, total_cnt, &result, _delete_all_bitmoji_stickers_cb, NULL);
+    if (ret != STICKER_ERROR_NONE)
+        LOGE("Failed to retrieve all sticker data. ret : %d", ret);
 }
\ No newline at end of file

diff --git a/receiver/tizen-manifest.xml b/receiver/tizen-manifest.xml
index d394841..307d7db 100644 (file)
--- a/receiver/tizen-manifest.xml
+++ b/receiver/tizen-manifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns="http://tizen.org/ns/packages" api-version="5.5" package="org.tizen.sticker-receiver" version="1.0.44">
+<manifest xmlns="http://tizen.org/ns/packages" api-version="5.5" package="org.tizen.sticker-receiver" version="1.0.46">
         <profile name="wearable" />
         <service-application appid="org.tizen.sticker-receiver" exec="sticker-receiver" type="capp" multiple="false" taskmanage="false" nodisplay="true" launch_mode="single">
             <label>sticker-receiver</label>