Merge branch 'master' into HEAD

Proftaak Remote Healthcare/FietsClientV2/TCPConnection.cs

@@ -10,6 +10,8 @@ using System.Threading;
 using System.Windows.Forms;
 using System.Security.Cryptography.X509Certificates;
 using System.Security.Authentication;
+using System.Security.Permissions;
+using System.IO;
 
 namespace FietsClient
 {
@@ -114,21 +116,30 @@ namespace FietsClient
         {
             return true;
         }
-
+        
         public void disconnect()
         {
-            receiveThread.Abort();
             sslStream.Close();
             client.Close();
+            //receiveThread.Abort();
             isConnectedFlag = false;
         }
 
         public void receive()
         {
-            while (true)
+            while (client.Connected)
             {
                 byte[] bytesFrom = new byte[(int)client.ReceiveBufferSize];
-                sslStream.Read(bytesFrom, 0, client.ReceiveBufferSize);
+                try
+                {
+                    sslStream.Read(bytesFrom, 0, client.ReceiveBufferSize);
+                }
+                catch (IOException e)
+                {
+                    // debug
+                    Console.WriteLine(e.StackTrace); 
+                }
+                
                 string response = Encoding.ASCII.GetString(bytesFrom);
                 string[] response_parts = response.Split('|');
 

Proftaak Remote Healthcare/Server/AppGlobal.cs

@@ -1,6 +1,4 @@
 using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
 using System;
 using System.Linq;
 using Server.JSONObjecten;

Proftaak Remote Healthcare/Server/Program.cs

@@ -1,10 +1,6 @@
 using System;
-using System.Threading;
 using System.Net.Sockets;
-using System.Text;
-using System.IO;
 using System.Net;
-using Server;
 using System.Collections.Generic;
 
 namespace Server
@@ -39,7 +35,7 @@ namespace Server
             }
 
         }
-
+        // eigenlijk komt de server hier nooit maar toch...
         ~Program()
         {
             serverSocket.Stop();