Implement update static info on Static Ip setting and Resolve dialog page launch...

This patch solves follwoing issue:
- Add support for static info update for searched AP object when "connect" button is clicked on "Add network page".
- When static Ip is selected and IpSetting is clicked, IpInfo input dialog page was also poping up
  in background of the radio button selection page.

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

diff --git a/SettingWiFi/SettingWiFi/model/AP.cs b/SettingWiFi/SettingWiFi/model/AP.cs
index 296177d5b4ffd9e4b3c94b28b7f3f02db8f4fcfe..cc923634dbbafa783fb07b5a346c606f10ecf41b 100755 (executable)
--- a/SettingWiFi/SettingWiFi/model/AP.cs
+++ b/SettingWiFi/SettingWiFi/model/AP.cs
@@ -305,5 +305,11 @@ namespace SettingWiFi
             get;\r
             set;\r
         }\r
+\r
+        public string NetworkPrefixLength\r
+        {\r
+            get;\r
+            set;\r
+        }\r
     };\r
 }\r

diff --git a/SettingWiFi/SettingWiFi/view/AddNetwork.cs b/SettingWiFi/SettingWiFi/view/AddNetwork.cs
index 41dbf02afdc72d82d3cca56f6509c06e6461d48e..d2e6f0e37dcee11df47cf4a6b2ef24174bb3bb88 100644 (file)
--- a/SettingWiFi/SettingWiFi/view/AddNetwork.cs
+++ b/SettingWiFi/SettingWiFi/view/AddNetwork.cs
@@ -315,6 +315,17 @@ 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;
+                }
+
                 if (!mAp.IsConnected())
                 {
                     ConnectToAP(mAp);

diff --git a/SettingWiFi/SettingWiFi/view/AddNetworkInfoInputPage.cs b/SettingWiFi/SettingWiFi/view/AddNetworkInfoInputPage.cs
index a5dc0c69e01be84d2a155351708281fa4eaeeef8..e6dcce1f25fd89d5e25c6e67ff215c0f48a5058b 100644 (file)
--- a/SettingWiFi/SettingWiFi/view/AddNetworkInfoInputPage.cs
+++ b/SettingWiFi/SettingWiFi/view/AddNetworkInfoInputPage.cs
@@ -19,6 +19,7 @@ namespace SettingWiFi
         private string mImagesPath;
         private string[] mOptionNames;
         private int mSelectedIndex;
+        private bool mLaunched;
 
         internal AddNetworkInfoInputPage(AddNetworkItem item, AddNetworkInfoSource infoSource)
         {
@@ -121,6 +122,7 @@ namespace SettingWiFi
             okButton.Clicked += OnRadioOkClicked;
 
             CreateRadioOptions(optionView);
+            mLaunched = true;
             mRadioButtons[mSelectedIndex].IsSelected = true;
             Content = new AlertDialog()
             {
@@ -238,7 +240,11 @@ namespace SettingWiFi
             {
                 mSelectedIndex = i;
                 Debug("Selected index: " + mSelectedIndex);
-                CreateIpSettingsInfoPage();
+                if (!mLaunched)
+                {
+                    CreateIpSettingsInfoPage();
+                }
+                mLaunched = false;
             }
         }
 

diff --git a/packaging/org.tizen.cssetting-wifi-1.1.3.rpk b/packaging/org.tizen.cssetting-wifi-1.1.3.rpk
index e81f5ba7fd2784cbc13774b4a12306fe7ae37ca3..8152c0dbebd6d4d65965371cd4ff740ba74f0f19 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