From: Saurav Babu <saurav.babu@samsung.com>
Date: Thu, 11 Jan 2018 11:08:35 +0000 (+0530)
Subject: fn-manager: Add DeviceEject DBUS method to remove mot at device
X-Git-Tag: submit/tizen/20190131.065036~245
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=326f7e592b44ac93b3c810dcf90fec2e353ec85a;p=platform%2Fcore%2Fapi%2Fmulti-device-group.git

fn-manager: Add DeviceEject DBUS method to remove mot at device

Signed-off-by: Saurav Babu <saurav.babu@samsung.com>
---

diff --git a/src/fn-manager/include/fn_gdbus_group.h b/src/fn-manager/include/fn_gdbus_group.h
index abf5539..d1896b7 100755
--- a/src/fn-manager/include/fn_gdbus_group.h
+++ b/src/fn-manager/include/fn_gdbus_group.h
@@ -30,7 +30,7 @@ gboolean group_device_invite(Group *group, GDBusMethodInvocation *invocation,
 	gchar *uuid, gchar *pin, gpointer user_data);
 
 gboolean group_device_eject(Group *group, GDBusMethodInvocation *invocation,
-	gpointer user_data);
+	gchar *uuid, gpointer user_data);
 
 void notify_group_found(GVariant *group_data);
 void notify_group_finish(int ret);
diff --git a/src/fn-manager/src/familynet_gdbus.xml b/src/fn-manager/src/familynet_gdbus.xml
index 536bd87..08ab466 100755
--- a/src/fn-manager/src/familynet_gdbus.xml
+++ b/src/fn-manager/src/familynet_gdbus.xml
@@ -45,8 +45,7 @@
 			<arg type="i" name="result" direction="out" />
 		</method>
 		<method name="DeviceEject">
-			<arg type="i" name="group_count" direction="out" />
-			<arg type="aa{sv}" name="groups" direction="out" />
+			<arg type="s" name="uuid" direction="in" />
 			<arg type="i" name="result" direction="out" />
 		</method>
 
diff --git a/src/fn-manager/src/fn_gdbus.c b/src/fn-manager/src/fn_gdbus.c
index 9f7cfcc..0106d70 100644
--- a/src/fn-manager/src/fn_gdbus.c
+++ b/src/fn-manager/src/fn_gdbus.c
@@ -60,7 +60,7 @@ static bool __group_init(GDBusConnection *connection)
 		NULL);
 
 	g_signal_connect(group_skeleton,
-		"handle-delete",
+		"handle-device-eject",
 		G_CALLBACK(group_device_eject),
 		NULL);
 
diff --git a/src/fn-manager/src/fn_gdbus_group.c b/src/fn-manager/src/fn_gdbus_group.c
index 122904f..74aa89a 100755
--- a/src/fn-manager/src/fn_gdbus_group.c
+++ b/src/fn-manager/src/fn_gdbus_group.c
@@ -81,7 +81,7 @@ gboolean group_device_invite(Group *group, GDBusMethodInvocation *invocation,
 {
 	gint result = 0;
 
-	LOG_DEBUG("get found groups called using dbus successful");
+	LOG_DEBUG("group device invite eject using dbus successful");
 
 	result = fn_group_invite(uuid, pin);
 
@@ -91,9 +91,15 @@ gboolean group_device_invite(Group *group, GDBusMethodInvocation *invocation,
 }
 
 gboolean group_device_eject(Group *group, GDBusMethodInvocation *invocation,
-	gpointer user_data)
+	gchar *uuid, gpointer user_data)
 {
-	//group_complete_device_eject(group, invocation, result);
+	gint result = 0;
+
+	LOG_DEBUG("group device eject called using dbus successful");
+
+	result = fn_group_dismiss(uuid);
+
+	group_complete_device_eject(group, invocation, result);
 
 	return TRUE;
 }
diff --git a/src/fn-manager/src/fn_group.c b/src/fn-manager/src/fn_group.c
index 8c6f47d..8f03c19 100755
--- a/src/fn-manager/src/fn_group.c
+++ b/src/fn-manager/src/fn_group.c
@@ -200,6 +200,8 @@ int fn_group_invite(gchar *uuid, gchar *pin)
 {
 	int ret;
 
+	LOG_BEGIN();
+
 	ret = agent_find_mot_enable_devices();
 
 	g_free(group_invite_uuid);
@@ -208,12 +210,24 @@ int fn_group_invite(gchar *uuid, gchar *pin)
 	group_invite_uuid = g_strdup(uuid);
 	group_invite_pin = g_strdup(pin);
 
+	LOG_END();
+
 	return ret;
 }
 
-int fn_group_dismiss()
+//dismiss from group (async)
+int fn_group_dismiss(gchar *uuid)
 {
-} //dismiss from group (async)
+	int ret;
+
+	LOG_BEGIN();
+
+	ret = agent_remove_mo_at_device(uuid);
+
+	LOG_END();
+
+	return ret;
+}
 
 /* Join to remote device group */
 int fn_group_get_remote_groups(/* callback */){} //Get all of group in network (Async)