Correct wrong security type

Change-Id: I484eac0c8992d41849eaf0aeb24bf32b9cf188a1

diff --git a/SettingWiFi/SettingWiFi/controller/WiFi.cs b/SettingWiFi/SettingWiFi/controller/WiFi.cs
index 4d928f2fb5d5f4348c728bca51b30091540dec5a..c9b46996a151ecc121f5cccce527ca54bed265f7 100755 (executable)
--- a/SettingWiFi/SettingWiFi/controller/WiFi.cs
+++ b/SettingWiFi/SettingWiFi/controller/WiFi.cs
@@ -200,9 +200,10 @@ namespace SettingWiFi
 \r
                 //bool isPassphraseRequired = item.SecurityInformation.IsPassphraseRequired;\r
 \r
-                string securityType = item.SecurityInformation.SecurityType.ToString();\r
+                var securityType = item.SecurityInformation.SecurityType;\r
                 bool isWpsSupported = item.SecurityInformation.IsWpsSupported;\r
 \r
+\r
                 WiFiState state = convertWiFiState(item.NetworkInformation.ConnectionState);\r
 \r
                 var networkInfo = item.NetworkInformation;\r
@@ -246,7 +247,7 @@ namespace SettingWiFi
                 Debug("AP name: " + item.NetworkInformation.Essid);\r
                 Debug("AP connection state: " + item.NetworkInformation.ConnectionState.ToString());\r
 \r
-                string securityType = item.SecurityInformation.SecurityType.ToString();\r
+                var securityType = item.SecurityInformation.SecurityType;\r
                 bool isWpsSupported = item.SecurityInformation.IsWpsSupported;\r
                 WiFiState state = convertWiFiState(item.NetworkInformation.ConnectionState);\r
 \r

diff --git a/SettingWiFi/SettingWiFi/model/AP.cs b/SettingWiFi/SettingWiFi/model/AP.cs
index 6e3314f2aa9d70e390c61e26ef015fd36929442a..8d5ae07b5c489c4eb316cefc6235479ad9f03563 100755 (executable)
--- a/SettingWiFi/SettingWiFi/model/AP.cs
+++ b/SettingWiFi/SettingWiFi/model/AP.cs
@@ -7,6 +7,7 @@ using Tizen.NUI.BaseComponents;
 using Tizen.NUI.Components;\r
 using Tizen.NUI.Binding;\r
 using Tizen.Network.WiFi;\r
+using Tizen.Network.Connection;\r
 using SettingWiFi.res.locale;\r
 using static SettingWiFi.Logger;\r
 \r
@@ -26,7 +27,7 @@ namespace SettingWiFi
         private string essid;\r
         private WiFiState state;\r
         private string stateInfo;\r
-        private string secType;\r
+        private WiFiSecurityType secType;\r
         private bool isWps;\r
         private SignalStrengthIndicator signalStrength = SignalStrengthIndicator.UNKNOWN;\r
 \r
@@ -61,7 +62,7 @@ namespace SettingWiFi
         {\r
             string iconName = "wifi-ap_icon_";\r
 \r
-            if (secType != "None")\r
+            if (secType != WiFiSecurityType.None)\r
             {\r
                 iconName += "lock_";\r
             }\r
@@ -91,21 +92,21 @@ namespace SettingWiFi
                 + ", IconDir: " + iconDir); // TODO: will be removed.\r
         }\r
 \r
-        public AP(WiFiAP apHandle, string apEssid, WiFiState apState,\r
-            string apSecType, bool apIsWps, string apBssid, SignalStrengthIndicator apSignalStrength)\r
+        public AP()\r
         {\r
-            ApHandle = apHandle;\r
-            essid = apEssid;\r
-            secType = apSecType;\r
-            isWps = apIsWps;\r
-            Bssid = apBssid;\r
+            ApHandle = null;\r
+            essid = "";\r
+            state = WiFiState.Disconnected;\r
+            secType = WiFiSecurityType.None;\r
+            isWps = false;\r
+            Bssid = "";\r
             StateInfo = GetStateInfo(state);\r
-            signalStrength = apSignalStrength;\r
+            signalStrength = SignalStrengthIndicator.UNKNOWN;\r
             UpdateWiFiAPIcon();\r
         }\r
 \r
         public AP(WiFiAP apHandle, string apEssid, WiFiState apState,\r
-            string apSecType, bool apIsWps, string apBssid, WiFiRssiLevel apRssiLevel)\r
+            WiFiSecurityType apSecType, bool apIsWps, string apBssid, WiFiRssiLevel apRssiLevel)\r
         {\r
             ApHandle = apHandle;\r
             essid = apEssid;\r
@@ -156,11 +157,12 @@ namespace SettingWiFi
             switch (state)\r
             {\r
             case WiFiState.Disconnected:\r
-                if (secType.Equals(Resources.IDS_ST_BODY_NONE))\r
+                if (secType == WiFiSecurityType.None)\r
                 {\r
                     return Resources.IDS_WIFI_POP_OPEN;\r
+\r
                 }\r
-                else if (secType.Equals(Resources.IDS_WIFI_BODY_EAP))\r
+                else if (secType == WiFiSecurityType.Eap)\r
                 {\r
                     return Resources.IDS_ST_BODY_SECURED_ABB_M_WIFI_AP_SUMMARY + " (Eap)";\r
                 }\r
@@ -206,7 +208,7 @@ namespace SettingWiFi
         {\r
             get\r
             {\r
-                return secType;\r
+                return secType.ToString();\r
             }\r
         }\r
 \r

diff --git a/SettingWiFi/SettingWiFi/view/APSource.cs b/SettingWiFi/SettingWiFi/view/APSource.cs
index 6881c8d3d7a1cb0a24e9c9dbb2f1d9a3c91d49d5..17c19810e304ba9ca007618b99f360ec96b9e4ca 100755 (executable)
--- a/SettingWiFi/SettingWiFi/view/APSource.cs
+++ b/SettingWiFi/SettingWiFi/view/APSource.cs
@@ -41,7 +41,7 @@ namespace SettingWiFi
             if (apList == null)\r
             {\r
                 Debug("apList is null");\r
-                this.Add(new AP(null, "", WiFiState.Disconnected, "", false, "", AP.SignalStrengthIndicator.UNKNOWN));\r
+                this.Add(new AP());\r
                 return;\r
             }\r
             // Clear method have some issue about asynchronous actions,\r