Modify deprecated api for Wi-Fi

Add not supported message when pressing wi-fi or bt on emulator

Change-Id: Ib99fef6317d886ef139c4ebb897673320fdc515c

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6c588e3..215ec41 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -102,6 +102,7 @@ pkg_check_modules(pkgs REQUIRED
        capi-network-bluetooth
        capi-network-connection
        capi-network-wifi
+       capi-network-wifi-manager
        capi-media-player
        capi-media-camera
        capi-media-sound-manager

diff --git a/inc/setting_utils.h b/inc/setting_utils.h
index 365ca59..fd68537 100755 (executable)
--- a/inc/setting_utils.h
+++ b/inc/setting_utils.h
@@ -66,5 +66,5 @@ extern void quickpanel_setting_create_timeout_popup(Evas_Object *parent, char *m
 
 extern int quickpanel_setting_scroll_page_get(void *data);
 extern Eina_Bool quickpanel_setting_get_secured_lock_state(void);
-
+extern void quickpanel_setting_show_not_supported_message(void);
 #endif /* __SETTING_UTILS_H__ */

diff --git a/inc/settings.h b/inc/settings.h
index f1f2a66..eb8907e 100755 (executable)
--- a/inc/settings.h
+++ b/inc/settings.h
@@ -32,6 +32,7 @@
 
 #define QS_DBUS_SIG_ACTIVITY "ACTIVITY"
 #define QS_DBUS_SIG_EDITING "EDITING"
+#define QS_NOT_SUPPORT_MSG _NOT_LOCALIZED("Not supported")
 
 typedef enum _qp_setting_icon_state_type {
        QP_SETTING_ICON_STATE_NOT_LOADED,

diff --git a/packaging/org.tizen.quickpanel.spec b/packaging/org.tizen.quickpanel.spec
index f77c05b..92dae02 100755 (executable)
--- a/packaging/org.tizen.quickpanel.spec
+++ b/packaging/org.tizen.quickpanel.spec
@@ -24,6 +24,7 @@ BuildRequires: pkgconfig(capi-system-info)
 BuildRequires: pkgconfig(capi-system-device)
 BuildRequires: pkgconfig(capi-location-manager)
 BuildRequires: pkgconfig(capi-network-wifi)
+BuildRequires: pkgconfig(capi-network-wifi-manager)
 BuildRequires: pkgconfig(capi-network-bluetooth)
 BuildRequires: pkgconfig(capi-network-tethering)
 BuildRequires: pkgconfig(capi-network-connection)

diff --git a/src/settings/modules/bluetooth.c b/src/settings/modules/bluetooth.c
index a6d0a5a..a60659e 100755 (executable)
--- a/src/settings/modules/bluetooth.c
+++ b/src/settings/modules/bluetooth.c
@@ -15,11 +15,9 @@
  */
 
 #include <Elementary.h>
-
 #include <bluetooth.h>
 #include <vconf.h>
 #include <bluetooth_internal.h>
-
 #include <tzsh.h>
 #include <tzsh_quickpanel_service.h>
 #include <E_DBus.h>
@@ -38,6 +36,8 @@
 #define BUTTON_ICON_DIM NULL
 #define PACKAGE_SETTING_MENU "ug-bluetooth-efl"
 
+int bt_service = BT_ERROR_NONE;
+
 static void _mouse_clicked_cb(void *data, Evas_Object *obj, const char *emission, const char *source);
 
 static const char *_label_get(void)
@@ -62,6 +62,10 @@ static const char *_icon_get(qp_setting_icon_image_type type)
 
 static void _long_press_cb(void *data)
 {
+       if (bt_service == BT_ERROR_NOT_SUPPORTED) {
+               quickpanel_setting_show_not_supported_message();
+               return;
+       }
        quickpanel_setting_icon_handler_longpress(PACKAGE_SETTING_MENU, NULL, NULL);
 }
 
@@ -148,6 +152,11 @@ static void _mouse_clicked_cb(void *data, Evas_Object *obj, const char *emission
 
        retif(module == NULL, , "Invalid parameter!");
 
+       if (bt_service == BT_ERROR_NOT_SUPPORTED) {
+               quickpanel_setting_show_not_supported_message();
+               return;
+       }
+
        if (quickpanel_setting_module_is_icon_clickable(module) == 0) {
                return;
        }
@@ -192,6 +201,11 @@ static int _register_module_event_handler(void *data)
        int ret = 0;
 
        ret = bt_initialize();
+       if (ret == BT_ERROR_NOT_SUPPORTED) {
+               bt_service = ret;
+               ERR("BT NOT SUPPORTED");
+               return QP_FAIL;
+       }
        msgif(ret != BT_ERROR_NONE, "bt_initialize failed");
 
        ret = bt_adapter_set_state_changed_cb(_bluetooth_status_changed_cb, data);

diff --git a/src/settings/modules/wifi.c b/src/settings/modules/wifi.c
index b2e0e69..b1aa9ea 100755 (executable)
--- a/src/settings/modules/wifi.c
+++ b/src/settings/modules/wifi.c
@@ -16,15 +16,14 @@
 
 
 #include <Elementary.h>
-
 #include <app.h>
 #include <tethering.h>
 #include <wifi.h>
 #include <vconf.h>
-
 #include <tzsh.h>
 #include <tzsh_quickpanel_service.h>
 #include <E_DBus.h>
+#include <wifi-manager.h>
 
 #include "common.h"
 #include "common_uic.h"
@@ -42,6 +41,7 @@
 #define PACKAGE_SETTING_MENU "wifi-efl-ug-lite"
 #define PACKAGE_SETTING_MENU_PTN "wifi-efl-ug" // for redwood partner
 
+
 static int _wifi_on(void *data, const char *popup_txt);
 static int _wifi_off(void);
 static int _wifi_is_on(bool *is_on);
@@ -49,6 +49,9 @@ static void _wifi_state_changed_cb(wifi_device_state_e state, void *user_data);
 static void _mouse_clicked_cb(void *data, Evas_Object *obj, const char *emission, const char *source);
 static void _reset_icon(QP_Module_Setting *module);
 
+wifi_manager_h wifi_manager = NULL;
+int wifi_error_type = WIFI_MANAGER_ERROR_NONE;
+
 static const char *_label_get(void)
 {
        return BUTTON_LABEL;
@@ -71,6 +74,11 @@ static const char *_icon_get(qp_setting_icon_image_type type)
 
 static void _long_press_cb(void *data)
 {
+       if(wifi_manager == NULL && wifi_error_type == WIFI_MANAGER_ERROR_NOT_SUPPORTED) {
+               quickpanel_setting_show_not_supported_message();
+               return;
+       }
+
        if (quickpanel_common_ui_is_package_exist(PACKAGE_SETTING_MENU)) {
                quickpanel_setting_icon_handler_longpress(PACKAGE_SETTING_MENU, NULL, NULL);
        } else {
@@ -174,6 +182,11 @@ static void _mouse_clicked_cb(void *data, Evas_Object *obj, const char *emission
        QP_Module_Setting *module = (QP_Module_Setting *)data;
        Eina_Bool secured_lock = EINA_FALSE;
 
+       if(wifi_manager == NULL && wifi_error_type == WIFI_MANAGER_ERROR_NOT_SUPPORTED) {
+               quickpanel_setting_show_not_supported_message();
+               return;
+       }
+
        retif(module == NULL, , "Invalid parameter!");
 
        if (quickpanel_setting_module_is_icon_clickable(module) == 0) {
@@ -202,10 +215,16 @@ static int _register_module_event_handler(void *data)
 {
        int ret = 0;
 
-       ret = wifi_initialize();
+       ret = wifi_manager_initialize(&wifi_manager);
+       if (wifi_manager == NULL && ret == WIFI_MANAGER_ERROR_NOT_SUPPORTED) {
+               wifi_error_type = ret;
+               ERR("Wi-Fi NOT SUPPORTED");
+               return QP_FAIL;
+       }
+
        msgif(ret < 0, "[ERR] wifi_initialize()");
 
-       ret = wifi_set_device_state_changed_cb(_wifi_state_changed_cb, data);
+       ret = wifi_manager_set_device_state_changed_cb(wifi_manager, (void*)_wifi_state_changed_cb, data);
        if (ret != WIFI_ERROR_NONE) {
                ERR("Failed to set changed callback of wifi (%d)", ret);
        } else {
@@ -219,14 +238,14 @@ static int _unregister_module_event_handler(void *data)
 {
        int ret = 0;
 
-       ret = wifi_unset_device_state_changed_cb();
+       ret = wifi_manager_unset_device_state_changed_cb(wifi_manager);
        if (ret != 0) {
                ERR("wifi cb unregister failed:%d", ret);
        } else {
                ERR("wifi op unregister done:%d", ret);
        }
 
-       ret = wifi_deinitialize();
+       ret = wifi_manager_deinitialize(wifi_manager);
        msgif(ret != WIFI_ERROR_NONE, "Fail to deactivate Wi-Fi device");
 
        return QP_OK;
@@ -306,7 +325,7 @@ static void _tethering_disabled_cb(tethering_error_e error, tethering_type_e typ
                return;
        }
 
-       ret = wifi_activate_with_wifi_picker_tested(_wifi_activated_cb, NULL);
+       ret = wifi_manager_activate_with_wifi_picker_tested(wifi_manager, (void*)_wifi_activated_cb, NULL);
        if (ret != WIFI_ERROR_NONE) {
                ERR("Fail to activate Wi-Fi device [%d]\n", ret);
                return;
@@ -414,7 +433,7 @@ static int _wifi_on(void *data, const char *popup_txt)
                return -1;
        }
 
-       ret = wifi_activate_with_wifi_picker_tested(_wifi_activated_cb, NULL);
+       ret = wifi_manager_activate_with_wifi_picker_tested(wifi_manager, (void*)_wifi_activated_cb, NULL);
        if (ret != WIFI_ERROR_NONE) {
                ERR("Fail to activate Wi-Fi device [%d]\n", ret);
                return -1;
@@ -427,7 +446,7 @@ static int _wifi_off(void)
 {
        int ret;
 
-       ret = wifi_deactivate(_wifi_deactivated_cb, NULL);
+       ret = wifi_manager_deactivate(wifi_manager, (void*)_wifi_deactivated_cb, NULL);
        if (ret != WIFI_ERROR_NONE) {
                ERR("Fail to activate Wi-Fi device [%d]\n", ret);
                return -1;
@@ -440,7 +459,7 @@ static int _wifi_is_on(bool *is_on)
 {
        int ret;
 
-       ret = wifi_is_activated(is_on);
+       ret = wifi_manager_is_activated(wifi_manager, is_on);
        if (ret != WIFI_ERROR_NONE) {
                ERR("Fail to get Wi-Fi device status [%d]\n", ret);
                return -1;

diff --git a/src/settings/setting_utils.c b/src/settings/setting_utils.c
index 7c2b9b3..15ee89f 100755 (executable)
--- a/src/settings/setting_utils.c
+++ b/src/settings/setting_utils.c
@@ -23,7 +23,8 @@
 #include <tzsh.h>
 #include <tzsh_quickpanel_service.h>
 #include <E_DBus.h>
-
+#include <notification.h>
+#include "common_uic.h"
 #include "settings.h"
 #include "common.h"
 #include "quickpanel_def.h"
@@ -643,3 +644,9 @@ HAPI Eina_Bool quickpanel_setting_get_secured_lock_state(void)
 
        return EINA_FALSE;
 }
+
+HAPI void quickpanel_setting_show_not_supported_message(void)
+{
+       notification_status_message_post(QS_NOT_SUPPORT_MSG);
+       quickpanel_uic_close_quickpanel(false, 0);
+}