Add new verb as get_callsneedlefish_13.93.0needlefish/13.93.0marlin_12.93.0marlin_12.92.0marlin_12.91.0marlin_12.90.1marlin_12.90.0marlin/12.93.0marlin/12.92.0marlin/12.91.0marlin/12.90.1marlin/12.90.0lamprey_11.92.0lamprey/11.92.013.93.012.93.012.92.012.91.012.90.112.90.011.92.0

get_calls verb return all active call properties.

Bug-AGL: SPEC-3870

Signed-off-by: Saman Mahmoodi <mahmoudi.saman1@gmail.com>
Change-Id: I7355b0ade66fdd84e55936cf63a4a2a62771a912

3 files changed, 62 insertions, 0 deletions

diff --git a/binding/gdbus/ofono_voicecallmanager.c b/binding/gdbus/ofono_voicecallmanager.c
index 78924dc..8118f1f 100644
--- a/binding/gdbus/ofono_voicecallmanager.c
+++ b/binding/gdbus/ofono_voicecallmanager.c
@@ -276,3 +276,51 @@ gboolean ofono_voicecallmanager_swap_calls(OrgOfonoVoiceCallManager *manager)
 
 	return (error == NULL);
 }
+
+json_object* ofono_voicecallmanager_get_calls(OrgOfonoVoiceCallManager *manager) 
+{
+	GError *error = NULL;
+	gboolean res;
+	GVariant *reply = NULL;
+	g_autoptr(GVariantIter) iter1 = NULL;
+	g_autoptr(GVariantIter) iter2 = NULL;
+	GVariant *value = NULL;
+	const gchar *key1 = NULL;
+	const gchar *key2 = NULL;
+	json_object *jprop = NULL;
+	if (!manager) {
+		AFB_ERROR("Ofono VoiceCallmanager uninitialized\n");
+		return NULL;
+	}
+
+	res = org_ofono_voice_call_manager_call_get_calls_sync(manager, &reply, NULL, &error);
+
+	json_object *jarray = json_object_new_array();
+	json_object *jresp = json_object_new_object();
+	json_object_object_add(jresp, "active calls", jarray);
+
+	if (res) {
+		g_variant_get(reply, "a(oa{sv})", &iter1);
+		jprop = json_object_new_object();
+		while (g_variant_iter_loop(iter1, "(&oa{sv})", &key1, &iter2)) {
+			json_object_object_add(jprop, "Object Path", json_object_new_string(key1));
+			while (g_variant_iter_loop(iter2, "{&sv}", &key2, &value)) {
+				const char* type = g_variant_get_type_string(value);
+				switch (*type) {
+				case 'o':
+				case 's':
+					json_object_object_add(jprop,key2, json_object_new_string(g_variant_get_string(value, NULL)));
+					break;
+				case 'b':
+					json_object_object_add(jprop,key2,json_object_new_boolean(g_variant_get_boolean(value)));
+					break;
+				default:
+					break;
+				}
+			}
+			json_object_array_add(jarray, jprop);
+		}
+		g_variant_unref(reply);
+	}
+	return jresp;
+}
diff --git a/binding/gdbus/ofono_voicecallmanager.h b/binding/gdbus/ofono_voicecallmanager.h
index df058a2..770c409 100644
--- a/binding/gdbus/ofono_voicecallmanager.h
+++ b/binding/gdbus/ofono_voicecallmanager.h
@@ -34,3 +34,4 @@ gboolean ofono_voicecallmanager_hold_and_answer(OrgOfonoVoiceCallManager *);
 gboolean ofono_voicecallmanager_release_and_answer(OrgOfonoVoiceCallManager *);
 gboolean ofono_voicecallmanager_swap_calls(OrgOfonoVoiceCallManager *);
 gchar **ofono_voicecallmanager_create_multiparty(OrgOfonoVoiceCallManager *);
+json_object *ofono_voicecallmanager_get_calls(OrgOfonoVoiceCallManager *);
diff --git a/binding/telephony-binding.c b/binding/telephony-binding.c
index 9e47c76..e764601 100644
--- a/binding/telephony-binding.c
+++ b/binding/telephony-binding.c
@@ -232,6 +232,15 @@ static void swap_calls(afb_req_t request)
 	}
 }
 
+static void get_calls(afb_req_t request)
+{
+	json_object *result = ofono_voicecallmanager_get_calls(vcm);
+	if (!result)
+		afb_req_fail(request, "failed", "Can not find any active voice calls");
+	else
+		afb_req_success(request, result, NULL);
+}
+
 static void get_battery_level(afb_req_t request)
 {
 	const gchar *device;
@@ -638,6 +647,10 @@ static const afb_verb_t verbs[]= {
 		.callback	= release_and_answer,
 	},
 	{
+		.verb		= "get_calls",
+		.callback	= get_calls,
+	},
+	{
 		.verb		= "get_battery_level",
 		.callback	= get_battery_level,
 	},