[PATCH 1/2] stk: Send the AlphaId's to agent.

[PATCH 1/2] stk: Send the AlphaId's to agent.

[Andrzej Zaborowski]

[-- Attachment #1: Type: text/plain, Size: 2435 bytes --]

v2: Method name changed according to irc talk.
---
 src/stk.c      |    9 +++++++--
 src/stkagent.c |   31 +++++++++++++++++++++++++++++++
 src/stkagent.h |    3 +++
 3 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/src/stk.c b/src/stk.c
index 076acc4..67cb759 100644
--- a/src/stk.c
+++ b/src/stk.c
@@ -472,12 +472,17 @@ static void stk_alpha_id_set(struct ofono_stk *stk,
 		const char *text, const struct stk_text_attribute *attr,
 		const struct stk_icon_id *icon)
 {
-	/* TODO */
+	char *alpha = dbus_apply_text_attributes(text, attr);
+
+	if (alpha || icon)
+		stk_agent_display_action_info(stk->current_agent, alpha, icon);
+
+	g_free(alpha);
 }
 
 static void stk_alpha_id_unset(struct ofono_stk *stk)
 {
-	/* TODO */
+	stk_agent_request_cancel(stk->current_agent);
 }
 
 static int duration_to_msecs(const struct stk_duration *duration)
diff --git a/src/stkagent.c b/src/stkagent.c
index e1a6f48..2c43053 100644
--- a/src/stkagent.c
+++ b/src/stkagent.c
@@ -964,3 +964,34 @@ int stk_agent_loop_tone(struct stk_agent *agent, const char *text,
 
 	return 0;
 }
+
+static void action_info_cb(DBusPendingCall *call, void *data)
+{
+	stk_agent_request_end(data);
+}
+
+int stk_agent_display_action_info(struct stk_agent *agent, const char *text,
+					const struct stk_icon_id *icon)
+{
+	DBusConnection *conn = ofono_dbus_get_connection();
+
+	agent->msg = dbus_message_new_method_call(agent->bus, agent->path,
+						OFONO_SIM_APP_INTERFACE,
+						"DisplayActionInformation");
+	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;
+
+	dbus_pending_call_set_notify(agent->call, action_info_cb, agent, NULL);
+
+	return 0;
+}
diff --git a/src/stkagent.h b/src/stkagent.h
index 517bcfe..00bacc2 100644
--- a/src/stkagent.h
+++ b/src/stkagent.h
@@ -137,3 +137,6 @@ int stk_agent_loop_tone(struct stk_agent *agent, const char *text,
 
 void append_menu_items_variant(DBusMessageIter *iter,
 				const struct stk_menu_item *items);
+
+int stk_agent_display_action_info(struct stk_agent *agent, const char *text,
+					const struct stk_icon_id *icon);
-- 
1.7.1.86.g0e460.dirty

[PATCH 2/2] doc: Describe DisplayActionInformation().

[Andrzej Zaborowski]

[-- Attachment #1: Type: text/plain, Size: 1073 bytes --]

---
 doc/stk-api.txt |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/doc/stk-api.txt b/doc/stk-api.txt
index 79daee6..80d3ed6 100644
--- a/doc/stk-api.txt
+++ b/doc/stk-api.txt
@@ -249,12 +249,20 @@ Methods		byte RequestSelection(string title, byte icon_id,
 
 			Possible Errors: [service].Error.SimToolkit.EndSession
 
+		void DisplayActionInformation(string text, byte icon_id)
+
+			Supplies a text string and/or icon concerning the
+			current activity in the terminal and UICC.  The
+			text should be displayed to the user on screen
+			until the call is canceled using Cancel().  This
+			method should not return.
+
 		void Cancel()
 
 			Asks the agent to cancel any ongoing operation in
 			progress.  This is usually either because the agent
-			is taking too long to respond or the Sim Application
-			has terminated the session.
+			is taking too long to respond, the Sim Application
+			has terminated the session or a task has finished.
 
 		void Release()
 
-- 
1.7.1.86.g0e460.dirty

Re: [PATCH 2/2] doc: Describe DisplayActionInformation().

[Denis Kenzior]

[-- Attachment #1: Type: text/plain, Size: 225 bytes --]

Hi Andrew,

On 12/21/2010 03:34 AM, Andrzej Zaborowski wrote:
> ---
>  doc/stk-api.txt |   12 ++++++++++--
>  1 files changed, 10 insertions(+), 2 deletions(-)
> 

Patch has been applied, thanks.

Regards,
-Denis