Resolve ip info details not reflecting on InfoPage for an AP added through 'Add Network'.

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

diff --git a/SettingWiFi/SettingWiFi/controller/WiFi.cs b/SettingWiFi/SettingWiFi/controller/WiFi.cs
index e4e9b2dd2b6253ec7b247ac0da8da8a07c40a647..207b3776d09f02fc89574d5595c2c52625b33d35 100755 (executable)
--- a/SettingWiFi/SettingWiFi/controller/WiFi.cs
+++ b/SettingWiFi/SettingWiFi/controller/WiFi.cs
@@ -323,7 +323,7 @@ namespace SettingWiFi
 \r
         private void OnConnectionStateChanged(object sender, ConnectionStateChangedEventArgs e)\r
         {\r
-            Debug("OnConnectionStateChanged is callled");\r
+            Debug("OnConnectionStateChanged is called");\r
             var ap = e.AP;\r
             var bssid = ap.NetworkInformation.Bssid;\r
             WiFiState state = convertWiFiState(e.State);\r
@@ -470,6 +470,19 @@ namespace SettingWiFi
             ap.ApHandle.NetworkInformation.ProxyAddress = proxy;\r
             return true;\r
         }\r
+\r
+        public bool UpdateNetworkPrefixLength(AP ap, string prefixLength)\r
+        {\r
+            int length;\r
+            if (int.TryParse(prefixLength, out length) == false)\r
+            {\r
+                Error("Network prefix parsing error");\r
+                return false;\r
+            }\r
+\r
+            ap.ApHandle.NetworkInformation.IPv4Setting.PrefixLength = length;\r
+            return true;\r
+        }\r
     }\r
 \r
     internal class WiFiStateChangedEventArgs\r

diff --git a/SettingWiFi/SettingWiFi/view/AddNetwork.cs b/SettingWiFi/SettingWiFi/view/AddNetwork.cs
index de68e923bf36d6b21a543fbd5eb1cf376e389ae4..6eeb2d323c9b77cb8fbd422b6449123b12ee8192 100644 (file)
--- a/SettingWiFi/SettingWiFi/view/AddNetwork.cs
+++ b/SettingWiFi/SettingWiFi/view/AddNetwork.cs
@@ -316,20 +316,6 @@ namespace SettingWiFi
                 mAp = apList[0];
                 Debug("An AP found with ssid " + essid);
 
-                if (mNetworkItem.IPSettings == "Static")
-                {
-                    mAp.StaticIPConfig = true;
-                    mAp.IPv4 = mNetworkItem.IPv4;
-                    mAp.GatewayAddress = mNetworkItem.GatewayAddress;
-                    mAp.NetworkPrefixLength = mNetworkItem.NetworkPrefixLength;
-                    mAp.Dns1 = mNetworkItem.Dns1;
-                    mAp.Dns2 = mNetworkItem.Dns2;
-                }
-                else
-                {
-                    mAp.StaticIPConfig = false;
-                }
-
                 if (!mAp.IsConnected())
                 {
                     ConnectToAP(mAp);
@@ -361,16 +347,40 @@ namespace SettingWiFi
                 if (mWifi.GetConnectedAP().Equals(ap.Essid))
                 {
                     ap.StateInfo = Resources.IDS_WIFI_SBODY_CONNECTED_M_STATUS;
+                    Debug("IP Config: " + ap.StaticIPConfig + " : " + mNetworkItem.IPSettings);
+                    if (mNetworkItem.IPSettings == "Static")
+                    {
+                        Debug("");
+                        ap.StaticIPConfig = true;
+                        mWifi.UpdateIpConfigMethod(ap, ap.StaticIPConfig);
+                        UpdateInfo(ap);
+                    }
+
+                    mWifi.UpdateApInfo(ap);
+                    List<AP> apList = mWifi.GetScanResult();
+                    mApSource.UpdateScanList(apList);
                 }
-                mWifi.UpdateIpConfigMethod(mAp, ap.StaticIPConfig);
-                mWifi.UpdateApInfo(ap);
-                List<AP> apList = mWifi.GetScanResult();
-                mApSource.UpdateScanList(apList);
             }
             catch(Exception e)
             {
                 Error("Exception: " + e.Message + " : " + e.StackTrace);
             }
         }
+
+        private void UpdateInfo(AP ap)
+        {
+            Debug("");
+            ap.IPv4 = mNetworkItem.IPv4;
+            ap.GatewayAddress = mNetworkItem.GatewayAddress;
+            ap.NetworkPrefixLength = mNetworkItem.NetworkPrefixLength;
+            ap.Dns1 = mNetworkItem.Dns1;
+            ap.Dns2 = mNetworkItem.Dns2;
+
+            mWifi.UpdateIPAddress(ap, mNetworkItem.IPv4);
+            mWifi.UpdateGatewayAddress(ap, mNetworkItem.GatewayAddress);
+            mWifi.UpdateNetworkPrefixLength(ap, mNetworkItem.NetworkPrefixLength);
+            mWifi.UpdateDns1(ap, mNetworkItem.Dns1);
+            mWifi.UpdateDns2(ap, mNetworkItem.Dns2);
+        }
     }
 }

diff --git a/packaging/org.tizen.cssetting-wifi-1.1.3.rpk b/packaging/org.tizen.cssetting-wifi-1.1.3.rpk
index 3b2328fb8e1fbcc063e07802dcf66bcb1b5fe534..f0d2910afc0f66f5cef207e83485bf3bba494e2c 100644 (file)
Binary files a/packaging/org.tizen.cssetting-wifi-1.1.3.rpk and b/packaging/org.tizen.cssetting-wifi-1.1.3.rpk differ