From f55c4a2b70df87e9ee497bf9b0882bac5c79d304 Mon Sep 17 00:00:00 2001
From: "Felix Hartmann (PEA3-Fe-FI)" <fhe4fe@bosch.com>
Date: Thu, 23 Sep 2021 14:50:35 +0200
Subject: [PATCH] delete chat only on explicit button press, not on disconnect,
 dialog opening fixed

---
 PolyChat/Controller.cs         | 12 ++++++----
 PolyChat/MainPage.xaml.cs      | 43 +++++++++++++++++-----------------
 PolyChat/Models/Connection.cs  |  8 +++----
 PolyChat/Models/FileManager.cs |  2 +-
 4 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/PolyChat/Controller.cs b/PolyChat/Controller.cs
index d372a12..30048c2 100644
--- a/PolyChat/Controller.cs
+++ b/PolyChat/Controller.cs
@@ -96,7 +96,6 @@ namespace PolyChat
                         Debug.WriteLine("---- Added new Connection ----");
                         Connections.Add(ForeignIp, new Connection(socket, Data => OnMessage(ForeignIp, Data), CloseChat));
                         UIController.OnIncomingConnection(ForeignIp);
-                        fileManager.loadChat(ForeignIp);
                     }
                 });
             });
@@ -139,7 +138,7 @@ namespace PolyChat
             else Debug.WriteLine("Undefined: " + data);
         }
 
-        public void CloseChat(string IP, bool wasConnected = true)
+        public void CloseChat(string IP, bool wasConnected = true, bool delete = false)
         {
             Debug.WriteLine($"Deleting connection with IP:{IP}");
             if (IP != null && Connections.ContainsKey(IP))
@@ -147,14 +146,17 @@ namespace PolyChat
                 Connections[IP].Close();
                 Connections.Remove(IP);
             }
-            CloseChatUI(IP, wasConnected);
+            if (delete || !wasConnected)
+                CloseChatUI(IP, wasConnected, delete);
+            if (delete)
+                fileManager.deleteChat(IP);
         }
 
-        private void CloseChatUI(string IP, bool wasConnected = true)
+        private void CloseChatUI(string IP, bool wasConnected = true, bool delete = false)
         {
             UIController.OnChatPartnerDeleted(IP);
             string heading = wasConnected ? "Connection Closed" : "Connection Failed";
-            if (!wasConnected)
+            if(!delete)
                 UIController.ShowConnectionError(IP, heading, $"Connecting to {IP} failed...");
         }
 
diff --git a/PolyChat/MainPage.xaml.cs b/PolyChat/MainPage.xaml.cs
index 77d97b7..fd20db6 100644
--- a/PolyChat/MainPage.xaml.cs
+++ b/PolyChat/MainPage.xaml.cs
@@ -50,26 +50,27 @@ namespace PolyChat
             await Dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
             {
                 Dialog dialog = new Dialog(
-                Dialog.TYPE_ERROR,
-                heading,
-                message,
-                new DialogButton(
-                    "Retry",
-                    () =>
-                    {
-                        Controller.Connect(param);
-                        Partners.Add(new ChatPartner(
-                            "Connecting...",
-                            param
-                        ));
-                        updateNoChatsPlaceholder();
-                    }
-                ),
-                new DialogButton(
-                    "Ignore",
-                    () => { /* do nothing */ }
-                )
-            );
+                    Dialog.TYPE_ERROR,
+                    heading,
+                    message,
+                    new DialogButton(
+                        "Retry",
+                        () =>
+                        {
+                            Controller.Connect(param);
+                            Partners.Add(new ChatPartner(
+                                "Connecting...",
+                                param
+                            ));
+                            updateNoChatsPlaceholder();
+                        }
+                    ),
+                    new DialogButton(
+                        "Ignore",
+                        () => { /* do nothing */ }
+                    )
+                );
+            SafelyOpenDialog(dialog);
             });
         }
 
@@ -188,7 +189,7 @@ namespace PolyChat
 
         private void OnDeleteChat(object sender = null, RoutedEventArgs e = null)
         {
-            Controller.CloseChat(selectedPartner.Code);
+            Controller.CloseChat(selectedPartner.Code,delete: true);
             Partners.Remove(selectedPartner);
             updateNoChatsPlaceholder();
             updateNoChatSelected();
diff --git a/PolyChat/Models/Connection.cs b/PolyChat/Models/Connection.cs
index 9c985b6..5d45440 100644
--- a/PolyChat/Models/Connection.cs
+++ b/PolyChat/Models/Connection.cs
@@ -15,9 +15,9 @@ namespace PolyChat.Models
         private SocketIOSocket Socket;
         private bool Connected = false;
         private readonly string IP;
-        private Action<string, bool> DeleteConnection;
+        private Action<string, bool, bool> DeleteConnection;
 
-        public Connection(string ip, ushort port, Action<JToken[]> onMessage, Action<string, bool> onClose)
+        public Connection(string ip, ushort port, Action<JToken[]> onMessage, Action<string, bool, bool> onClose)
         {
             Debug.WriteLine("! CONNECTING TO SERVER !");
             IP = ip;
@@ -32,7 +32,7 @@ namespace PolyChat.Models
             Client.On("message", (Action<JToken[]>) onMessage);
         }
         
-        public Connection(SocketIOSocket socket, Action<JToken[]> onMessage, Action<string, bool> onClose)
+        public Connection(SocketIOSocket socket, Action<JToken[]> onMessage, Action<string, bool, bool> onClose)
         {
             Socket = socket;
             DeleteConnection = onClose;
@@ -66,7 +66,7 @@ namespace PolyChat.Models
         {
             Debug.WriteLine("--- Disconnected! ---");
             Debug.WriteLine($"--- Deleting Connection with IP: {IP}---");
-            DeleteConnection(IP, IsConnected());
+            DeleteConnection(IP, IsConnected(),false);
             Connected = false;
         }
         private void OnError(JToken[] data)
diff --git a/PolyChat/Models/FileManager.cs b/PolyChat/Models/FileManager.cs
index 474aee2..9a8045e 100644
--- a/PolyChat/Models/FileManager.cs
+++ b/PolyChat/Models/FileManager.cs
@@ -36,7 +36,7 @@ namespace PolyChat.Models
                 {
                     foreach (String path in filepaths)
                     {
-                        if (Path.GetFileName(path).Equals(ip))
+                        if (Path.GetFileName(path).Equals(ip+".txt"))
                         {
                             File.Delete(path);
                             return;