From ca8d2d38d63be638d5cb68d5798eb00da9b8ad81 Mon Sep 17 00:00:00 2001
From: josesimoes <jose.simoes@eclo.solutions>
Date: Fri, 26 Jul 2024 17:14:20 +0100
Subject: [PATCH] Improvements in TLS samples

- Improve code for Wi-Fi client so it doesn't unnoticeably replace existing Wi-Fi config.
- Remove private properties from nfproj files.
---
 samples/SSL/SecureClient/SecureClient.nfproj        |  5 +----
 samples/SSL/SecureClient_WiFi/Program.cs            | 13 +++++++------
 .../SSL/SecureClient_WiFi/SecureClient_WiFi.nfproj  | 10 +---------
 3 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/samples/SSL/SecureClient/SecureClient.nfproj b/samples/SSL/SecureClient/SecureClient.nfproj
index f95f78c7..c8e348c2 100644
--- a/samples/SSL/SecureClient/SecureClient.nfproj
+++ b/samples/SSL/SecureClient/SecureClient.nfproj
@@ -43,18 +43,15 @@
     </Reference>
     <Reference Include="nanoFramework.Runtime.Events, Version=1.11.18.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
       <HintPath>..\packages\nanoFramework.Runtime.Events.1.11.18\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="nanoFramework.System.Text, Version=1.2.54.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
       <HintPath>..\packages\nanoFramework.System.Text.1.2.54\lib\nanoFramework.System.Text.dll</HintPath>
     </Reference>
     <Reference Include="System.IO.Streams, Version=1.1.59.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
       <HintPath>..\packages\nanoFramework.System.IO.Streams.1.1.59\lib\System.IO.Streams.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="System.Net, Version=1.10.79.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
       <HintPath>..\packages\nanoFramework.System.Net.1.10.79\lib\System.Net.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="System.Threading, Version=1.1.32.63105, Culture=neutral, PublicKeyToken=c07d481e9758c731">
       <HintPath>..\packages\nanoFramework.System.Threading.1.1.32\lib\System.Threading.dll</HintPath>
@@ -66,4 +63,4 @@
       <ProjectConfigurationsDeclaredAsItems />
     </ProjectCapabilities>
   </ProjectExtensions>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/samples/SSL/SecureClient_WiFi/Program.cs b/samples/SSL/SecureClient_WiFi/Program.cs
index 2e9b968e..c517cce3 100644
--- a/samples/SSL/SecureClient_WiFi/Program.cs
+++ b/samples/SSL/SecureClient_WiFi/Program.cs
@@ -22,11 +22,6 @@ namespace SecureClient
 {
     public class Program
     {
-#if HAS_WIFI
-        private static string MySsid = "ssid";
-        private static string MyPassword = "password";
-#endif
-
         public static void Main()
         {
             Debug.WriteLine("Waiting for network up and IP address...");
@@ -36,7 +31,13 @@ public static void Main()
             CancellationTokenSource cs = new(60000);
 
 #if HAS_WIFI
-            success = WifiNetworkHelper.ConnectDhcp(MySsid, MyPassword, requiresDateTime: true, token: cs.Token);
+
+            Debug.WriteLine("This expectes that there is already a previously configured WiFi connection.");
+            success = WifiNetworkHelper.Reconnect(requiresDateTime: true, token: cs.Token);
+
+            // If that's not the case, then uncomment the code snippet below to setup the WiFi connection
+            // Make sure to comment the line above
+            // success = WifiNetworkHelper.ConnectDhcp("<MY-SSIDS>", "<MY-WIFI-PASSWORD>", requiresDateTime: true, token: cs.Token);
 #else
             success = NetworkHelper.SetupAndConnectNetwork(requiresDateTime: true, token: cs.Token);
 #endif
diff --git a/samples/SSL/SecureClient_WiFi/SecureClient_WiFi.nfproj b/samples/SSL/SecureClient_WiFi/SecureClient_WiFi.nfproj
index e6585d8e..430ece80 100644
--- a/samples/SSL/SecureClient_WiFi/SecureClient_WiFi.nfproj
+++ b/samples/SSL/SecureClient_WiFi/SecureClient_WiFi.nfproj
@@ -41,35 +41,27 @@
   <ItemGroup>
     <Reference Include="mscorlib, Version=1.15.6.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
       <HintPath>..\packages\nanoFramework.CoreLibrary.1.15.5\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="nanoFramework.ResourceManager, Version=1.2.19.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
       <HintPath>..\packages\nanoFramework.ResourceManager.1.2.19\lib\nanoFramework.ResourceManager.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="nanoFramework.Runtime.Events, Version=1.11.18.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
       <HintPath>..\packages\nanoFramework.Runtime.Events.1.11.18\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="nanoFramework.System.Text, Version=1.2.54.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
       <HintPath>..\packages\nanoFramework.System.Text.1.2.54\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="System.Device.Wifi, Version=1.5.85.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
       <HintPath>..\packages\nanoFramework.System.Device.Wifi.1.5.85\lib\System.Device.Wifi.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="System.IO.Streams, Version=1.1.59.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
       <HintPath>..\packages\nanoFramework.System.IO.Streams.1.1.59\lib\System.IO.Streams.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="System.Net, Version=1.10.79.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
       <HintPath>..\packages\nanoFramework.System.Net.1.10.79\lib\System.Net.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="System.Threading, Version=1.1.32.63105, Culture=neutral, PublicKeyToken=c07d481e9758c731">
       <HintPath>..\packages\nanoFramework.System.Threading.1.1.32\lib\System.Threading.dll</HintPath>
-      <Private>True</Private>
     </Reference>
   </ItemGroup>
   <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
@@ -78,4 +70,4 @@
       <ProjectConfigurationsDeclaredAsItems />
     </ProjectCapabilities>
   </ProjectExtensions>
-</Project>
\ No newline at end of file
+</Project>