stkagent: Add stk_agent_display_action method

diff --git a/src/stkagent.c b/src/stkagent.c
index 2395182..15ad4fa 100644 (file)
--- a/src/stkagent.c
+++ b/src/stkagent.c
@@ -1081,3 +1081,64 @@ int stk_agent_confirm_launch_browser(struct stk_agent *agent, const char *text,
 
        return 0;
 }
+
+static void display_action_cb(DBusPendingCall *call, void *data)
+{
+       struct stk_agent *agent = data;
+       stk_agent_user_termination_cb cb = agent->user_cb;
+       DBusMessage *reply = dbus_pending_call_steal_reply(call);
+       enum stk_agent_result result;
+       gboolean remove_agent;
+
+       if (check_error(agent, reply,
+                       ALLOWED_ERROR_TERMINATE, &result) == -EINVAL) {
+               remove_agent = TRUE;
+               goto error;
+       }
+
+       if (dbus_message_get_args(reply, NULL, DBUS_TYPE_INVALID) == FALSE) {
+               ofono_error("Can't parse the reply to DisplayAction()");
+               remove_agent = TRUE;
+               goto error;
+       }
+
+       cb(result, agent->user_data);
+       goto done;
+
+       CALLBACK_END();
+}
+
+int stk_agent_display_action(struct stk_agent *agent,
+                                       const char *text,
+                                       const struct stk_icon_id *icon,
+                                       stk_agent_user_termination_cb cb,
+                                       void *user_data,
+                                       ofono_destroy_func destroy)
+{
+       DBusConnection *conn = ofono_dbus_get_connection();
+
+       agent->msg = dbus_message_new_method_call(agent->bus, agent->path,
+                                               OFONO_SIM_APP_INTERFACE,
+                                               "DisplayAction");
+       if (agent->msg == NULL)
+               return -ENOMEM;
+
+       dbus_message_append_args(agent->msg,
+                                       DBUS_TYPE_STRING, &text,
+                                       DBUS_TYPE_BYTE, &icon->id,
+                                       DBUS_TYPE_INVALID);
+
+       if (dbus_connection_send_with_reply(conn, agent->msg, &agent->call,
+                                               0) == FALSE ||
+                                               agent->call == NULL)
+               return -EIO;
+
+       agent->user_cb = cb;
+       agent->user_data = user_data;
+       agent->user_destroy = destroy;
+
+       dbus_pending_call_set_notify(agent->call, display_action_cb,
+                                       agent, NULL);
+
+       return 0;
+}

diff --git a/src/stkagent.h b/src/stkagent.h
index 1f0c4fa..fd60824 100644 (file)
--- a/src/stkagent.h
+++ b/src/stkagent.h
@@ -60,6 +60,9 @@ typedef void (*stk_agent_string_cb)(enum stk_agent_result result,
 typedef void (*stk_agent_tone_cb)(enum stk_agent_result result,
                                                void *user_data);
 
+typedef void (*stk_agent_user_termination_cb)(enum stk_agent_result result,
+                                               void *user_data);
+
 struct stk_agent *stk_agent_new(const char *path, const char *sender,
                                        ofono_bool_t remove_on_terminate);
 
@@ -147,3 +150,9 @@ int stk_agent_confirm_launch_browser(struct stk_agent *agent, const char *text,
                                        void *user_data,
                                        ofono_destroy_func destroy,
                                        int timeout);
+
+int stk_agent_display_action(struct stk_agent *agent, const char *text,
+                                       const struct stk_icon_id *icon,
+                                       stk_agent_user_termination_cb cb,
+                                       void *user_data,
+                                       ofono_destroy_func destroy);