Fix a wrong type

Change-Id: I1cd7c0c3559ebe21c405081304e5f54472752417

diff --git a/SettingWiFi/SettingWiFi/controller/WiFi.cs b/SettingWiFi/SettingWiFi/controller/WiFi.cs
index 09c14a1a24ef0b526b2dbf1e5407bf066b2edec0..f903e349d1fea134b4a999ea58571f679f03473c 100755 (executable)
--- a/SettingWiFi/SettingWiFi/controller/WiFi.cs
+++ b/SettingWiFi/SettingWiFi/controller/WiFi.cs
@@ -237,6 +237,30 @@ namespace SettingWiFi
             return apInfoList;\r
         }\r
 \r
+        public List<AP> GetSpecificAPList()\r
+        {\r
+            Debug("WiFi.GetSpecificAPList");\r
+            List<AP> apInfoList = new List<AP>();\r
+            foreach (var item in specificAPList)\r
+            {\r
+                Debug("AP name: " + item.NetworkInformation.Essid);\r
+                Debug("AP connection state: " + item.NetworkInformation.ConnectionState.ToString());\r
+\r
+                string securityType = item.SecurityInformation.SecurityType.ToString();\r
+                bool isWpsSupported = item.SecurityInformation.IsWpsSupported;\r
+                WiFiState state = convertWiFiState(item.NetworkInformation.ConnectionState);\r
+\r
+                if (item.NetworkInformation.ConnectionState.ToString().Equals(Resources.IDS_WIFI_SBODY_CONNECTED_M_STATUS))\r
+                {\r
+                    apInfoList.Add(new AP(item, item.NetworkInformation.Essid,\r
+                        state, securityType, isWpsSupported,\r
+                        item.NetworkInformation.Bssid, item.NetworkInformation.RssiLevel));\r
+                }\r
+            }\r
+\r
+            return apInfoList;\r
+        }\r
+\r
         internal event EventHandler<WiFiStateChangedEventArgs> WiFiStateChangedEventArgs\r
         {\r
             add\r
@@ -303,48 +327,5 @@ namespace SettingWiFi
             get;\r
             set;\r
         }\r
-\r
-        public List<AP> GetSpecificAPList()\r
-        {\r
-            Debug("WiFi.GetSpecificAPList");\r
-            List<AP> apInfoList = new List<AP>();\r
-            foreach (var item in specificAPList)\r
-            {\r
-                Debug("AP name: " + item.NetworkInformation.Essid);\r
-                Debug("AP connection state: " + item.NetworkInformation.ConnectionState.ToString());\r
-\r
-                string securityType = item.SecurityInformation.SecurityType.ToString();\r
-                bool isWpsSupported = item.SecurityInformation.IsWpsSupported;\r
-\r
-                if (item.NetworkInformation.ConnectionState.ToString().Equals(Resources.IDS_WIFI_SBODY_CONNECTED_M_STATUS))\r
-                {\r
-                    apInfoList.Add(new AP(item.NetworkInformation.Essid, Resources.IDS_WIFI_SBODY_CONNECTED_M_STATUS, securityType, isWpsSupported));\r
-                    continue;\r
-                }\r
-\r
-                string text = "";\r
-\r
-                if (securityType.Equals(Resources.IDS_ST_BODY_NONE))\r
-                {\r
-                    text = Resources.IDS_WIFI_POP_OPEN;\r
-                }\r
-                else if (securityType.Equals(Resources.IDS_WIFI_BODY_EAP))\r
-                {\r
-                    text = Resources.IDS_ST_BODY_SECURED_ABB_M_WIFI_AP_SUMMARY + " (Eap)";\r
-                }\r
-                else if (isWpsSupported)\r
-                {\r
-                    text = Resources.IDS_ST_BODY_SECURED_ABB_M_WIFI_AP_SUMMARY + " (WPS available)";\r
-                }\r
-                else\r
-                {\r
-                    text = Resources.IDS_ST_BODY_SECURED_ABB_M_WIFI_AP_SUMMARY;\r
-                }\r
-\r
-                apInfoList.Add(new AP(item.NetworkInformation.Essid, text, securityType, isWpsSupported));\r
-            }\r
-\r
-            return apInfoList;\r
-        }\r
     }\r
 }\r

diff --git a/SettingWiFi/SettingWiFi/view/HiddenConnectPage.cs b/SettingWiFi/SettingWiFi/view/HiddenConnectPage.cs
index faadd4a75d4a90dfde896ba5594cf9d552eed3cc..36a158fb34aef3be43d9b4dfda43f3f5a757cda7 100644 (file)
--- a/SettingWiFi/SettingWiFi/view/HiddenConnectPage.cs
+++ b/SettingWiFi/SettingWiFi/view/HiddenConnectPage.cs
@@ -100,7 +100,7 @@ namespace SettingWiFi
             {
                 if (item.SecType.Equals(Resources.IDS_WIFI_POP_OPEN))
                 {
-                    await mWifi.Connect(item.Essid, null);
+                    await mWifi.Connect(item, null);
                 }
                 else
                 {