TizenRefApp-5629 [Call] Replace functionality from Call Settings needed for Call... 09/59009/4
authorIgor Olshevskyi <i.olshevskyi@samsung.com>
Mon, 8 Feb 2016 10:51:37 +0000 (12:51 +0200)
committerIgor Olshevskyi <i.olshevskyi@samsung.com>
Mon, 8 Feb 2016 14:38:37 +0000 (16:38 +0200)
Change-Id: I47c2dd970221470e4597baeffab1475a141e8bce

12 files changed:
SDK-Project/call-ui/res/po/en.po
SDK-Project/call-ui/res/po/en_PH.po
SDK-Project/call-ui/res/po/en_US.po
inc/callui-common.h
inc/callui-view-incoming-lock.h
res/po/en.po
res/po/en_PH.po
res/po/en_US.po
src/callui-common.c
src/callui-view-active-incoming-call.c
src/callui-view-incoming-call.c
src/callui-view-incoming-lock.c

index 508ef0f..b9b1c22 100644 (file)
@@ -178,3 +178,19 @@ msgstr "Return to call screen"
 msgid "IDS_CALL_MBODY_AUTO_REJECTED_CALL"
 msgstr "Auto rejected call"
 
+
+msgid "IDS_CST_MBODY_SORRY_IM_BUSY_CALL_YOU_LATER_ABB"
+msgstr "Sorry, I'm busy. Call you later."
+
+msgid "IDS_CST_BODY_SORRY_IM_BUSY_PLEASE_TEXT_ME_ABB"
+msgstr "Sorry, I'm busy. Please text me."
+
+msgid "IDS_CST_TMBODY_I_CANT_TALK_NOW_WHATS_UP_Q"
+msgstr "I can't talk now. What's up?"
+
+msgid "IDS_CST_BODY_IM_IN_A_MEETING"
+msgstr "I'm in a meeting."
+
+msgid "IDS_CST_TMBODY_SORRY_IM_DRIVING_NOW"
+msgstr "Sorry, I'm driving now."
+
index 29b2c87..b0868ea 100644 (file)
@@ -178,3 +178,18 @@ msgstr "Return to call screen"
 msgid "IDS_CALL_MBODY_AUTO_REJECTED_CALL"
 msgstr "Auto rejected call"
 
+
+msgid "IDS_CST_MBODY_SORRY_IM_BUSY_CALL_YOU_LATER_ABB"
+msgstr "Sorry, I'm busy. Call you later."
+
+msgid "IDS_CST_BODY_SORRY_IM_BUSY_PLEASE_TEXT_ME_ABB"
+msgstr "Sorry, I'm busy. Please text me."
+
+msgid "IDS_CST_TMBODY_I_CANT_TALK_NOW_WHATS_UP_Q"
+msgstr "I can't talk now. What's up?"
+
+msgid "IDS_CST_BODY_IM_IN_A_MEETING"
+msgstr "I'm in a meeting."
+
+msgid "IDS_CST_TMBODY_SORRY_IM_DRIVING_NOW"
+msgstr "Sorry, I'm driving now."
index d3f8d38..7f71b4e 100644 (file)
@@ -178,3 +178,18 @@ msgstr "Return to call screen"
 msgid "IDS_CALL_MBODY_AUTO_REJECTED_CALL"
 msgstr "Auto rejected call"
 
+msgid "IDS_CST_MBODY_SORRY_IM_BUSY_CALL_YOU_LATER_ABB"
+msgstr "Sorry, I'm busy. Call you later."
+
+msgid "IDS_CST_BODY_SORRY_IM_BUSY_PLEASE_TEXT_ME_ABB"
+msgstr "Sorry, I'm busy. Please text me."
+
+msgid "IDS_CST_TMBODY_I_CANT_TALK_NOW_WHATS_UP_Q"
+msgstr "I can't talk now. What's up?"
+
+msgid "IDS_CST_BODY_IM_IN_A_MEETING"
+msgstr "I'm in a meeting."
+
+msgid "IDS_CST_TMBODY_SORRY_IM_DRIVING_NOW"
+msgstr "Sorry, I'm driving now."
+
index e863d74..5128681 100644 (file)
@@ -279,4 +279,11 @@ const char *_callui_common_get_call_edj_path();
  */
 const char *_callui_common_get_call_theme_path();
 
+/**
+ * @brief Gets reject message text by index
+ * @param[in] index            index of the reject message
+ * @return reject message text
+ */
+char *_callui_common_get_reject_msg_by_index(int index);
+
 #endif //__CALLUI_COMMON_H_
index 1c4f069..cf3533d 100644 (file)
@@ -70,14 +70,6 @@ Evas_Object *_callui_view_incoming_lock_get_reject_layout(call_view_data_t *vd);
 void _callui_view_incoming_lock_set_reject_layout(call_view_data_t *vd, Evas_Object *layout);
 
 /**
- * @brief Create call setting handler
- *
- * @param[in]   data                    View data
- *
- */
-void _callui_view_incoming_lock_reject_msg_create_call_setting_handle(void *data);
-
-/**
  * @brief Send reject message
  *
  * @param[in]   data                    View data
@@ -137,11 +129,8 @@ typedef struct {
 
        gboolean bmouse_down_pressed;
 
-       void *dl_handle;
-
        Elm_Genlist_Item_Class *itc_reject_msg;
        Evas_Coord y_momentum;
-       char *(*msg_func_ptr) ();
        char reject_msg[CALLUI_REJECT_MSG_LENGTH_MAX];
 
 } incoming_lock_view_priv_t;
index 508ef0f..b9b1c22 100644 (file)
@@ -178,3 +178,19 @@ msgstr "Return to call screen"
 msgid "IDS_CALL_MBODY_AUTO_REJECTED_CALL"
 msgstr "Auto rejected call"
 
+
+msgid "IDS_CST_MBODY_SORRY_IM_BUSY_CALL_YOU_LATER_ABB"
+msgstr "Sorry, I'm busy. Call you later."
+
+msgid "IDS_CST_BODY_SORRY_IM_BUSY_PLEASE_TEXT_ME_ABB"
+msgstr "Sorry, I'm busy. Please text me."
+
+msgid "IDS_CST_TMBODY_I_CANT_TALK_NOW_WHATS_UP_Q"
+msgstr "I can't talk now. What's up?"
+
+msgid "IDS_CST_BODY_IM_IN_A_MEETING"
+msgstr "I'm in a meeting."
+
+msgid "IDS_CST_TMBODY_SORRY_IM_DRIVING_NOW"
+msgstr "Sorry, I'm driving now."
+
index 29b2c87..b0868ea 100644 (file)
@@ -178,3 +178,18 @@ msgstr "Return to call screen"
 msgid "IDS_CALL_MBODY_AUTO_REJECTED_CALL"
 msgstr "Auto rejected call"
 
+
+msgid "IDS_CST_MBODY_SORRY_IM_BUSY_CALL_YOU_LATER_ABB"
+msgstr "Sorry, I'm busy. Call you later."
+
+msgid "IDS_CST_BODY_SORRY_IM_BUSY_PLEASE_TEXT_ME_ABB"
+msgstr "Sorry, I'm busy. Please text me."
+
+msgid "IDS_CST_TMBODY_I_CANT_TALK_NOW_WHATS_UP_Q"
+msgstr "I can't talk now. What's up?"
+
+msgid "IDS_CST_BODY_IM_IN_A_MEETING"
+msgstr "I'm in a meeting."
+
+msgid "IDS_CST_TMBODY_SORRY_IM_DRIVING_NOW"
+msgstr "Sorry, I'm driving now."
index d3f8d38..7f71b4e 100644 (file)
@@ -178,3 +178,18 @@ msgstr "Return to call screen"
 msgid "IDS_CALL_MBODY_AUTO_REJECTED_CALL"
 msgstr "Auto rejected call"
 
+msgid "IDS_CST_MBODY_SORRY_IM_BUSY_CALL_YOU_LATER_ABB"
+msgstr "Sorry, I'm busy. Call you later."
+
+msgid "IDS_CST_BODY_SORRY_IM_BUSY_PLEASE_TEXT_ME_ABB"
+msgstr "Sorry, I'm busy. Please text me."
+
+msgid "IDS_CST_TMBODY_I_CANT_TALK_NOW_WHATS_UP_Q"
+msgstr "I can't talk now. What's up?"
+
+msgid "IDS_CST_BODY_IM_IN_A_MEETING"
+msgstr "I'm in a meeting."
+
+msgid "IDS_CST_TMBODY_SORRY_IM_DRIVING_NOW"
+msgstr "Sorry, I'm driving now."
+
index 30077c3..fb5651b 100755 (executable)
@@ -921,3 +921,99 @@ const char *_callui_common_get_call_theme_path()
 {
        return __callui_common_get_resource(CALL_THEME_EDJ_NAME);
 }
+
+static char *__callui_common_vconf_get_str(const char *in_key)
+{
+       char *result = vconf_get_str(in_key);
+       if (result == NULL) {
+               err("vconf get error : %s", in_key);
+       }
+       return result;
+}
+
+static char *__callui_common_parse_vconf_string(char *input_string)
+{
+       if (NULL == input_string) {
+               err("Input string is NULL");
+               return NULL;
+       }
+       int i;
+       char *parsed_message = NULL;
+       int input_string_len = strlen(input_string);
+
+       parsed_message = (char *)calloc(input_string_len + 1, sizeof(char));
+       if (NULL == parsed_message) {
+               err("Parsed message is NULL");
+               return NULL;
+       }
+
+       for (i = 0; i < input_string_len; i++) {
+               if (input_string[i] == '<' && input_string[i+1] == 'b' &&
+                       input_string[i+2] == 'r' && input_string[i+3] == '/' &&
+                       input_string[i+4] == '>') {
+                       i = i + 4;
+               } else {
+                       int j = 0;
+                       for (; i < input_string_len; i++) {
+                               if (input_string[i] == '<' && input_string[i+1] == 'b' &&
+                                       input_string[i+2] == 'r' && input_string[i+3] == '/' &&
+                                       input_string[i+4] == '>') {
+                                       if (parsed_message[j-1] != ' ') {
+                                               parsed_message[j] = ' ';
+                                               j++;
+                                       }
+                                       i = i + 4;
+                               } else {
+                                       parsed_message[j] = input_string[i];
+                                       j++;
+                               }
+                       }
+               }
+       }
+       return parsed_message;
+}
+
+char *_callui_common_get_reject_msg_by_index(int index)
+{
+       char *message = NULL;
+       char *markup_converted_message = NULL;
+       char *return_str = NULL;
+       char *parsed_message = NULL;
+
+       switch (index) {
+       case 0:
+               message = __callui_common_vconf_get_str(VCONFKEY_CISSAPPL_USER_CREATE_MSG1_STR);
+               break;
+       case 1:
+               message = __callui_common_vconf_get_str(VCONFKEY_CISSAPPL_USER_CREATE_MSG2_STR);
+               break;
+       case 2:
+               message = __callui_common_vconf_get_str(VCONFKEY_CISSAPPL_USER_CREATE_MSG3_STR);
+               break;
+       case 3:
+               message = __callui_common_vconf_get_str(VCONFKEY_CISSAPPL_USER_CREATE_MSG4_STR);
+               break;
+       case 4:
+               message = __callui_common_vconf_get_str(VCONFKEY_CISSAPPL_USER_CREATE_MSG5_STR);
+               break;
+       case 5:
+               message = __callui_common_vconf_get_str(VCONFKEY_CISSAPPL_USER_CREATE_MSG6_STR);
+               break;
+       default:
+               return NULL;
+       }
+
+       if (NULL == message) {
+               return NULL;
+       }
+
+       markup_converted_message = elm_entry_utf8_to_markup(message);
+       parsed_message = __callui_common_parse_vconf_string(markup_converted_message);
+       return_str = strdup(_(parsed_message));
+
+       free(parsed_message);
+       free(message);
+       free(markup_converted_message);
+
+       return return_str;
+}
index 6468f81..6c4d7e6 100644 (file)
@@ -80,7 +80,6 @@ static void __callui_view_active_incoming_call_reject_message_btn_cb(void *data,
                if (ad) {
                        evas_object_resize(ad->win, ad->root_w, ad->root_h);
                }
-               _callui_view_incoming_lock_reject_msg_create_call_setting_handle(vd);
                __callui_view_active_incoming_call_reject_msg_create_glist(vd);
                elm_object_signal_emit(priv->contents, "big_main_ly", "main_incoming_active_call");
        }
index 4b67b94..23c3b28 100644 (file)
@@ -604,7 +604,7 @@ static Evas_Object *__callui_view_incoming_call_create_reject_msg_layout(void *d
        evas_object_event_callback_add(priv->lock_reject_with_msg, EVAS_CALLBACK_MOUSE_UP, __callui_view_incoming_call_hw_mouse_up_cb, vd);
 
        evas_object_show(priv->lock_reject_with_msg);
-       _callui_view_incoming_lock_reject_msg_create_call_setting_handle(vd);
+
        __reject_msg_create_glist(vd);
        return priv->lock_reject_with_msg;
 }
index af3ba0e..ed30460 100755 (executable)
 
 #include <msg.h>
 #include <msg_transport.h>
-#include <dlfcn.h>
 #include <vconf.h>
 #include <notification.h>
 #include <Elementary.h>
-#include <tzplatform_config.h>
 
 #include "callui.h"
 #include "callui-view-layout.h"
@@ -31,8 +29,6 @@
 #include "callui-view-incoming-lock.h"
 #include "callui-common.h"
 #define REJ_MSG_LIST_OPEN_STATUS_KEY "list_open_status_key"
-#define CALLUI_CST_SO_PATH     tzplatform_mkpath(TZ_SYS_RO_UG, "/lib/libug-call-setting.so")
-#define CALLUI_CST_REJECT_MSG_GET      "cst_reject_msg_get"
 #define REJ_MSG_GENLIST_DATA "reject_msg_genlist_data"
 
 #define SAFE_C_CAST(type, value) ((type)(ptrdiff_t)value)
@@ -67,27 +63,6 @@ call_view_data_t *_callui_view_incoming_lock_new(callui_app_data_t *ad)
        return &incoming_lock_view;
 }
 
-void _callui_view_incoming_lock_reject_msg_create_call_setting_handle(void *data)
-{
-       dbg("..");
-       call_view_data_t *vd = (call_view_data_t *)data;
-       incoming_lock_view_priv_t *priv = (incoming_lock_view_priv_t *)vd->priv;
-       char *error = NULL;
-
-       priv->dl_handle = dlopen(CALLUI_CST_SO_PATH, RTLD_LAZY);
-       if (priv->dl_handle) {
-               priv->msg_func_ptr = dlsym(priv->dl_handle, CALLUI_CST_REJECT_MSG_GET);
-               if ((error = dlerror()) != NULL) {
-                       dbg("dlsym failed!!! error = %s", error);
-                       priv->msg_func_ptr = NULL;
-                       dlclose(priv->dl_handle);
-                       priv->dl_handle = NULL;
-               }
-       } else {
-               dbg("failed to open %s", CALLUI_CST_SO_PATH);
-       }
-}
-
 static void __send_reject_msg_status_cb(msg_handle_t Handle, msg_struct_t pStatus, void *pUserParam)
 {
        CALLUI_RETURN_IF_FAIL(pStatus != NULL);
@@ -242,21 +217,6 @@ static int __callui_view_incoming_lock_onshow(call_view_data_t *view_data, void
        return 0;
 }
 
-static char *__reject_list_get_msg_by_index(void *data, int index, Eina_Bool b_parsing)
-{
-       call_view_data_t *vd = (call_view_data_t *)data;
-       incoming_lock_view_priv_t *priv = (incoming_lock_view_priv_t *)vd->priv;
-
-       char *ret_str = NULL;
-
-       if (priv->msg_func_ptr) {
-               ret_str = (char *) priv->msg_func_ptr(index, b_parsing);  /* i : reject msg index(0 ~ 4)*/
-               sec_dbg("b_parsing(%d),ret_str(%s)", b_parsing, ret_str);
-       }
-
-       return ret_str;
-}
-
 static char *__callui_view_incoming_lock_reject_msg_gl_label_get_msg(void *data, Evas_Object *obj, const char *part)
 {
        CALLUI_RETURN_NULL_IF_FAIL(part);
@@ -268,7 +228,7 @@ static char *__callui_view_incoming_lock_reject_msg_gl_label_get_msg(void *data,
 
        if (!strcmp(part, "elm.text")) {
                if (index != -1) {
-                       msg_str = __reject_list_get_msg_by_index(vd, index, EINA_TRUE);
+                       msg_str = _callui_common_get_reject_msg_by_index(index);
                        sec_dbg("msg_str(%s)", msg_str);
                        return msg_str; /*Send markup text to draw the genlist */
                } else {
@@ -299,7 +259,7 @@ static void __reject_msg_gl_sel_msg(void *data, Evas_Object *obj, void *event_in
                incoming_lock_view_priv_t *priv = (incoming_lock_view_priv_t *)vd->priv;
                CALLUI_RETURN_IF_FAIL(priv);
 
-               ret_str =  __reject_list_get_msg_by_index(vd, index, EINA_TRUE);
+               ret_str =  _callui_common_get_reject_msg_by_index(index);
                if (ret_str) {
                        reject_msg = elm_entry_markup_to_utf8(ret_str); /*send utf8 text to MSG */
                        if (reject_msg != NULL) {