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

Merge branch 'master' of https://sourcecode.socialcoding.bosch.com/scm/~hpl2fe/polychat

Browse Source
This commit is contained in:
Patrick Hellebrand
2021-09-21 13:29:33 +02:00
parent a9e1d93c7a ccf2d03502
commit 4780fc3b03
9 changed files with 143 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
PolyChat/MainPage.xaml.cs
View File

@@ -59,10 +59,7 @@ namespace PolyChat
public void OnSendMessage(object sender = null, RoutedEventArgs e = null)
{
selectedPartner.AddMessage(new ChatMessage(
inputSend.Text,
false
));
selectedPartner.AddMessage(new Message(inputSend.Text,false));
networkingController.sendMessage(selectedPartner.Code, inputSend.Text);
// clear input
inputSend.Text = "";
@@ -97,11 +94,11 @@ namespace PolyChat
updateNoUsernamePlaceholder();
}
public void OnIncomingMessage(ChatMessage message)
public void OnIncomingMessage(Message message)
{
ChatPartner sendingPartner = Partners.First(p => p.Code == message.Ip);
sendingPartner.AddMessage(new ChatMessage(
message.Content,
sendingPartner.AddMessage(new Message(
message.Msg,
true,
message.Sender
));