Replace capi-network-wifi (deprecated) by capi-network-wifi-manager

Change-Id: I29ca27a65fe080050cf0cd49cd780c1df659318c

diff --git a/packaging/privacy-guard.spec b/packaging/privacy-guard.spec
index 814fd54..ec2120f 100644 (file)
--- a/packaging/privacy-guard.spec
+++ b/packaging/privacy-guard.spec
@@ -32,7 +32,7 @@ BuildRequires:  pkgconfig(aul)
 BuildRequires:  pkgconfig(libpcre)
 BuildRequires:  pkgconfig(capi-telephony)
 BuildRequires:  pkgconfig(capi-network-connection)
-BuildRequires:  pkgconfig(capi-network-wifi)
+BuildRequires:  pkgconfig(capi-network-wifi-manager)
 BuildRequires:  pkgconfig(capi-location-manager)
 BuildRequires:  pkgconfig(contacts-service2)
 

diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index 8febac9..21c043f 100755 (executable)
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -11,7 +11,7 @@ SET(INCLUDEDIR "\${prefix}/include")
 INCLUDE(FindPkgConfig)
 pkg_check_modules(pkgs REQUIRED dlog sqlite3 dbus-1 pkgmgr-info capi-system-info
        libtzplatform-config security-privilege-manager cynara-monitor security-manager aul
-       capi-telephony capi-network-connection capi-network-wifi capi-location-manager
+       capi-telephony capi-network-connection capi-network-wifi-manager capi-location-manager
        contacts-service2)
 
 FOREACH(flag ${pkgs_CFLAGS})

diff --git a/server/src/service/DlpPrivacyInfoData.cpp b/server/src/service/DlpPrivacyInfoData.cpp
index a7c794d..ef96005 100644 (file)
--- a/server/src/service/DlpPrivacyInfoData.cpp
+++ b/server/src/service/DlpPrivacyInfoData.cpp
@@ -17,11 +17,10 @@
 /**
  * @file       DlpPrivacyInfoData.cpp
  */
-
 #include <string.h>
 
 #include <contacts.h>
-#include <wifi.h>
+#include <wifi-manager.h>
 
 #include <chrono>
 #include <thread>
@@ -41,11 +40,14 @@
                && (contacts_list_get_current_record_p(list, &record) == CONTACTS_ERROR_NONE))                  \
     )
 
+static wifi_manager_h m_wifi_manager;
 std::mutex DlpPrivacyInfoData::m_singletonMutex;
 DlpPrivacyInfoData *DlpPrivacyInfoData::m_pInstance = NULL;
 
 DlpPrivacyInfoData::DlpPrivacyInfoData() : m_connection(NULL), m_locmgr(NULL), m_myprofile_watch(false)
 {
+       wifi_manager_initialize(&m_wifi_manager);
+
        m_last_latitude = 0;
        m_last_longitude = 0;
        m_owner_ibirthday = 0;
@@ -415,7 +417,7 @@ DlpPrivacyInfoData::loadInfo(const int userId)
        }
 
        // Loading Wi-Fi MAC
-       if (!strcmp(m_mac, "") && wifi_get_mac_address(&mac) == WIFI_ERROR_NONE) {
+       if (!strcmp(m_mac, "") && wifi_manager_get_mac_address(m_wifi_manager, &mac) == WIFI_MANAGER_ERROR_NONE) {
                pg_strlcpy(m_mac, mac, LEN_MAC_ADDRESS);
                free(mac);
        }