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 94fc6b8004e1f4bbd68a9d8a615579f7929bc747..8604473017ca6b4f0af18f738cc49b0be04245bb 100755 (executable)
--- a/SettingWiFi/SettingWiFi/model/AP.cs
+++ b/SettingWiFi/SettingWiFi/model/AP.cs
@@ -192,6 +192,15 @@ namespace SettingWiFi
             return false;\r
         }\r
 \r
+        public bool IsConnected()\r
+        {\r
+            if(state == WiFiState.Connected)\r
+            {\r
+                return true;\r
+            }\r
+            return false;\r
+        }\r
+\r
         public string ImageUrl\r
         {\r
             get\r

diff --git a/SettingWiFi/SettingWiFi/view/ConnectPage.cs b/SettingWiFi/SettingWiFi/view/ConnectPage.cs
index 98db6c8815b797a45f937b2f730daa476c82aa8b..c86a0c1855caa5c62e39f3d9998c9724c136f96f 100644 (file)
--- 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 36a158fb34aef3be43d9b4dfda43f3f5a757cda7..dcc22c9dc2145143c41535a665a5e71f86e58061 100644 (file)
--- 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 72717ff16bbf3e1efc526c243f9aa81fa9c53220..c649755b35fe3ff9e1884aa9d045689682095fe5 100644 (file)
--- 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 527798f30a711e90cd2d46f19f03e8dc1c484489..a9ba650764df7ae124decf3115999ccab4de626e 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