Resolve Wifi reconnects everytime automatically after disconnecting

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

diff --git a/SettingWiFi/SettingWiFi/view/InfoPage.cs b/SettingWiFi/SettingWiFi/view/InfoPage.cs
index 8f96dc075ac701633d719565dccefcaef40b0042..1bc1efe6a353995b7f708c6e102de96d486cb36d 100755 (executable)
--- a/SettingWiFi/SettingWiFi/view/InfoPage.cs
+++ b/SettingWiFi/SettingWiFi/view/InfoPage.cs
@@ -195,6 +195,7 @@ namespace SettingWiFi
 
         private void OnSwitchClicked(object sender, SelectedChangedEventArgs e)
         {
+            mAp.StaticIPConfig = mOnOffSwitch.IsSelected;
             mApInfoSource.Clear();
             mApInfoSource.ShowInfo(e.IsSelected, true);
         }
@@ -245,22 +246,26 @@ namespace SettingWiFi
 
         private void OnBackClicked(object source, ClickedEventArgs args)
         {
-            //if (mIsOriginOnOffSwitchSelected != mOnOffSwitch.IsSelected)
-            //{
-            //    UpdateApInfo(mOnOffSwitch.IsSelected);
-            //}
-            UpdateApInfo(mOnOffSwitch.IsSelected);
+            if (mIsOriginOnOffSwitchSelected != mOnOffSwitch.IsSelected)
+            {
+                UpdateApInfo(mOnOffSwitch.IsSelected);
+            }
+            mAp.StaticIPConfig = mOnOffSwitch.IsSelected;
             NUIApplication.GetDefaultWindow().GetDefaultNavigator().Pop();
         }
 
         private void UpdateApInfo(bool isStaticIpConfig)
         {
-            mWifi.UpdateIpConfigMethod(mAp, isStaticIpConfig);
-            if (isStaticIpConfig)
+            Debug("");
+            if (mAp.IsConnected())
             {
-                GetStaticIpInfo();
+                mWifi.UpdateIpConfigMethod(mAp, isStaticIpConfig);
+                if (isStaticIpConfig)
+                {
+                    GetStaticIpInfo();
+                }
+                mWifi.UpdateApInfo(mAp);
             }
-            mWifi.UpdateApInfo(mAp);
         }
 
         private void GetStaticIpInfo()

diff --git a/packaging/org.tizen.cssetting-wifi-1.1.3.rpk b/packaging/org.tizen.cssetting-wifi-1.1.3.rpk
index f0d2910afc0f66f5cef207e83485bf3bba494e2c..8366f039acf3bf9a26d9828d0e8e236d40139396 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