From: hyunuktak <hyunuk.tak@samsung.com>
Date: Wed, 5 Oct 2016 02:17:58 +0000 (+0900)
Subject: [wifi-manager] Modify to load configurations
X-Git-Tag: submit/tizen/20161005.051812^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F08%2F90908%2F2;p=platform%2Fcore%2Fapi%2Fwifi-manager.git

[wifi-manager] Modify to load configurations

When there is configuration ID without settings file,
it is not error, just no profile.

Change-Id: Ib97b54198d825baa2093b1b660dad6bd40cb6d6f
Signed-off-by: hyunuktak <hyunuk.tak@samsung.com>
---

diff --git a/packaging/capi-network-wifi-manager.spec b/packaging/capi-network-wifi-manager.spec
index 89c554b..a4e1217 100755
--- a/packaging/capi-network-wifi-manager.spec
+++ b/packaging/capi-network-wifi-manager.spec
@@ -1,6 +1,6 @@
 Name:		capi-network-wifi-manager
 Summary:	Network Wi-Fi library in TIZEN C API
-Version:	1.0.4
+Version:	1.0.5
 Release:	1
 Group:		System/Network
 License:	Apache-2.0
diff --git a/src/network_internal.c b/src/network_internal.c
index ae64d93..0e893d0 100755
--- a/src/network_internal.c
+++ b/src/network_internal.c
@@ -159,8 +159,14 @@ char* _net_print_error(net_err_e error)
 		return "NET_ERR_UNKNOWN_METHOD";
 	case NET_ERR_SECURITY_RESTRICTED:
 		return "NET_ERR_SECURITY_RESTRICTED";
+	case NET_ERR_ALREADY_EXISTS:
+		return "NET_ERR_ALREADY_EXISTS";
+	case NET_ERR_NO_PROFILE:
+		return "NET_ERR_NO_PROFILE";
 	case NET_ERR_WIFI_DRIVER_FAILURE:
 		return "NET_ERR_WIFI_DRIVER_FAILURE";
+	case NET_ERR_WIFI_DRIVER_LOAD_INPROGRESS:
+		return "NET_ERR_WIFI_DRIVER_LOAD_INPROGRESS";
 	default:
 		return "INVALID";
 	}
diff --git a/src/wifi_internal.c b/src/wifi_internal.c
index 7887c93..2240867 100755
--- a/src/wifi_internal.c
+++ b/src/wifi_internal.c
@@ -303,6 +303,8 @@ static int __load_configurations(const gchar *config_id, gchar **name,
 	if (rv == NET_ERR_ACCESS_DENIED) {
 		WIFI_LOG(WIFI_ERROR, "Access denied"); //LCOV_EXCL_LINE
 		return WIFI_MANAGER_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
+	} else if (rv == NET_ERR_NO_PROFILE) {
+		return WIFI_MANAGER_ERROR_INVALID_OPERATION;
 	} else if (rv != NET_ERR_NONE)
 		return WIFI_MANAGER_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
 
@@ -320,6 +322,8 @@ static int __load_eap_configurations(const gchar *config_id, gchar **name,
 	if (rv == NET_ERR_ACCESS_DENIED) {
 		WIFI_LOG(WIFI_ERROR, "Access denied"); //LCOV_EXCL_LINE
 		return WIFI_MANAGER_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
+	} else if (rv == NET_ERR_NO_PROFILE) {
+		return WIFI_MANAGER_ERROR_INVALID_OPERATION;
 	} else if (rv != NET_ERR_NONE)
 		return WIFI_MANAGER_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
 
@@ -1523,13 +1527,12 @@ int _wifi_load_configurations(void)
 
 		if (rv != WIFI_MANAGER_ERROR_NONE) {
 			WIFI_LOG(WIFI_ERROR, "Fail to load configurations [%d]", rv); //LCOV_EXCL_LINE
-			return rv; //LCOV_EXCL_LINE
-		}
-
-		h->address_family = WIFI_MANAGER_ADDRESS_FAMILY_IPV4;
-		h->is_saved = TRUE;
+		} else {
+			h->address_family = WIFI_MANAGER_ADDRESS_FAMILY_IPV4;
+			h->is_saved = TRUE;
 
-		config_iterator = g_slist_append(config_iterator, (wifi_manager_config_h)h);
+			config_iterator = g_slist_append(config_iterator, (wifi_manager_config_h)h);
+		}
 
 		config_ids = config_ids->next;
 	}