From: Akash Kumar <akash1.kumar@samsung.com>
Date: Fri, 19 May 2023 08:42:27 +0000 (+0530)
Subject: Resolve ip info details not reflecting on InfoPage for an AP added through 'Add Network'.
X-Git-Tag: accepted/tizen/unified/20230528.171046~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fbcd6ed53cd2a33ee9498a948a3139d71a28cf03;p=profile%2Fiot%2Fapps%2Fdotnet%2Fsetting-wifi.git

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 e4e9b2d..207b377 100755
--- a/SettingWiFi/SettingWiFi/controller/WiFi.cs
+++ b/SettingWiFi/SettingWiFi/controller/WiFi.cs
@@ -323,7 +323,7 @@ namespace SettingWiFi
 
         private void OnConnectionStateChanged(object sender, ConnectionStateChangedEventArgs e)
         {
-            Debug("OnConnectionStateChanged is callled");
+            Debug("OnConnectionStateChanged is called");
             var ap = e.AP;
             var bssid = ap.NetworkInformation.Bssid;
             WiFiState state = convertWiFiState(e.State);
@@ -470,6 +470,19 @@ namespace SettingWiFi
             ap.ApHandle.NetworkInformation.ProxyAddress = proxy;
             return true;
         }
+
+        public bool UpdateNetworkPrefixLength(AP ap, string prefixLength)
+        {
+            int length;
+            if (int.TryParse(prefixLength, out length) == false)
+            {
+                Error("Network prefix parsing error");
+                return false;
+            }
+
+            ap.ApHandle.NetworkInformation.IPv4Setting.PrefixLength = length;
+            return true;
+        }
     }
 
     internal class WiFiStateChangedEventArgs
diff --git a/SettingWiFi/SettingWiFi/view/AddNetwork.cs b/SettingWiFi/SettingWiFi/view/AddNetwork.cs
index de68e92..6eeb2d3 100644
--- 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 3b2328f..f0d2910 100644
Binary files a/packaging/org.tizen.cssetting-wifi-1.1.3.rpk and b/packaging/org.tizen.cssetting-wifi-1.1.3.rpk differ