[PATCHv2] stemodem: Fix for MT call not working when caller id is hidden.

[PATCHv2] stemodem: Fix for MT call not working when caller id is hidden.

[Marit Henriksen]

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

From: Marit Henriksen <marit.henriksen@stericsson.com>

In *ECAV, the number will not be included if caller id is hidden.
Set it to an empty string in that case, and set number type to
128, unknown number type.
---
 drivers/stemodem/voicecall.c |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/drivers/stemodem/voicecall.c b/drivers/stemodem/voicecall.c
index bf68f52..4964fb7 100644
--- a/drivers/stemodem/voicecall.c
+++ b/drivers/stemodem/voicecall.c
@@ -1,4 +1,4 @@
-/*
+e/*
  *
  *  oFono - Open Source Telephony
  *
@@ -442,10 +442,16 @@ static void ecav_notify(GAtResult *result, gpointer user_data)
 	if (status == CALL_STATUS_DIALING ||
 			status == CALL_STATUS_WAITING ||
 			status == CALL_STATUS_INCOMING) {
-		if (!g_at_result_iter_next_string(&iter, &num))
-			return;
-
-		if (!g_at_result_iter_next_number(&iter, &num_type))
+		/*
+		* If caller uses hidden id, the number and
+		* number type might not be present. Don't
+		* look for type if number is not present.
+		*/
+		if (!g_at_result_iter_next_string(&iter, &num)) {
+			num="";
+			num_type = 128;
+		}
+		else if (!g_at_result_iter_next_number(&iter, &num_type))
 			return;
 	}
 
-- 
1.7.1

Re: [PATCHv2] stemodem: Fix for MT call not working when caller id is hidden.

[Marcel Holtmann]

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

Hi Marit,

> In *ECAV, the number will not be included if caller id is hidden.
> Set it to an empty string in that case, and set number type to
> 128, unknown number type.
> ---
>  drivers/stemodem/voicecall.c |   16 +++++++++++-----
>  1 files changed, 11 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/stemodem/voicecall.c b/drivers/stemodem/voicecall.c
> index bf68f52..4964fb7 100644
> --- a/drivers/stemodem/voicecall.c
> +++ b/drivers/stemodem/voicecall.c
> @@ -1,4 +1,4 @@
> -/*
> +e/*
>   *
>   *  oFono - Open Source Telephony
>   *
> @@ -442,10 +442,16 @@ static void ecav_notify(GAtResult *result, gpointer user_data)
>  	if (status == CALL_STATUS_DIALING ||
>  			status == CALL_STATUS_WAITING ||
>  			status == CALL_STATUS_INCOMING) {
> -		if (!g_at_result_iter_next_string(&iter, &num))
> -			return;
> -
> -		if (!g_at_result_iter_next_number(&iter, &num_type))
> +		/*
> +		* If caller uses hidden id, the number and
> +		* number type might not be present. Don't
> +		* look for type if number is not present.
> +		*/

please fix the comment according coding style. See M2.

> +		if (!g_at_result_iter_next_string(&iter, &num)) {
> +			num="";

This needs to be num = ""; btw.

> +			num_type = 128;
> +		}
> +		else if (!g_at_result_iter_next_number(&iter, &num_type))
>  			return;

And the else here should be on the same line as with the }.

Regards

Marcel