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 abf55392a54ba20c724c54469c04920abb80b280..d1896b7ad634f2ec83dcd58a3c736e472f9c1423 100755 (executable)
--- 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 536bd87ace5dff59d564bced3aa66f51ebd4755c..08ab466ab9244f4708d89b2371ef440b8d4180b8 100755 (executable)
--- 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 9f7cfcc9d3e1b46f5eff8355b4f930f6f65e77f1..0106d70aabbecafa51b1a6b254489b7f01ab8062 100644 (file)
--- 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 122904fb647b31c61f2952d67efe5e45083bf659..74aa89a3b7799a5a92c33bf2cd4605aebdc7b485 100755 (executable)
--- 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 8c6f47d0cf77756bc289dbb710cf6a8b60330863..8f03c19135a359408772bce4aa0c8f1e593fac84 100755 (executable)
--- 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)