Merge "[net-config]: Add support of new methods related to autoscan" into tizen

diff --git a/include/plugin.h b/include/plugin.h
index 1c24fe9..5b72d99 100755 (executable)
--- a/include/plugin.h
+++ b/include/plugin.h
@@ -32,12 +32,12 @@ extern "C" {
 #define NETCONFIG_DEL_PORTAL_NOTI              "del_portal_noti"
 
 struct netconfig_headed_plugin_t {
-       void (*pop_device_picker) (void);
-       gboolean (*send_notification_to_net_popup) (const char *, const char *);
-       int (*send_message_to_net_popup) (const char *, const char *, const char *, const char *);
-       int (*send_restriction_to_net_popup) (const char *, const char *, const char *);
-       void (*set_system_event) (int, int, int);
-       void (*pop_wifi_connected_poppup) (const char *);
+       void(*pop_device_picker) (void);
+       gboolean(*send_notification_to_net_popup) (const char *, const char *);
+       int(*send_message_to_net_popup) (const char *, const char *, const char *, const char *);
+       int(*send_restriction_to_net_popup) (const char *, const char *, const char *);
+       void(*set_system_event) (int, int, int);
+       void(*pop_wifi_connected_poppup) (const char *);
 };
 
 typedef enum {

diff --git a/include/wifi-background-scan.h b/include/wifi-background-scan.h
index 2cd3493..486fc1c 100755 (executable)
--- a/include/wifi-background-scan.h
+++ b/include/wifi-background-scan.h
@@ -38,6 +38,10 @@ void netconfig_wifi_set_bgscan_pause(gboolean pause);
 gboolean handle_set_bgscan(Wifi *wifi, GDBusMethodInvocation *context, guint scan_mode);
 gboolean handle_resume_bgscan(Wifi *wifi, GDBusMethodInvocation *context);
 gboolean handle_pause_bgscan(Wifi *wifi, GDBusMethodInvocation *context);
+gboolean handle_get_autoscan(Wifi *wifi, GDBusMethodInvocation *context);
+gboolean handle_get_autoscanmode(Wifi *wifi, GDBusMethodInvocation *context);
+
+
 
 
 #ifdef __cplusplus

diff --git a/interfaces/netconfig-iface-wifi.xml b/interfaces/netconfig-iface-wifi.xml
index 6b99c31..b862adb 100755 (executable)
--- a/interfaces/netconfig-iface-wifi.xml
+++ b/interfaces/netconfig-iface-wifi.xml
@@ -22,6 +22,12 @@
                </method>
                <method name="PauseBgscan">
                </method>
+               <method name="GetAutoscan">
+                       <arg type="b" name="autoscan" direction="out"/>
+               </method>
+               <method name="GetAutoscanmode">
+                       <arg type="u" name="autoscanmode" direction="out"/>
+               </method>
                <method name="RequestSpecificScan">
                        <arg type="s" name="SSID" direction="in"/>
                </method>

diff --git a/src/wifi-background-scan.c b/src/wifi-background-scan.c
index 8172fdf..ab18e14 100755 (executable)
--- a/src/wifi-background-scan.c
+++ b/src/wifi-background-scan.c
@@ -340,3 +340,24 @@ gboolean handle_pause_bgscan(Wifi *wifi, GDBusMethodInvocation *context)
        return TRUE;
 }
 
+gboolean handle_get_autoscan(Wifi *wifi, GDBusMethodInvocation *context)
+{
+
+       gboolean autoscan = 0;
+
+       autoscan = netconfig_wifi_is_bgscan_paused();
+
+       wifi_complete_get_autoscan(wifi, context, autoscan);
+       return TRUE;
+}
+
+gboolean handle_get_autoscanmode(Wifi *wifi, GDBusMethodInvocation *context)
+{
+       guint autoscanmode = 0;
+
+       autoscanmode = __netconfig_wifi_bgscan_get_mode();
+
+       wifi_complete_get_autoscanmode(wifi, context, autoscanmode);
+       return TRUE;
+}
+

diff --git a/src/wifi.c b/src/wifi.c
index b124c97..de24594 100755 (executable)
--- a/src/wifi.c
+++ b/src/wifi.c
@@ -207,6 +207,12 @@ void wifi_object_create_and_init(void)
        g_signal_connect(wifi_object, "handle-pause-bgscan",
                        G_CALLBACK(handle_pause_bgscan), NULL);
 
+       /*Auto Scan Mode */
+       g_signal_connect(wifi_object, "handle-get-autoscan",
+                       G_CALLBACK(handle_get_autoscan), NULL);
+       g_signal_connect(wifi_object, "handle-get-autoscanmode",
+                       G_CALLBACK(handle_get_autoscanmode), NULL);
+
        /* Passpoint */
        g_signal_connect(wifi_object, "handle-set-passpoint",
                                G_CALLBACK(handle_set_passpoint), NULL);