Implement connect function for 'Add network' page.

This patch:
- Solves the crash issue after clicking connect button on 'Add network' page
- APs can be searched and be connected if found.

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

diff --git a/SettingWiFi/SettingWiFi/view/AddNetwork.cs b/SettingWiFi/SettingWiFi/view/AddNetwork.cs
index 4b7b0596e8b2986829bdf975b308e44c82085fc3..15844ca5102cc1daf063bc6f2e0ca3ce8ee1b424 100644 (file)
--- a/SettingWiFi/SettingWiFi/view/AddNetwork.cs
+++ b/SettingWiFi/SettingWiFi/view/AddNetwork.cs
@@ -1,10 +1,11 @@
-using SettingWiFi.res.locale;
+using System;
 using System.Collections.Generic;
 using Tizen.NUI;
 using Tizen.NUI.BaseComponents;
 using Tizen.NUI.Binding;
 using Tizen.NUI.Components;
 using static SettingWiFi.Logger;
+using SettingWiFi.res.locale;
 
 namespace SettingWiFi
 {
@@ -37,7 +38,6 @@ namespace SettingWiFi
         internal AddNetwork(WiFi wifi)
         {
             mWifi = wifi;
-            mPassword = "";
             mNetworkItem = new AddNetworkItem("None", "DHCP", "None");
         }
 
@@ -290,6 +290,8 @@ namespace SettingWiFi
 
         private void OnConnectClicked(object source, ClickedEventArgs args)
         {
+            Debug("OnConnectClicked");
+            Connect(mNetworkItem.NetworkName);
             NUIApplication.GetDefaultWindow().GetDefaultNavigator().Pop();
         }
 
@@ -317,13 +319,12 @@ namespace SettingWiFi
                 Debug("An AP found with ssid " + essid);
                 if (!mAp.IsConnected())
                 {
-                    ConnectToAP(mAp, mPassword);
+                    ConnectToAP(mAp);
                 }
                 else
                 {
-                    NUIApplication.GetDefaultWindow().GetDefaultNavigator().Pop();
+                    Debug("Already Connected");
                 }
-                return;
             }
             else
             {
@@ -332,13 +333,26 @@ namespace SettingWiFi
             }
         }
 
-        private async void ConnectToAP(AP ap, string password)
+        private async void ConnectToAP(AP ap)
         {
-            NUIApplication.GetDefaultWindow().GetDefaultNavigator().Pop();
-            await mWifi.Connect(ap, password);
-            if (mWifi.GetConnectedAP().Equals(ap.Essid))
+            Debug("ConnectToAP");
+            string password = "";
+            if (mNetworkItem.SecurityType != "None")
+            {
+                Debug("Security type" + mNetworkItem.SecurityType);
+                password = mNetworkItem.Password;
+            }
+            try
+            {
+                await mWifi.Connect(ap, password);
+                if (mWifi.GetConnectedAP().Equals(ap.Essid))
+                {
+                    ap.StateInfo = Resources.IDS_WIFI_SBODY_CONNECTED_M_STATUS;
+                }
+            }
+            catch(Exception e)
             {
-                ap.StateInfo = Resources.IDS_WIFI_SBODY_CONNECTED_M_STATUS;
+                Error("Exception: " + e.Message + " : " + e.StackTrace);
             }
         }
     }

diff --git a/packaging/org.tizen.cssetting-wifi-1.0.0.tpk b/packaging/org.tizen.cssetting-wifi-1.0.0.tpk
deleted file mode 100644 (file)
index ccc4a76..0000000
Binary files a/packaging/org.tizen.cssetting-wifi-1.0.0.tpk and /dev/null differ

diff --git a/packaging/org.tizen.cssetting-wifi-1.1.2.rpk b/packaging/org.tizen.cssetting-wifi-1.1.2.rpk
index 0f7d60ea77874c97463259b8a4c4b1f2fad2f25b..b5b816216d3f0487c1cd84e7e244fe4466da555a 100755 (executable)
Binary files a/packaging/org.tizen.cssetting-wifi-1.1.2.rpk and b/packaging/org.tizen.cssetting-wifi-1.1.2.rpk differ