From 08325b1c65979df996ead88c259003e6f2ef3399 Mon Sep 17 00:00:00 2001
From: SCM6WE <Marc-Felix.Schmitz@de.bosch.com>
Date: Wed, 22 Sep 2021 12:57:46 +0200
Subject: [PATCH] Network debugging

---
 PolyChat/Models/Client.cs               | 16 +++++++--
 PolyChat/Models/Message.cs              | 11 +++++--
 PolyChat/Models/NetworkingController.cs |  9 +++---
 PolyChat/Package.appxmanifest           | 43 ++++++++++++++++++++++++-
 4 files changed, 70 insertions(+), 9 deletions(-)

diff --git a/PolyChat/Models/Client.cs b/PolyChat/Models/Client.cs
index daf0256..fa79810 100644
--- a/PolyChat/Models/Client.cs
+++ b/PolyChat/Models/Client.cs
@@ -23,8 +23,15 @@ namespace PolyChat.Models
             InitEventHandlers(this, connection, uiController);
         }
 
+        /// <summary>
+        /// Called when socket accepts client
+        /// </summary>
+        /// <param name="connection"></param>
+        /// <param name="ip"></param>
+        /// <param name="uiController"></param>
         public Client(SocketIOSocket connection, String ip, MainPage uiController)
         {
+            Debug.WriteLine("New Client Saved!!!!(Clinent[34])");
             this.ipSelf = ip;
             this.connection_server = connection;
             InitEventHandlers(this, connection, uiController);
@@ -87,7 +94,9 @@ namespace PolyChat.Models
         {
             connection.On(SendCode.Message.ToString(), (Data) =>
             {
-                Message msg = new Message(Data[0]);
+                //Message msg = new Message(Data[0]);
+                Debug.WriteLine("Normal Message Recieved!!!!");
+                Message msg = JsonNet.Deserialize<Message>(Data[0].ToString());
                 uiController.OnIncomingMessage(msg);
 
                 //TODO: send message to GUI
@@ -101,6 +110,7 @@ namespace PolyChat.Models
 
             connection.On(SocketIOEvent.CONNECTION, () =>
             {
+
                 client.connected = true;
             });
         }
@@ -114,7 +124,9 @@ namespace PolyChat.Models
         {
             connection.On(SendCode.Message.ToString(), (Data) =>
             {
-                Message msg = new Message(Data[0]);
+                Debug.WriteLine("Normal Message Recieved!!!!");
+                Message msg = JsonNet.Deserialize<Message>(Data[0].ToString());
+                //Message msg = new Message(Data[0]);
                 uiController.OnIncomingMessage(msg);
                 //TODO: send message to GUI
             });
diff --git a/PolyChat/Models/Message.cs b/PolyChat/Models/Message.cs
index 6e01ea2..3ae2057 100644
--- a/PolyChat/Models/Message.cs
+++ b/PolyChat/Models/Message.cs
@@ -1,4 +1,5 @@
-using Newtonsoft.Json.Linq;
+using Json.Net;
+using Newtonsoft.Json.Linq;
 using System;
 
 namespace PolyChat.Models
@@ -35,7 +36,8 @@ namespace PolyChat.Models
         /// <param name="data"></param>
         public Message(JToken data)
         {
-            Message m = (Message) data[0].ToObject<Message>();
+            
+            Message m = (Message) data.ToObject<Message>();
             Sender = m.Sender;
             Timestamp = m.Timestamp;
             StringTimeStamp = Timestamp.ToString();
@@ -43,6 +45,11 @@ namespace PolyChat.Models
             Ip = m.Ip;
             Foreign = m.Foreign;
         }
+
+        public Message()
+        {
+
+        }
         
 
         override
diff --git a/PolyChat/Models/NetworkingController.cs b/PolyChat/Models/NetworkingController.cs
index d938d50..946dfd4 100644
--- a/PolyChat/Models/NetworkingController.cs
+++ b/PolyChat/Models/NetworkingController.cs
@@ -11,6 +11,7 @@ using SocketIOSharp.Server;
 using SocketIOSharp.Server.Client;
 using Newtonsoft.Json.Linq;
 using System.Threading;
+using Json.Net;
 
 namespace PolyChat.Models
 {
@@ -53,9 +54,9 @@ namespace PolyChat.Models
         {
             socket.On(SendCode.Initial.ToString(), (JToken[] Data) =>
             {
-                Debug.WriteLine("Client connected!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
-                Message m = new Message(Data[0]);
-                clients.Add(new Client(socket,m.Ip, uiController));
+                Debug.WriteLine("Client connected and Initial Message Recieved!!!!!!!!!!!!!!!!!");
+                Message msg = JsonNet.Deserialize<Message>(Data[0].ToString());
+                clients.Add(new Client(socket,msg.Ip, uiController));
             });
         }
 
@@ -66,7 +67,7 @@ namespace PolyChat.Models
         /// <param name="msg"> to send </param>
         public void sendMessage(String ip, String msg) 
         {
-            this.getClient(ip).sendMessage(SendCode.Initial, msg);
+            this.getClient(ip).sendMessage(SendCode.Message, msg);
         }
 
         /// <summary>
diff --git a/PolyChat/Package.appxmanifest b/PolyChat/Package.appxmanifest
index d4a461b..3d5e5b6 100644
--- a/PolyChat/Package.appxmanifest
+++ b/PolyChat/Package.appxmanifest
@@ -4,7 +4,12 @@
   xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
   xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
   xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
-  IgnorableNamespaces="uap mp">
+  xmlns:uap3="http://schemas.microsoft.com/appx/manifest/uap/windows10/3"
+  xmlns:uap6="http://schemas.microsoft.com/appx/manifest/uap/windows10/6"
+  xmlns:iot="http://schemas.microsoft.com/appx/manifest/iot/windows10"
+  xmlns:uap4="http://schemas.microsoft.com/appx/manifest/uap/windows10/4"
+  xmlns:uap2="http://schemas.microsoft.com/appx/manifest/uap/windows10/2"
+  IgnorableNamespaces="uap mp uap3 uap6 iot uap4 uap2">
 
   <Identity
     Name="ee2ef4f2-e61b-497a-8f0e-9fa7c90234b1"
@@ -45,5 +50,41 @@
 
   <Capabilities>
     <Capability Name="internetClient" />
+    <Capability Name="internetClientServer"/>
+    <Capability Name="allJoyn"/>
+    <uap:Capability Name="appointments"/>
+    <uap3:Capability Name="backgroundMediaPlayback"/>
+    <uap:Capability Name="blockedChatMessages"/>
+    <uap:Capability Name="chat"/>
+    <Capability Name="codeGeneration"/>
+    <uap:Capability Name="contacts"/>
+    <uap:Capability Name="enterpriseAuthentication"/>
+    <uap6:Capability Name="graphicsCapture"/>
+    <iot:Capability Name="lowLevelDevices"/>
+    <uap:Capability Name="musicLibrary"/>
+    <uap:Capability Name="objects3D"/>
+    <uap4:Capability Name="offlineMapsManagement"/>
+    <uap:Capability Name="phoneCall"/>
+    <uap2:Capability Name="phoneCallHistoryPublic"/>
+    <uap:Capability Name="picturesLibrary"/>
+    <Capability Name="privateNetworkClientServer"/>
+    <uap3:Capability Name="remoteSystem"/>
+    <uap:Capability Name="removableStorage"/>
+    <uap:Capability Name="sharedUserCertificates"/>
+    <uap2:Capability Name="spatialPerception"/>
+    <iot:Capability Name="systemManagement"/>
+    <uap:Capability Name="userAccountInformation"/>
+    <uap3:Capability Name="userNotificationListener"/>
+    <uap:Capability Name="videosLibrary"/>
+    <uap:Capability Name="voipCall"/>
+    <uap4:Capability Name="userDataTasks"/>
+    <DeviceCapability Name="bluetooth"/>
+    <DeviceCapability Name="gazeInput"/>
+    <DeviceCapability Name="lowLevel"/>
+    <DeviceCapability Name="microphone"/>
+    <DeviceCapability Name="location"/>
+    <DeviceCapability Name="pointOfService"/>
+    <DeviceCapability Name="proximity"/>
+    <DeviceCapability Name="webcam"/>
   </Capabilities>
 </Package>
\ No newline at end of file