felixh/polychat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

delete chat only on explicit button press, not on disconnect, dialog opening fixed

Browse Source
This commit is contained in:
Felix Hartmann (PEA3-Fe-FI)
2021-09-23 14:50:35 +02:00
parent 7a273f7fdc
commit 4e60fd2bdb
5 changed files with 35 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
PolyChat/Controller.cs
View File

@@ -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,18 @@ 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";
UIController.ShowConnectionError(IP, heading, $"Connecting to {IP} failed...");
if(!delete)
UIController.ShowConnectionError(IP, heading, $"Connecting to {IP} failed...");
}
private bool isInConnections(string IP)