Get sim mail box info

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

diff --git a/src/imc_network.c b/src/imc_network.c
index 2a15ec9..c5d19ae 100644 (file)
--- a/src/imc_network.c
+++ b/src/imc_network.c
@@ -135,11 +135,9 @@ static void __imc_network_register_to_network(CoreObject *co)
        ret = tcore_at_prepare_and_send_request(co,
                "AT+COPS=0", NULL,
                TCORE_AT_COMMAND_TYPE_NO_RESULT,
-               TCORE_PENDING_PRIORITY_DEFAULT,
                NULL,
                __on_response_imc_network_registration, NULL,
-               on_send_imc_request, NULL,
-               0, NULL, NULL);
+               on_send_imc_request, NULL);
        dbg("Sending Network Registration request: [%s]",
                (ret == TEL_RETURN_SUCCESS ? "SUCCESS" : "FAIL"));
 }
@@ -332,11 +330,9 @@ static TelReturn __imc_network_fetch_nw_name(CoreObject *co,
        ret = tcore_at_prepare_and_send_request(co,
                "AT+XCOPS=0;+XCOPS=5;+XCOPS=6", "+XCOPS",
                TCORE_AT_COMMAND_TYPE_MULTILINE,
-               TCORE_PENDING_PRIORITY_DEFAULT,
                NULL,
                __on_response_imc_network_fetch_nw_name, resp_cb_data,
-               on_send_imc_request, NULL,
-               0, NULL, NULL);
+               on_send_imc_request, NULL);
        IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Fetch Network name");
 
        return ret;
@@ -927,6 +923,8 @@ static void on_response_imc_network_search(TcorePending *p,
 {
        const TcoreAtResponse *at_resp = data;
        CoreObject *co = tcore_pending_ref_core_object(p);
+       CustomData *custom_data;
+
        ImcRespCbData *resp_cb_data = user_data;
        TelNetworkResult result = TEL_NETWORK_RESULT_FAILURE; //TODO - CME Error mapping required.
        TelNetworkPlmnList plmn_list = {0, };
@@ -938,15 +936,16 @@ static void on_response_imc_network_search(TcorePending *p,
        tcore_check_return_assert(co != NULL);
        tcore_check_return_assert(resp_cb_data != NULL);
 
+       custom_data = tcore_object_ref_user_data(co);
+       tcore_check_return_assert(custom_data != NULL);
+
        if (at_resp && at_resp->success) {
-               CustomData *custom_data;
                const gchar *line;
                GSList *net_token = NULL;
                gchar *resp;
                gint act;
 
                /* If Request is Cancelled then return back SUCCESS/SEARCH_CANCELLED */
-               custom_data = tcore_object_ref_user_data(co);
                if (custom_data->search_state
                        == IMC_NETWORK_SEARCH_STATE_CANCELLED) {
                        dbg("Network Search has been Cancelled!!!");
@@ -961,9 +960,6 @@ static void on_response_imc_network_search(TcorePending *p,
                         */
                        result = TEL_NETWORK_RESULT_FAILURE;
 
-                       /* Update Search state */
-                       custom_data->search_state = IMC_NETWORK_SEARCH_STATE_NO_SEARCH;
-
                        goto END;
                }
 
@@ -1047,6 +1043,9 @@ END:
        dbg("Network search : [%s]",
                        (result == TEL_NETWORK_RESULT_SUCCESS ? "SUCCESS" : "FAIL"));
 
+       /* Update Search state */
+       custom_data->search_state = IMC_NETWORK_SEARCH_STATE_NO_SEARCH;
+
        /* Invoke callback */
        if (resp_cb_data->cb)
                resp_cb_data->cb(co, (gint)result, &plmn_list, resp_cb_data->cb_data);
@@ -1533,13 +1532,11 @@ static TelReturn imc_network_select_automatic(CoreObject *co,
        ret = tcore_at_prepare_and_send_request(co,
                "AT+COPS=0", NULL,
                TCORE_AT_COMMAND_TYPE_NO_RESULT,
-               TCORE_PENDING_PRIORITY_DEFAULT,
                NULL,
                on_response_imc_network_default, resp_cb_data,
-               on_send_imc_request, NULL,
-               0, NULL, NULL);
-
+               on_send_imc_request, NULL);
        IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Automatic network selection");
+
        return ret;
 }
 
@@ -1607,13 +1604,11 @@ static TelReturn imc_network_select_manual(CoreObject *co,
        ret = tcore_at_prepare_and_send_request(co,
                at_cmd, NULL,
                TCORE_AT_COMMAND_TYPE_NO_RESULT,
-               TCORE_PENDING_PRIORITY_DEFAULT,
                NULL,
                on_response_imc_network_default, resp_cb_data,
-               on_send_imc_request, NULL,
-               0, NULL, NULL);
-
+               on_send_imc_request, NULL);
        IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Manual network selection");
+
        /* Free resources*/
        g_free(at_cmd);
        return ret;
@@ -1653,13 +1648,11 @@ static TelReturn imc_network_get_selection_mode(CoreObject *co,
        ret = tcore_at_prepare_and_send_request(co,
                "AT+COPS?", "+COPS",
                TCORE_AT_COMMAND_TYPE_SINGLELINE,
-               TCORE_PENDING_PRIORITY_DEFAULT,
                NULL,
                on_response_imc_network_get_selection_mode, resp_cb_data,
-               on_send_imc_request, NULL,
-               0, NULL, NULL);
-
+               on_send_imc_request, NULL);
        IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Get selection mode");
+
        return ret;
 }
 
@@ -1731,13 +1724,11 @@ static TelReturn imc_network_set_preferred_plmn(CoreObject *co,
        ret = tcore_at_prepare_and_send_request(co,
                at_cmd, NULL,
                TCORE_AT_COMMAND_TYPE_NO_RESULT,
-               TCORE_PENDING_PRIORITY_DEFAULT,
                NULL,
                on_response_imc_network_default, resp_cb_data,
-               on_send_imc_request, NULL,
-               0, NULL, NULL);
-
+               on_send_imc_request, NULL);
        IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Set preferred plmn");
+
        g_free(at_cmd);
        return ret;
 }
@@ -1769,13 +1760,11 @@ static TelReturn imc_network_get_preferred_plmn(CoreObject *co,
        ret = tcore_at_prepare_and_send_request(co,
                "AT+CPOL=,2;+CPOL?", "+CPOL", //to make sure <oper> is numeric type in reponse.
                TCORE_AT_COMMAND_TYPE_MULTILINE,
-               TCORE_PENDING_PRIORITY_DEFAULT,
                NULL,
                on_response_imc_network_get_preferred_plmn, resp_cb_data,
-               on_send_imc_request, NULL,
-               0, NULL, NULL);
-
+               on_send_imc_request, NULL);
        IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Get preferred plmn");
+
        return ret;
 }
 
@@ -1840,12 +1829,11 @@ static TelReturn imc_network_set_mode(CoreObject *co, TelNetworkMode mode,
        ret = tcore_at_prepare_and_send_request(co,
                at_cmd, NULL ,
                TCORE_AT_COMMAND_TYPE_NO_RESULT,
-               TCORE_PENDING_PRIORITY_DEFAULT,
                NULL,
                on_response_imc_network_default, resp_cb_data,
-               on_send_imc_request, NULL,
-               0, NULL, NULL);
+               on_send_imc_request, NULL);
        IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Set network mode");
+
        g_free(at_cmd);
        return ret;
 }
@@ -1889,13 +1877,11 @@ static TelReturn imc_network_get_mode(CoreObject *co,
        ret = tcore_at_prepare_and_send_request(co,
                "AT+XRAT?", "+XRAT",
                TCORE_AT_COMMAND_TYPE_SINGLELINE,
-               TCORE_PENDING_PRIORITY_DEFAULT,
                NULL,
                on_response_imc_network_get_mode, resp_cb_data,
-               on_send_imc_request, NULL,
-               0, NULL, NULL);
-
+               on_send_imc_request, NULL);
        IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Get network mode");
+
        return ret;
 }