Commit Graph

81 Commits

Author SHA1 Message Date
Felix Hartmann (PEA3-Fe-FI)
c00e4c6a01 merge master 2021-09-24 09:07:54 +02:00
Felix Hartmann (PEA3-Fe-FI)
125c908ef8 remove test code, add logo svg, add screenshots 2021-09-24 09:05:07 +02:00
SCM6WE
1daaa52c36 Cleanup / Comments 2021-09-24 09:04:57 +02:00
Patrick Hellebrand
ba4d0b619e ChatMessages on THEEEEEEEEEEEEEEE RIGHT 2021-09-24 09:03:50 +02:00
Felix Hartmann (PEA3-Fe-FI)
31ffe86f04 remove unused variables 2021-09-24 09:03:48 +02:00
Felix Hartmann (PEA3-Fe-FI)
f55c4a2b70 delete chat only on explicit button press, not on disconnect, dialog opening fixed 2021-09-24 09:03:38 +02:00
SCM6WE
5ce1316245 load chatlogs on newly created chat 2021-09-24 08:59:03 +02:00
SCM6WE
c3daaf8b00 Added method to delete userspeciffic logs. 2021-09-24 08:59:00 +02:00
SCM6WE
9141efd55a Propper file manager with encryption of files 2021-09-24 08:58:58 +02:00
Patrick Hellebrand
59d4827965 removed test code for username reactivitiy 2021-09-24 08:58:55 +02:00
SCM6WE
a8a07f44c3 brgin of encryption 2021-09-24 08:58:51 +02:00
SCM6WE
3cf0197672 stuff 2021-09-24 08:58:37 +02:00
Patrick Hellebrand
43d8b2919c Username change now dirty reactive in ui 2021-09-24 08:57:51 +02:00
Patrick Hellebrand
c00a7ff379 Chats now only try to connect, if they are opened 2021-09-24 08:57:47 +02:00
SCM6WE
b12d3f3f4f quick 2021-09-24 08:57:40 +02:00
SCM6WE
e27141e013 fix connection establishment when loading files 2021-09-24 08:56:56 +02:00
Patrick Hellebrand
a953d34122 Removed timeStamp from SendMessage, added param Timestamp to savechat() 2021-09-24 08:54:59 +02:00
SCM6WE
eeea238398 Saving and loading but still has error(Pls fix) 2021-09-24 08:54:50 +02:00
Patrick Hellebrand
7e5883d761 Added BoardcastMessage, Username Changed event via Broadcast, remove json parsing from ChatMessage 2021-09-24 08:54:09 +02:00
Felix Hartmann (PEA3-Fe-FI)
fb098db63d fix ip in intial packet (send own ip, not foreign) 2021-09-24 08:54:07 +02:00
Felix Hartmann (PEA3-Fe-FI)
1b3d133657 allow deletion of chats which are not started by me 2021-09-24 08:54:05 +02:00
Felix Hartmann (PEA3-Fe-FI)
e1ea49bf71 stop connection if we are already connected 2021-09-24 08:53:57 +02:00
Patrick Hellebrand
92bc795aff Added OnIncomingMessages (for loading messages from json array) 2021-09-24 08:52:09 +02:00
Patrick Hellebrand
ea81547540 ConnectionFailedDialog -> Dialog for Success and Error Messages with heading, message and buttons/actions 2021-09-24 08:52:05 +02:00
Felix Hartmann (PEA3-Fe-FI)
e2de9f5917 add retry logic on disconnect, silently delete chat if disconnected after connect was succesfull 2021-09-24 08:52:03 +02:00
Patrick Hellebrand
6f2c442e94 small fix for correct ip display 2021-09-24 08:52:01 +02:00
Patrick Hellebrand
b42a2f9728 Fixed json formatting in SendMessage 2021-09-24 08:51:49 +02:00
Patrick Hellebrand
05e3e9e0c4 Added our default ip address, added ip as param to onMessage 2021-09-24 08:51:14 +02:00
Felix Hartmann (PEA3-Fe-FI)
e6e5bee4ef add outgoing connections to dict 2021-09-24 08:51:13 +02:00
Patrick Hellebrand
0f305a216e SendMessage is now Json 2021-09-24 08:51:02 +02:00
Felix Hartmann (PEA3-Fe-FI)
7135486810 add initial packet, close socket on disconnect, move server start to Controller.cs 2021-09-24 08:50:01 +02:00
Felix Hartmann (PEA3-Fe-FI)
0ef2158859 remove test code, add logo svg, add screenshots 2021-09-24 08:39:48 +02:00
Patrick Hellebrand
badbaf0b40 Merge branch 'ConnectionController' of https://sourcecode.socialcoding.bosch.com/scm/~hpl2fe/polychat into ConnectionController 2021-09-23 16:24:51 +02:00
Patrick Hellebrand
072e12d427 ChatMessages on THEEEEEEEEEEEEEEE RIGHT 2021-09-23 16:24:41 +02:00
SCM6WE
323f4d5b5b Merge branch 'ConnectionController' of https://sourcecode.socialcoding.bosch.com/scm/~hpl2fe/polychat into ConnectionController
# Conflicts:
#	PolyChat/Controller.cs
2021-09-23 16:07:33 +02:00
SCM6WE
88e5d3a329 Cleanup / Comments 2021-09-23 16:03:12 +02:00
Felix Hartmann (PEA3-Fe-FI)
a5dd048f07 remove unused variables 2021-09-23 15:46:13 +02:00
Felix Hartmann (PEA3-Fe-FI)
4e60fd2bdb delete chat only on explicit button press, not on disconnect, dialog opening fixed 2021-09-23 14:50:54 +02:00
SCM6WE
154f79667c load chatlogs on newly created chat 2021-09-23 14:32:22 +02:00
SCM6WE
2ec9ffb30f Added method to delete userspeciffic logs. 2021-09-23 14:26:35 +02:00
SCM6WE
ebabd8036d Propper file manager with encryption of files 2021-09-23 14:07:07 +02:00
Patrick Hellebrand
e5cbd58829 removed test code for username reactivitiy 2021-09-23 14:04:39 +02:00
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
924676bee6 Chats now only try to connect, if they are opened 2021-09-23 12:53:57 +02:00