Resolve ipv6 info not correctly shown on InfoPage

Change-Id: I3493197adcf3c823057a5abf81af945d306219bd
Signed-off-by: Akash Kumar <akash1.kumar@samsung.com>

diff --git a/SettingWiFi/SettingWiFi/controller/WiFi.cs b/SettingWiFi/SettingWiFi/controller/WiFi.cs
index 4c2d9164f86eabe4ce2463eac646852c226f1a00..35787fc065d26060056c9c36d1142eb4675344ae 100755 (executable)
--- a/SettingWiFi/SettingWiFi/controller/WiFi.cs
+++ b/SettingWiFi/SettingWiFi/controller/WiFi.cs
@@ -230,7 +230,22 @@ namespace SettingWiFi
                 networkInfo.Bssid, networkInfo.RssiLevel);\r
 \r
             ap.IPv4 = networkInfo.IPv4Setting.IP.ToString();\r
-            ap.IPv6 = networkInfo.IPv6Setting.IP.ToString();\r
+            //ap.IPv6 = networkInfo.IPv6Setting.IP.ToString();\r
+            IEnumerable<IPAddress> ipv6List = networkInfo.GetAllIPv6Addresses();\r
+            int count = 0;\r
+            Debug("SSID: " + ap.Essid);\r
+            foreach (var item in ipv6List)\r
+            {\r
+                string ip = item.ToString();\r
+                Debug("item ipv6:: " + ip);\r
+                if(ip != "::")\r
+                {\r
+                    ap.IPv6 = ip;\r
+                    count++;\r
+                }\r
+            }\r
+            Debug("Count of ipv6: " + count);\r
+\r
             var proxy = networkInfo.ProxyAddress;\r
             if (proxy.Contains(':'))\r
             {\r

diff --git a/packaging/org.tizen.cssetting-wifi-1.0.0.tpk b/packaging/org.tizen.cssetting-wifi-1.0.0.tpk
index f523c8bb738a2ab5532c6276f8c5f77ca73c1622..dfed33c25e9599ace14bd945a2e17c1383952661 100644 (file)
Binary files a/packaging/org.tizen.cssetting-wifi-1.0.0.tpk and b/packaging/org.tizen.cssetting-wifi-1.0.0.tpk differ