[Systeminfo] - fixing getting mac addresses when wifi or network is disabled

[Verification] - TCT results for systeminfo and Download are 100%

Change-Id: Ib1a06ba671c46807680e6be2f8ab623d73a9b43d
Signed-off-by: Andrzej Popowski <a.popowski@samsung.com>

diff --git a/src/systeminfo/systeminfo-utils.cpp b/src/systeminfo/systeminfo-utils.cpp
index 1cacaa14d48e6d61dcd0a02da8eb81db11a08d7e..5ed7050ede48c326e257f644ed92bf0e836804d3 100644 (file)
--- a/src/systeminfo/systeminfo-utils.cpp
+++ b/src/systeminfo/systeminfo-utils.cpp
@@ -2184,18 +2184,6 @@ PlatformResult SysteminfoUtils::ReportWifiNetwork(picojson::object& out) {
   connection_handle_ptr(connection_handle, &connection_destroy);
   // automatically release the memory
 
-  char* mac = nullptr;
-  error = connection_get_mac_address(connection_handle, CONNECTION_TYPE_WIFI, &mac);
-  if (CONNECTION_ERROR_NONE == error && nullptr != mac) {
-    SLoggerD("MAC address fetched: %s", mac);
-    result_mac_address = mac;
-    free(mac);
-  } else {
-    std::string log_msg = "Failed to get mac address: " + std::to_string(error);
-    LoggerE("%s", log_msg.c_str());
-    return PlatformResult(ErrorCode::UNKNOWN_ERR, log_msg);
-  }
-
   error = connection_get_type(connection_handle, &connection_type);
   if (CONNECTION_ERROR_NONE != error) {
     std::string log_msg = "Cannot get connection type: " + std::to_string(error);
@@ -2203,7 +2191,19 @@ PlatformResult SysteminfoUtils::ReportWifiNetwork(picojson::object& out) {
     return PlatformResult(ErrorCode::UNKNOWN_ERR, log_msg);
   }
   if (CONNECTION_TYPE_WIFI == connection_type) {
+    char* mac = nullptr;
+    error = connection_get_mac_address(connection_handle, CONNECTION_TYPE_WIFI, &mac);
+    if (CONNECTION_ERROR_NONE == error && nullptr != mac) {
+      SLoggerD("MAC address fetched: %s", mac);
+      result_mac_address = mac;
+      free(mac);
+    } else {
+      std::string log_msg = "Failed to get mac address: " + std::to_string(error);
+      LoggerE("%s", log_msg.c_str());
+      return PlatformResult(ErrorCode::UNKNOWN_ERR, log_msg);
+    }
     result_status = true;
+
     //gathering profile
     error = connection_get_current_profile(connection_handle, &profile_handle);
     if (CONNECTION_ERROR_NONE != error) {
@@ -2246,8 +2246,7 @@ PlatformResult SysteminfoUtils::ReportWifiNetwork(picojson::object& out) {
       LoggerE("%s", log_msg.c_str());
       return PlatformResult(ErrorCode::UNKNOWN_ERR, log_msg);
     }
-  }
-  else {
+  } else {
     LoggerD("Connection type = %d. WIFI is disabled", connection_type);
   }
 
@@ -2336,18 +2335,6 @@ PlatformResult SysteminfoUtils::ReportEthernetNetwork(picojson::object& out) {
       break;
   }
 
-  char* mac = nullptr;
-  error = connection_get_mac_address(connection_handle, CONNECTION_TYPE_ETHERNET, &mac);
-  if (CONNECTION_ERROR_NONE == error && nullptr != mac) {
-    SLoggerD("MAC address fetched: %s", mac);
-    result_mac_address = mac;
-    free(mac);
-  } else {
-    std::string log_msg = "Failed to get mac address: " + std::to_string(error);
-    LoggerE("%s", log_msg.c_str());
-    return PlatformResult(ErrorCode::UNKNOWN_ERR, log_msg);
-  }
-
   error = connection_get_type(connection_handle, &connection_type);
   if (CONNECTION_ERROR_NONE != error) {
     std::string log_msg = "Cannot get connection type: " + std::to_string(error);
@@ -2356,6 +2343,18 @@ PlatformResult SysteminfoUtils::ReportEthernetNetwork(picojson::object& out) {
   }
 
   if (CONNECTION_TYPE_ETHERNET == connection_type) {
+    char* mac = nullptr;
+    error = connection_get_mac_address(connection_handle, CONNECTION_TYPE_ETHERNET, &mac);
+    if (CONNECTION_ERROR_NONE == error && nullptr != mac) {
+      SLoggerD("MAC address fetched: %s", mac);
+      result_mac_address = mac;
+      free(mac);
+    } else {
+      std::string log_msg = "Failed to get mac address: " + std::to_string(error);
+      LoggerE("%s", log_msg.c_str());
+      return PlatformResult(ErrorCode::UNKNOWN_ERR, log_msg);
+    }
+
     //gathering profile
     error = connection_get_current_profile(connection_handle, &profile_handle);
     if (CONNECTION_ERROR_NONE != error) {