felixh/polychat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity
56 Commits 1 Branch 0 Tags
61e0d5699ed85285fc49b8e420c236ec247f50bc
Commit Graph

56 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Patrick Hellebrand
61e0d5699e merge reactive username with encode 2021-09-23 14:03:29 +02:00
Patrick Hellebrand
3cce36ee21 Username change now dirty reactive in ui 2021-09-23 14:02:42 +02:00
SCM6WE
94fe39a159 Merge branch 'ConnectionController' of https://sourcecode.socialcoding.bosch.com/scm/~hpl2fe/polychat into ConnectionController 2021-09-23 13:33:58 +02:00
SCM6WE
665d289d3a brgin of encryption 2021-09-23 13:33:03 +02:00
Felix Hartmann (PEA3-Fe-FI)
f07793bb93 only open dialog if there are no popups already open 2021-09-23 13:30:41 +02:00
SCM6WE
866fa2600b Merge branch 'ConnectionController' of https://sourcecode.socialcoding.bosch.com/scm/~hpl2fe/polychat into ConnectionController 2021-09-23 12:57:00 +02:00
SCM6WE
be4eada18a stuff 2021-09-23 12:55:31 +02:00
Patrick Hellebrand
e313f7bde7 Merge branch 'ConnectionController' of https://sourcecode.socialcoding.bosch.com/scm/~hpl2fe/polychat into ConnectionController 2021-09-23 12:54:06 +02:00
Patrick Hellebrand
924676bee6 Chats now only try to connect, if they are opened 2021-09-23 12:53:57 +02:00
Felix Hartmann (PEA3-Fe-FI)
512648d907 tested build and deploy via apppackage, fixed typo in IP.cs 2021-09-23 12:41:15 +02:00
Patrick Hellebrand
3a90f26262 Merge branch 'ConnectionController' of https://sourcecode.socialcoding.bosch.com/scm/~hpl2fe/polychat into ConnectionController 2021-09-23 11:30:15 +02:00
Patrick Hellebrand
8121a8dbfd Removed timeStamp from SendMessage, added param Timestamp to savechat() 2021-09-23 11:30:09 +02:00
SCM6WE
59630cc137 quick 2021-09-23 11:29:54 +02:00
SCM6WE
51ada88313 merge 2021-09-23 11:09:58 +02:00
SCM6WE
766a8171f0 fix connection establishment when loading files 2021-09-23 11:09:43 +02:00
Patrick Hellebrand
54266e52ec Merge branch 'ConnectionController' of https://sourcecode.socialcoding.bosch.com/scm/~hpl2fe/polychat into ConnectionController 2021-09-23 10:56:21 +02:00
Patrick Hellebrand
871ed22956 Added BoardcastMessage, Username Changed event via Broadcast, remove json parsing from ChatMessage 2021-09-23 10:56:10 +02:00
SCM6WE
89059491c9 Saving and loading but still has error(Pls fix) 2021-09-23 10:50:40 +02:00
Patrick Hellebrand
f2b0af08c5 Merged controller Dialog Heading 2021-09-23 10:22:49 +02:00
Patrick Hellebrand
69d5327c75 Added OnIncomingMessages (for loading messages from json array) 2021-09-23 10:21:55 +02:00
Felix Hartmann (PEA3-Fe-FI)
c22987d86f fix ip in intial packet (send own ip, not foreign) 2021-09-23 09:52:54 +02:00
Felix Hartmann (PEA3-Fe-FI)
cd26ac11c3 allow deletion of chats which are not started by me 2021-09-23 09:41:56 +02:00
Felix Hartmann (PEA3-Fe-FI)
92939c8230 stop connection if we are already connected 2021-09-23 09:14:23 +02:00
Patrick Hellebrand
43b78014ca Merge branch 'ConnectionController' of https://sourcecode.socialcoding.bosch.com/scm/~hpl2fe/polychat into ConnectionController 2021-09-23 08:59:33 +02:00
Patrick Hellebrand
44ef2f4cd2 ConnectionFailedDialog -> Dialog for Success and Error Messages with heading, message and buttons/actions 2021-09-23 08:59:22 +02:00
Felix Hartmann (PEA3-Fe-FI)
52422072a6 retry working, radiobuttons now triggering on every click, deleteChat Button working 2021-09-23 08:41:37 +02:00
Patrick Hellebrand
2b6d871a30 Merge branch 'ConnectionController' of https://sourcecode.socialcoding.bosch.com/scm/~hpl2fe/polychat into ConnectionController 2021-09-22 16:21:53 +02:00
Patrick Hellebrand
8dab2af627 small fix for correct ip display 2021-09-22 16:21:40 +02:00
Felix Hartmann (PEA3-Fe-FI)
99dad406ea add retry logic on disconnect, silently delete chat if disconnected after connect was succesfull 2021-09-22 15:52:15 +02:00
Patrick Hellebrand
957644b841 Fixed json formatting in SendMessage 2021-09-22 15:50:19 +02:00
Patrick Hellebrand
ee7af3c984 Added our default ip address, added ip as param to onMessage 2021-09-22 15:14:25 +02:00
Patrick Hellebrand
6ea5050b43 Merge branch 'ConnectionController' of https://sourcecode.socialcoding.bosch.com/scm/~hpl2fe/polychat into ConnectionController 2021-09-22 14:57:47 +02:00
Patrick Hellebrand
3b2b75df53 SendMessage is now Json 2021-09-22 14:57:36 +02:00
Felix Hartmann (PEA3-Fe-FI)
cadb1e5eca add outgoing connections to dict 2021-09-22 14:28:43 +02:00
Patrick Hellebrand
d25063bd87 Merged 2021-09-22 14:10:50 +02:00
Patrick Hellebrand
0c5579198f Removed Old Models, extended ChatMessage to json 2021-09-22 14:09:26 +02:00
Felix Hartmann (PEA3-Fe-FI)
3b2789ce54 add initial packet, close socket on disconnect, move server start to Controller.cs 2021-09-22 13:58:55 +02:00
Patrick Hellebrand
f2202e6aa7 Added json support with type+content to ChatMessage 2021-09-22 13:50:36 +02:00
Patrick Hellebrand
01a48c336d New Connection Class replacing Client, Controller Class replaceing networkController, no json support yet 2021-09-22 12:58:05 +02:00
Patrick Hellebrand
46cc5b1d10 Added Project Icons 2021-09-21 15:51:34 +02:00
SCM6WE
86de29bcce del Controller and ClientHandler / msg send to ui 2021-09-21 14:36:16 +02:00
SCM6WE
b2c779f546 quickfix to test netorking 2021-09-21 14:01:36 +02:00
Patrick Hellebrand
4780fc3b03 Merge branch 'master' of https://sourcecode.socialcoding.bosch.com/scm/~hpl2fe/polychat 2021-09-21 13:29:33 +02:00
Patrick Hellebrand
a9e1d93c7a Added ConnectionFailedMessage, Placeholder for Username,Chat,ChatsList 2021-09-21 13:29:21 +02:00
Felix Hartmann (PEA3-Fe-FI)
ccf2d03502 directly allow sending, when we are the server 2021-09-21 12:37:39 +02:00
Felix Hartmann (PEA3-Fe-FI)
a2c35a7536 remove Socket.cs, integrate Socket.cs into Networkcontroller.cs 2021-09-21 12:32:35 +02:00
Patrick Hellebrand
4948d32a58 Changes ChatMessage.msg to Content, Fixed Xaml, removes stringTimeStamp 2021-09-21 11:17:52 +02:00
Patrick Hellebrand
125aa1b243 Merged with UI Changes and NetworkController 2021-09-21 11:04:56 +02:00
Patrick Hellebrand
d1a7963670 Edit Username, New Chat Dialog 2021-09-21 11:01:06 +02:00
SCM6WE
8097b9f2cf exception when message cannot be send 2021-09-21 10:56:54 +02:00