Fix Call ID is not reflecting settings/vconf state.

[platform/core/telephony/tel-plugin-imc.git] / src / s_call.c

diff --git a/src/s_call.c b/src/s_call.c
old mode 100644 (file)
new mode 100755 (executable)
index 1cc7ef5..ea69d0b
--- a/src/s_call.c
+++ b/src/s_call.c
@@ -29,6 +29,7 @@
 #include <core_object.h>
 #include <plugin.h>
 #include <queue.h>
+#include <storage.h>
 #include <co_call.h>
 #include <user_request.h>
 #include <server.h>
@@ -268,7 +269,7 @@ const call_end_cause_info call_end_cause_table[] =   // call end cause table to
 
 static enum tcore_call_cli_mode _get_clir_status(char *num)
 {
-       enum tcore_call_cli_mode clir = CALL_CLI_MODE_DEFAULT;
+       enum tcore_call_cli_mode clir = TCORE_CALL_CLI_MODE_DEFAULT;
 
        dbg("Entry");
 
@@ -282,7 +283,10 @@ static enum tcore_call_cli_mode _get_clir_status(char *num)
                return TCORE_CALL_CLI_MODE_PRESENT;
        }
 
-       err("Exit");
+       dbg("CLI mode default");
+
+       dbg("Exit");
+
        return clir;
 }
 
@@ -844,7 +848,7 @@ static void on_confirmation_call_outgoing(TcorePending *p, int data_len, const v
                err("User Request is NULL");
        }
 
-       dbg("Exit")
+       dbg("Exit");
        return;
 }
 
@@ -2367,10 +2371,7 @@ static int _callFromCLCCLine(char *line, struct clcc_call_t *p_call)
 ERROR:
        err("Invalid CLCC line");
 
-       if (num) {
-               g_free(num);
-               num = NULL;
-       }
+       g_free(num);
 
        // Free tokens
        tcore_at_tok_free(tokens);
@@ -2481,7 +2482,7 @@ static void on_notification_call_incoming(CoreObject *o, const void *data, void
                return;
        }
 
-       dbg("freeing  at token")
+       dbg("freeing  at token");
        tcore_at_tok_free(tokens);
 
        eflag = g_new0(gboolean, 1);
@@ -2614,52 +2615,61 @@ static void on_notification_call_status(CoreObject *o, const void *data, void *u
 static TReturn s_call_outgoing(CoreObject *o, UserRequest *ur)
 {
        struct treq_call_dial *data = 0;
-       char *raw_str = NULL;
-       char *cmd_str = NULL;
-       const char *cclir;
+       char *cmd_str;
+       const char *cclir, *num;
        enum tcore_call_cli_mode clir = CALL_CLI_MODE_DEFAULT;
-       TcorePending *pending = NULL;
+       TcorePending *pending;
        TcoreATRequest *req;
-       gboolean ret = FALSE;
-
-       dbg("function entrance");
+       gboolean ret;
 
-       if (FALSE == tcore_hal_get_power_state(tcore_object_get_hal(o))) {
-               dbg("cp not ready/n");
-               return TCORE_RETURN_ENOSYS;
-       }
+       dbg("Entry");
 
        data = (struct treq_call_dial *) tcore_user_request_ref_data(ur, 0);
        if (data->type == CALL_TYPE_VIDEO) {
-               dbg("invalid call type")
+               dbg("invalid call type");
                return TCORE_RETURN_FAILURE;
        }
 
        clir = _get_clir_status(data->number);
 
-       // Compose ATD Cmd string
+       if (clir == TCORE_CALL_CLI_MODE_DEFAULT) {
+               TcorePlugin *plugin = tcore_object_ref_plugin(o);
+               Server *server = tcore_plugin_ref_server(plugin);
+               Storage *strg;
+
+               dbg("Reading VCONF key");
+
+               strg = tcore_server_find_storage(server, "vconf");
+               clir = tcore_storage_get_int(strg,
+                               STORAGE_KEY_CISSAPPL_SHOW_MY_NUMBER_INT);
+
+               num = data->number;
+       } else
+               /* Need to remove CLIR code from dialing number */
+               num = data->number + 4;
+
+       /* Compose ATD Cmd string */
        switch (clir) {
        case TCORE_CALL_CLI_MODE_PRESENT:
                dbg("CALL_CLI_MODE_PRESENT");
-               cclir = "I";
-               break;  // invocation
+               cclir = "i";
+               break;
 
        case TCORE_CALL_CLI_MODE_RESTRICT:
                dbg("CALL_CLI_MODE_RESTRICT");
-               cclir = "i";
-               break;  // suppression
+               cclir = "I";
+               break;
 
        case TCORE_CALL_CLI_MODE_DEFAULT:
        default:
                cclir = "";
                dbg("CALL_CLI_MODE_DEFAULT");
-               break;   // subscription default
+               break;
        }
 
        dbg("data->number = %s", data->number);
 
-       raw_str = g_strdup_printf("ATD%s%s;", data->number, cclir);
-       cmd_str = g_strdup_printf("%s", raw_str);
+       cmd_str = g_strdup_printf("ATD%s%s;", num, cclir);
 
        dbg("request command : %s", cmd_str);
 
@@ -2670,16 +2680,17 @@ static TReturn s_call_outgoing(CoreObject *o, UserRequest *ur)
        tcore_pending_set_request_data(pending, 0, req);
        ret = _call_request_message(pending, o, ur, on_confirmation_call_outgoing, NULL);
 
-       g_free(raw_str);
        g_free(cmd_str);
 
-       if (!ret) {
+       if (ret == FALSE) {
                dbg("AT request(%s) sent failed", req->cmd);
                return TCORE_RETURN_FAILURE;
        }
 
        dbg("AT request(%s) sent success", req->cmd);
 
+       dbg("Exit");
+
        return TCORE_RETURN_SUCCESS;
 }
 
@@ -3037,7 +3048,7 @@ static TReturn s_call_send_dtmf(CoreObject *o, UserRequest *ur)
        g_free(cmd_str);
 
        if (!ret) {
-               dbg("AT request sent failed")
+               dbg("AT request sent failed");
                return TCORE_RETURN_FAILURE;
        }