binding: bluetooth-pbap: parse fn correctly for UTF-8 charset

Don't include CHARSET=UTF-8 or the like in the JSON output.

Bug-AGL: SPEC-2392
Change-Id: I85322e710b737bdfa58fe80ff5f0bbc0e298250b
Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>

diff --git a/binding/bluetooth-vcard-parser.c b/binding/bluetooth-vcard-parser.c
index 927443a..0b63209 100644 (file)
--- a/binding/bluetooth-vcard-parser.c
+++ b/binding/bluetooth-vcard-parser.c
@@ -51,12 +51,12 @@ static const gchar *VC_PREFIXES[VC_FIELD_COUNT] = {
 
 static void add_fn(json_object *resp, gchar *msg)
 {
-       gchar *name = msg + vc_len(VC_FORMATTED_NAME) + 1;
+       gchar *name = strstr(msg, ":");
 
-       if (!name)
-               name = "UNKNOWN";
+       if (!name || !strlen(name + 1))
+               return;
 
-       json_object_object_add(resp, "fn", json_object_new_string(name));
+       json_object_object_add(resp, "fn", json_object_new_string(++name));
 }
 
 static void add_phone(json_object *array, gchar *msg)