From: Akash <akash1.kumar@samsung.com>
Date: Tue, 20 Dec 2022 03:29:50 +0000 (+0530)
Subject: Resolve crash issue on entering wrong password.
X-Git-Tag: accepted/tizen/unified/20230303.162802~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d92bfc4a64e0de246d99036936e85ca872fa5f0b;p=profile%2Fiot%2Fapps%2Fdotnet%2Fsetting-wifi.git

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 70df920..a3c195a 100755
--- a/SettingWiFi/SettingWiFi/controller/WiFi.cs
+++ b/SettingWiFi/SettingWiFi/controller/WiFi.cs
@@ -93,9 +93,14 @@ namespace SettingWiFi
             {
                 await apHandle.ConnectAsync();
             }
+            catch (InvalidKeyException e)
+            {
+                Error("Failed to connect " + e.Message + " : " + e.Source);
+                throw new WrongPasswordEntered(e.Message);
+            }
             catch (Exception e)
             {
-                Debug("Fail to connect" + e.ToString());
+                Error("Failed to connect " + e.ToString());
             }
         }
 
diff --git a/SettingWiFi/SettingWiFi/view/ConnectPage.cs b/SettingWiFi/SettingWiFi/view/ConnectPage.cs
index 8de7b11..52c0fc7 100644
--- 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 66381dd..fb50c11 100644
Binary files a/packaging/org.tizen.cssetting-wifi-1.0.0.tpk and b/packaging/org.tizen.cssetting-wifi-1.0.0.tpk differ