Resolve crash issue on entering wrong password.

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

diff --git a/SettingWiFi/SettingWiFi/controller/WiFi.cs b/SettingWiFi/SettingWiFi/controller/WiFi.cs
index 70df92068f0c135975d01a5cb058b63845bd2cb1..a3c195af2d09dcd9c4d5923c29e4603ca75cc278 100755 (executable)
--- a/SettingWiFi/SettingWiFi/controller/WiFi.cs
+++ b/SettingWiFi/SettingWiFi/controller/WiFi.cs
@@ -93,9 +93,14 @@ namespace SettingWiFi
             {\r
                 await apHandle.ConnectAsync();\r
             }\r
+            catch (InvalidKeyException e)\r
+            {\r
+                Error("Failed to connect " + e.Message + " : " + e.Source);\r
+                throw new WrongPasswordEntered(e.Message);\r
+            }\r
             catch (Exception e)\r
             {\r
-                Debug("Fail to connect" + e.ToString());\r
+                Error("Failed to connect " + e.ToString());\r
             }\r
         }\r
 \r

diff --git a/SettingWiFi/SettingWiFi/view/ConnectPage.cs b/SettingWiFi/SettingWiFi/view/ConnectPage.cs
index 8de7b11e8659906b7dda1b1d45105077765259a7..52c0fc7251e234a74b37e3a492c4c4e13e0562f6 100644 (file)
--- a/SettingWiFi/SettingWiFi/view/ConnectPage.cs
+++ b/SettingWiFi/SettingWiFi/view/ConnectPage.cs
@@ -14,6 +14,7 @@ namespace SettingWiFi
         private WiFi mWifi;
         private TextField mPasswordField;
         private Button mConnectButton;
+        private Window mWindow = NUIApplication.GetDefaultWindow();
 
         internal ConnectPage(WiFi wifi)
         {
@@ -137,12 +138,24 @@ namespace SettingWiFi
         private async void Connect()
         {
             Debug("Connect");
-            //mAp.StateInfo = Resources.IDS_WIFI_BODY_CONNECTING_ING;
-            await mWifi.Connect(mAp, mPasswordField.Text);
+            try
+            {
+                await mWifi.Connect(mAp, mPasswordField.Text);
 
-            if(mWifi.GetConnectedAP().Equals(mAp.Essid))
+                if(mWifi.GetConnectedAP().Equals(mAp.Essid))
+                {
+                    mAp.StateInfo = Resources.IDS_WIFI_SBODY_CONNECTED_M_STATUS;
+                }
+            }
+            catch (WrongPasswordEntered e)
+            {
+                Error("Connection failed due to wrong password " + e.Message);
+                mPasswordField.Text = "";
+                mWindow.GetDefaultNavigator().Push(this);
+            }
+            catch (Exception e)
             {
-                mAp.StateInfo = Resources.IDS_WIFI_SBODY_CONNECTED_M_STATUS;
+                Error("Error other than wrong password " + e.Message);
             }
         }
 
@@ -159,4 +172,11 @@ namespace SettingWiFi
             }
         }
     }
+
+    internal class WrongPasswordEntered : InvalidOperationException
+    {
+        public WrongPasswordEntered(string message) : base(message)
+        {
+        }
+    }
 }

diff --git a/packaging/org.tizen.cssetting-wifi-1.0.0.tpk b/packaging/org.tizen.cssetting-wifi-1.0.0.tpk
index 66381dd05d68e073ac88598e766f9319e90c93e1..fb50c11b592e6707c9d0031db02a230e985e5d41 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