Updated SAT functionality

 - Build fix for SAP debug logging

Change-Id: I0994476e09b8e0e76ae99f89680ee65304877d29

diff --git a/introspection/sat.xml b/introspection/sat.xml
index bc70d5368eb846ae9745962479916bb1f86b5fc4..874f94387c95e4de194806474b35cce4744ecfc6 100644 (file)
--- a/introspection/sat.xml
+++ b/introspection/sat.xml
@@ -209,7 +209,7 @@
                </signal>
 
                <signal name="SetupEventList">
-                       <arg type="i" name="event_cnt"/>
+                       <arg type="y" name="event_cnt"/>
                        <arg type="v" name="evt_list"/>
                </signal>
 

diff --git a/packaging/tel-plugin-dbus_tapi.spec b/packaging/tel-plugin-dbus_tapi.spec
index b6414481aacf5f151327ec103e415f2aacecc546..7477ad24bfda246a91de268a1edce2d72a24a174 100644 (file)
--- a/packaging/tel-plugin-dbus_tapi.spec
+++ b/packaging/tel-plugin-dbus_tapi.spec
@@ -1,6 +1,6 @@
 %define major 0
 %define minor 3
-%define patchlevel 66
+%define patchlevel 67
 
 Name:           tel-plugin-dbus_tapi
 Version:        %{major}.%{minor}.%{patchlevel}

diff --git a/src/dtapi_sap.c b/src/dtapi_sap.c
index 5826d051b855947b4d62cfb137e84f91126bef40..aaea8608407856535e383434b65cdeb315756cce 100644 (file)
--- a/src/dtapi_sap.c
+++ b/src/dtapi_sap.c
@@ -263,8 +263,8 @@ gboolean dbus_plugin_sap_response(struct custom_data *ctx,
        case TRESP_SAP_REQ_CONNECT: {
                const struct tresp_sap_req_connect *sap_conn = data;
 
-               dbg("[%s] TRESP_SAP_REQ_CONNECT (err[%d])",
-                       cpname, sap_conn->result);
+               dbg("[%s] TRESP_SAP_REQ_CONNECT (status[%d])",
+                       cpname, sap_conn->status);
 
                telephony_sap_complete_connect(dbus_info->interface_object,
                        dbus_info->invocation, sap_conn->status,
@@ -286,8 +286,8 @@ gboolean dbus_plugin_sap_response(struct custom_data *ctx,
        case TRESP_SAP_REQ_STATUS: {
                const struct tresp_sap_req_status *sap_status = data;
 
-               dbg("[%s] TRESP_SAP_REQ_STATUS (err[%d])",
-                       cpname, sap_status->result);
+               dbg("[%s] TRESP_SAP_REQ_STATUS (status[%d])",
+                       cpname, sap_status->status);
 
                telephony_sap_complete_get_status(dbus_info->interface_object,
                        dbus_info->invocation, sap_status->status);

diff --git a/src/dtapi_sat.c b/src/dtapi_sat.c
index 06e90688b3d0bb1bad6c9a003a275d102ce58fff..43625800476731fccaab75b9efcb16f8ce1e4527 100644 (file)
--- a/src/dtapi_sat.c
+++ b/src/dtapi_sat.c
@@ -1242,7 +1242,7 @@ gboolean dbus_plugin_sat_notification(struct custom_data *ctx,
 
                case SAT_PROATV_CMD_SETUP_EVENT_LIST: {
                        GVariant *event_list = NULL;
-                       gint event_cnt;
+                       guchar event_cnt;
                        GVariant *evt_list;
 
                        event_list = sat_manager_setup_event_list_noti(ctx, cp_name,
@@ -1255,7 +1255,7 @@ gboolean dbus_plugin_sat_notification(struct custom_data *ctx,
                        dbg("PROATV_CMD_SETUP_EVENT_LIST - type_format: [%s]",
                                g_variant_get_type_string(event_list));
 
-                       g_variant_get(event_list, "(i@v)", &event_cnt, &evt_list);
+                       g_variant_get(event_list, "(y@v)", &event_cnt, &evt_list);
                        telephony_sat_emit_setup_event_list(sat, event_cnt, evt_list);
 
                        /*
@@ -1274,8 +1274,7 @@ gboolean dbus_plugin_sat_notification(struct custom_data *ctx,
                                 * SAT Event Downloader should execute
                                 * event_list as well.
                                 */
-                               sat_ui_support_exec_evtdw(conn, g_path,
-                                       SAT_PROATV_CMD_SETUP_EVENT_LIST, event_list);
+                               sat_ui_support_launch_eventdownloader_application(event_list, slot_id);
 
                                sat_ui_support_exec_bip(conn, g_path,
                                        SAT_PROATV_CMD_SETUP_EVENT_LIST, event_list);

diff --git a/src/dtapi_sat_manager.c b/src/dtapi_sat_manager.c
index de3a5e7d158939ba1e68dfac6647f2c8da8dbfa0..3a8fe7969e9bf48abafe34757336aafd4508c0cc 100644 (file)
--- a/src/dtapi_sat_manager.c
+++ b/src/dtapi_sat_manager.c
@@ -1645,7 +1645,7 @@ GVariant* sat_manager_setup_event_list_noti(struct custom_data *ctx, const char
        TcorePlugin *plg = NULL;
        GVariant *event_list = NULL;
        gboolean rv = FALSE;
-       gint event_cnt = 0;
+       unsigned char event_cnt = 0;
        struct treq_sat_terminal_rsp_data *tr = NULL;
 
        dbg("interpreting event list notification");
@@ -1679,7 +1679,7 @@ GVariant* sat_manager_setup_event_list_noti(struct custom_data *ctx, const char
                }
                evt_list = g_variant_builder_end(&builder);
 
-               event_list = g_variant_new("(iv)", event_cnt, evt_list);
+               event_list = g_variant_new("(yv)", event_cnt, evt_list);
        }
        /* send TR - does not need from application's response */
        tr = (struct treq_sat_terminal_rsp_data *)calloc(1, sizeof(struct treq_sat_terminal_rsp_data));
@@ -1691,8 +1691,8 @@ GVariant* sat_manager_setup_event_list_noti(struct custom_data *ctx, const char
        memcpy((void*)&tr->terminal_rsp_data.setup_event_list.command_detail, &event_list_tlv->command_detail, sizeof(struct tel_sat_cmd_detail_info));
        tr->terminal_rsp_data.setup_event_list.device_id.src = event_list_tlv->device_id.dest;
        tr->terminal_rsp_data.setup_event_list.device_id.dest = event_list_tlv->device_id.src;
-       
-       if (rv == TRUE)         
+
+       if (rv == TRUE)
                tr->terminal_rsp_data.setup_event_list.result_type = RESULT_SUCCESS;
        else
                tr->terminal_rsp_data.setup_event_list.result_type = RESULT_BEYOND_ME_CAPABILITIES;
@@ -4785,6 +4785,10 @@ static gboolean _sat_manager_handle_get_inkey_confirm(struct custom_data *ctx, T
 
        case USER_CONFIRM_TIMEOUT:
                tr->terminal_rsp_data.get_inkey.result_type = RESULT_NO_RESPONSE_FROM_USER;
+               if (q_data.cmd_data.getInkeyInd.duration.time_interval != 0) {
+                       tr->terminal_rsp_data.get_inkey.duration.time_interval = q_data.cmd_data.getInkeyInd.duration.time_interval;
+                       tr->terminal_rsp_data.get_inkey.duration.time_unit = q_data.cmd_data.getInkeyInd.duration.time_unit;
+               }
                break;
 
        case USER_CONFIRM_END:

diff --git a/src/dtapi_ss.c b/src/dtapi_ss.c
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/sat_ui_support/sat_ui_support.c b/src/sat_ui_support/sat_ui_support.c
index 4adb15fbcdf4c553a9bb73925a8710a35dbb3c24..02420c9ba3a6111ec48bd2c45c38bf20c871984a 100644 (file)
--- a/src/sat_ui_support/sat_ui_support.c
+++ b/src/sat_ui_support/sat_ui_support.c
@@ -32,6 +32,8 @@
 #include "sat_ui_support.h"
 
 #define CISS_APP "org.tizen.ciss"
+#define EVENT_DOWNLOADER_SLOT1 "org.tizen.sat-event-downloader"
+#define EVENT_DOWNLOADER_SLOT2 "org.tizen.sat-event-downloader-2"
 
 struct sat_ui_app_launch_data {
        bundle *bundle_data; /**<bundle data*/
@@ -1164,6 +1166,62 @@ gboolean sat_ui_support_launch_ciss_application(enum tel_sat_proactive_cmd_type
        return TRUE;
 }
 
+gboolean sat_ui_support_launch_eventdownloader_application(GVariant *data, enum dbus_tapi_sim_slot_id slot_id)
+{
+       bundle *bundle_data = 0;
+       gchar *encoded_data = NULL;
+       struct tel_sat_event_list eventinfo;
+       guchar event_count;
+       GVariant *sat_event_list;
+       GVariant *unbox;
+       GVariantIter *iter;
+       unsigned int local_index = 0;
+       gint event_id = 0;
+
+       dbg("Launch SAT Event Downloader application by aul");
+       bundle_data = bundle_create();
+
+       if (slot_id == SIM_SLOT_PRIMARY) {
+               appsvc_set_pkgname(bundle_data, EVENT_DOWNLOADER_SLOT1);
+       } else if(slot_id == SIM_SLOT_SECONDARY) {
+               appsvc_set_pkgname(bundle_data, EVENT_DOWNLOADER_SLOT2);
+       } else {
+               err("wrong slot info");
+               if(bundle_data)
+                       bundle_free(bundle_data);
+               return FALSE;
+       }
+       memset(&eventinfo, 0, sizeof(struct tel_sat_event_list));
+
+       dbg("sat event download type_format(%s)", g_variant_get_type_string(data));
+       g_variant_get(data, "(y@v)", &event_count, &sat_event_list);
+
+       eventinfo.event_list_cnt = event_count;
+       if (eventinfo.event_list_cnt > 0) {
+               unbox = g_variant_get_variant(sat_event_list);
+
+               g_variant_get(unbox, "ai", &iter);
+               while (g_variant_iter_loop(iter, "i", &event_id)) {
+                       eventinfo.evt_list[local_index] = event_id;
+                       local_index++;
+               }
+               g_variant_iter_free(iter);
+       }
+
+       encoded_data = g_base64_encode((const guchar*)&eventinfo, sizeof(struct tel_sat_event_list));
+
+       appsvc_add_data(bundle_data, "EVENT_LIST_DATA", encoded_data);
+       g_free(encoded_data);
+
+       appsvc_run_service(bundle_data, 0, NULL, NULL);
+       dbg("event downloader app is called");
+       bundle_free(bundle_data);
+
+       return TRUE;
+
+}
+
+
 gboolean sat_ui_support_launch_setting_application(enum tel_sat_proactive_cmd_type cmd_type, GVariant *data, enum dbus_tapi_sim_slot_id slot_id)
 {
        gint rv;
@@ -1343,9 +1401,9 @@ gboolean sat_ui_support_exec_bip(GDBusConnection *connection, const gchar *path,
                GVariant *evt_list;
 
                dbg("setup event list type_format(%s)", g_variant_get_type_string(data));
-               g_variant_get(data, "(iv)", &event_cnt, &evt_list);
+               g_variant_get(data, "(y@v)", &event_cnt, &evt_list);
 
-               out_param = g_variant_new("(iv)", event_cnt, evt_list);
+               out_param = g_variant_new("(yv)", event_cnt, evt_list);
                signal_name = g_strdup("SetupEventList");
        } break;
        default:
@@ -1363,43 +1421,3 @@ gboolean sat_ui_support_exec_bip(GDBusConnection *connection, const gchar *path,
        return rv;
 }
 
-gboolean sat_ui_support_exec_evtdw(GDBusConnection *connection, const gchar *path, enum tel_sat_proactive_cmd_type cmd_type, GVariant *data)
-{
-       gboolean rv = FALSE;
-       gchar *signal_name = NULL;
-       GVariant *out_param = NULL;
-       gchar *interface_name = NULL;
-       gint event_cnt;
-       GVariant *evt_list;
-
-       dbg("dbus conn(%p), path(%s)", connection, path);
-
-       if (g_str_has_suffix(path , "0")) {
-               interface_name = g_strdup("org.tizen.sat-event-downloader");
-
-       } else if (g_str_has_suffix(path , "1")) {
-               interface_name = g_strdup("org.tizen.sat-event-downloader-2");
-       } else {
-               err("invalid sim slot id");
-               return FALSE;
-       }
-
-       if (cmd_type == SAT_PROATV_CMD_SETUP_EVENT_LIST) {
-               dbg("setup event list type_format(%s)", g_variant_get_type_string(data));
-               g_variant_get(data, "(iv)", &event_cnt, &evt_list);
-
-               out_param = g_variant_new("(iv)", event_cnt, evt_list);
-               signal_name = g_strdup("SetupEventList");
-       } else {
-               err("invalid cmd_type:[%d]", cmd_type);
-               g_free(interface_name);
-               return FALSE;
-       }
-
-       rv = g_dbus_connection_emit_signal(connection, interface_name, path, "org.tizen.telephony.SAT", signal_name, out_param, NULL);
-       dbg("send signal to sat-event-downloader result (%d)", rv);
-
-       g_free(interface_name);
-       g_free(signal_name);
-       return rv;
-}

diff --git a/src/sat_ui_support/sat_ui_support.h b/src/sat_ui_support/sat_ui_support.h
index 54a25f514c402a8fff252d2ec839bebf2849dca9..ff5c1dbf1d8cefd002c7008ba5865ad6da35f7b0 100644 (file)
--- a/src/sat_ui_support/sat_ui_support.h
+++ b/src/sat_ui_support/sat_ui_support.h
@@ -240,8 +240,8 @@ gboolean sat_ui_support_launch_sat_ui(enum tel_sat_proactive_cmd_type cmd_type,
        GVariant *data, enum dbus_tapi_sim_slot_id slot_id);
 gboolean sat_ui_support_exec_bip(GDBusConnection *connection,
        const gchar *path, enum tel_sat_proactive_cmd_type cmd_type, GVariant *data);
-gboolean sat_ui_support_exec_evtdw(GDBusConnection *connection,
-       const gchar *path, enum tel_sat_proactive_cmd_type cmd_type, GVariant *data);
 gboolean sat_ui_support_storage_init(Server *server);
+gboolean sat_ui_support_launch_eventdownloader_application(GVariant *data, enum dbus_tapi_sim_slot_id slot_id);
+
 
 #endif /* __SAT_UI_SUPPORT_H__ */