stuff

PolyChat/Controller.cs

@@ -36,8 +36,6 @@ namespace PolyChat
         {
             UIController = uiController;
             OwnIP = getIP();
-            //loadChats();
-            //SaveChats("10", "{das ist ein test}");
             Serve();
 
             // test
@@ -78,6 +76,7 @@ namespace PolyChat
                 {
                     Debug.WriteLine("--- initial packet received ---");
                     string ForeignIp = data[0].ToString();
+
                     Debug.WriteLine($"--- this ip was in the inital packet: {ForeignIp} ---");
                     if (isInConnections(ForeignIp))
                     {
@@ -178,6 +177,7 @@ namespace PolyChat
         /// <param name="ip"></param>
         public void loadChats()
         {
+            //TODO: also load chatlogs when user tries to connect
             //load dir and create if non existant
             if (Directory.Exists("U:\\PolyChat\\Saves"))
             {
@@ -206,9 +206,43 @@ namespace PolyChat
                     UIController.OnIncomingMessages(ip, jsonArr);
                 }
             }
-
         }
 
+        /*
+        public void loadChat(String ip)
+        {
+            //TODO: also load chatlogs when user tries to connect
+            //load dir and create if non existant
+            if (Directory.Exists("U:\\PolyChat\\Saves"))
+            {
+                Debug.WriteLine("--Path exists.--");
+            }
+            else
+            {
+                Directory.CreateDirectory("U:\\PolyChat\\Saves");
+                Debug.WriteLine("--Path Created--.");
+            }
+
+            //go through all files and send ip and json array to ui
+            String[] filepaths = Directory.GetFiles("U:\\PolyChat\\Saves");
+            if (filepaths.Length > 0)
+            {
+                Debug.WriteLine("---Loading Saves");
+                foreach (String path in filepaths)
+                {
+                    Debug.WriteLine($"--{path}");
+                    String jsonArr = File.ReadAllText(path);
+                    String ip = Path.GetFileName(path);
+                    ip = ip.Substring(0, ip.Length - 4);
+                    Debug.WriteLine($"-{ip}");
+                    Debug.WriteLine(jsonArr);
+                    Connect(ip);
+                    UIController.OnIncomingConnection(ip);
+                    UIController.OnIncomingMessages(ip, jsonArr);
+                }
+            }
+        }
+        */
         /// <summary>
         /// Saves incoming chat message to 
         /// </summary>
@@ -221,6 +255,14 @@ namespace PolyChat
             //writing flag setzen oder auch in der datei selbst ne flag setzen
             new Thread(() =>
             {
+                //breaking if namechange
+                JObject obj = JObject.Parse(json);
+                if (!obj["type"].ToString().Equals("username"))
+                {
+                    //adding timestamp
+                    obj = JObject.Parse(json);
+                    obj.Add(new JProperty("timestamp", timeStamp));
+                    json = obj.ToString();
                     if (File.Exists($"U:\\PolyChat\\Saves\\{ip}.txt"))
                     {
                         Debug.WriteLine("--File allready exists--");
@@ -231,7 +273,6 @@ namespace PolyChat
                         {
                             Debug.WriteLine("--adding new chatmessage--");
                             //structure intact
-                        JObject obj = JObject.Parse(json);
                             //save new chat
                             String saved = output.Substring(0, output.Length - 1);
                             output = saved + ", " + json + " ]";
@@ -254,6 +295,7 @@ namespace PolyChat
                         //setup file
                         File.WriteAllText($"U:\\PolyChat\\Saves\\{ip}.txt", $"[ {json} ]");
                     }
+                }
             }).Start();
         }
 
@@ -266,8 +308,6 @@ namespace PolyChat
                 rng.GetBytes(entropy);
             }
 
-            /*byte[] ciphertext = ProtectedData.Protect(plaintext, entropy,
-                DataProtectionScope.CurrentUser);*/
         }
     }
 }

PolyChat/MainPage.xaml.cs

@@ -171,7 +171,11 @@ namespace PolyChat
                             origin,
                             item["type"].ToString(),
                             item["content"].ToString()//,
+<<<<<<< HEAD
                                                       //DateTime.Parse(item["timestamp"].ToString())
+=======
+                            //DateTime.Parse(item["timestamp"].ToString())
+>>>>>>> be4eada (stuff)
                         )
                     );
                 }

PolyChat/Models/ChatMessage.cs

@@ -12,11 +12,6 @@ namespace PolyChat.Models
         public DateTime TimeStamp;
         public readonly bool Foreign;
 
-
-        public ChatMessage()
-        {
-
-        }
         /// <summary>
         /// Create own Message (directly sent)
         /// </summary>