From: Akash <akash1.kumar@samsung.com>
Date: Thu, 24 Nov 2022 13:04:10 +0000 (+0530)
Subject: Resolve HiddenConnect and Connect page issue
X-Git-Tag: accepted/tizen/unified/20221216.024031~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F38%2F284738%2F2;p=profile%2Fiot%2Fapps%2Fdotnet%2Fsetting-wifi.git

Resolve HiddenConnect and Connect page issue

This patch resolves following issues
- Placeholder issue on HiddenConnect page.
- APs which does not support WPS show the WPS button.
- Already connected AP shows the connect page.

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

diff --git a/SettingWiFi/SettingWiFi/model/AP.cs b/SettingWiFi/SettingWiFi/model/AP.cs
index 94fc6b8..8604473 100755
--- a/SettingWiFi/SettingWiFi/model/AP.cs
+++ b/SettingWiFi/SettingWiFi/model/AP.cs
@@ -192,6 +192,15 @@ namespace SettingWiFi
             return false;
         }
 
+        public bool IsConnected()
+        {
+            if(state == WiFiState.Connected)
+            {
+                return true;
+            }
+            return false;
+        }
+
         public string ImageUrl
         {
             get
diff --git a/SettingWiFi/SettingWiFi/view/ConnectPage.cs b/SettingWiFi/SettingWiFi/view/ConnectPage.cs
index 98db6c8..c86a0c1 100644
--- a/SettingWiFi/SettingWiFi/view/ConnectPage.cs
+++ b/SettingWiFi/SettingWiFi/view/ConnectPage.cs
@@ -87,7 +87,11 @@ namespace SettingWiFi
 
             passwordField = CreatePasswordField();
             connectView.Add(passwordField);
-            connectView.Add(CreateWpsItem());
+
+            if(mAp.IsWps)
+            {
+                connectView.Add(CreateWpsItem());
+            }
 
             var cancelButton = new Button()
             {
diff --git a/SettingWiFi/SettingWiFi/view/HiddenConnectPage.cs b/SettingWiFi/SettingWiFi/view/HiddenConnectPage.cs
index 36a158f..dcc22c9 100644
--- a/SettingWiFi/SettingWiFi/view/HiddenConnectPage.cs
+++ b/SettingWiFi/SettingWiFi/view/HiddenConnectPage.cs
@@ -33,7 +33,7 @@ namespace SettingWiFi
 
             var ssidField = new TextField()
             {
-                Text = Resources.IDS_ST_BODY_NETWORK_SSID,
+                PlaceholderText = Resources.IDS_ST_BODY_NETWORK_SSID,
                 WidthSpecification = 400,
             };
 
@@ -117,4 +117,4 @@ namespace SettingWiFi
             return page;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/SettingWiFi/SettingWiFi/view/MainPage.cs b/SettingWiFi/SettingWiFi/view/MainPage.cs
index 72717ff..c649755 100644
--- a/SettingWiFi/SettingWiFi/view/MainPage.cs
+++ b/SettingWiFi/SettingWiFi/view/MainPage.cs
@@ -390,14 +390,18 @@ namespace SettingWiFi
             DefaultLinearItem deviceItem = (DefaultLinearItem)sender;
             var device = deviceItem.BindingContext as AP;
             Info("OnAPClicked: " + device.Essid);
-            if (device.IsAPOpen())
-            {
-                ConnectOpenAP(device);
-            }
-            else
+
+            if (!device.IsConnected())
             {
-                mConnectPage = CreateConnectPage(device);
-                Navigator.Push(mConnectPage);
+                if (device.IsAPOpen())
+                {
+                    ConnectOpenAP(device);
+                }
+                else
+                {
+                    mConnectPage = CreateConnectPage(device);
+                    Navigator.Push(mConnectPage);
+                }
             }
         }
 
diff --git a/packaging/org.tizen.cssetting-wifi-1.0.0.tpk b/packaging/org.tizen.cssetting-wifi-1.0.0.tpk
index 527798f..a9ba650 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