66de88029f 
					 
					
						
						
							
							Merge branch 'develop' into f/reject_handshake  
						
						 
						
						
						
						
					 
					
						2020-02-12 06:49:17 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						c5389a6af4 
					 
					
						
						
							
							Merge branch 'develop' into f/invalid_login  
						
						 
						
						
						
						
					 
					
						2020-02-12 06:41:02 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						ba098d3545 
					 
					
						
						
							
							Removed unnecessary instance variable from HandshakeRejectionEvent  
						
						 
						
						
						
						
					 
					
						2020-02-12 06:26:33 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						838edbf9a4 
					 
					
						
						
							
							Merge branch 'develop' into f/advanced_login  
						
						 
						
						
						
						
					 
					
						2020-02-12 06:24:17 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						a01c34d999 
					 
					
						
						
							
							Merge pull request  #108  from informatik-ag-ngl/f/contacts  
						
						 
						
						... 
						
						
						
						Contacts handling 
						
						
					 
					
						2020-02-12 06:14:11 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						84e350c02e 
					 
					
						
						
							
							Removed event handler casts, simplified logging statements  
						
						 
						
						
						
						
					 
					
						2020-02-12 06:12:04 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						810df972cc 
					 
					
						
						
							
							Clean-up, improved generic type usage in EventBus  
						
						 
						
						... 
						
						
						
						Fixes  #13  
						
						
					 
					
						2020-02-12 05:58:40 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						48e1d791c6 
					 
					
						
						
							
							Cleanup, fixed offline cache relay when starting in offline mode  
						
						 
						
						
						
						
					 
					
						2020-02-11 19:35:23 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								DieGurke 
							
						 
					 
					
						
						
							
						
						275ae328d9 
					 
					
						
						
							
							Merge pull request  #26  from informatik-ag-ngl/f/contacts  
						
						 
						
						... 
						
						
						
						Contacts handling on the server 
						
						
					 
					
						2020-02-11 18:25:45 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						e2ed5706a7 
					 
					
						
						
							
							Removed unnecessary TODO  
						
						 
						
						
						
						
					 
					
						2020-02-11 18:15:19 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								DieGurke 
							
						 
					 
					
						
						
							
						
						577ee6364d 
					 
					
						
						
							
							Implemented contact list update  
						
						 
						
						
						
						
					 
					
						2020-02-11 18:15:15 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						8cab095fc0 
					 
					
						
						
							
							Implemented online contact notification about contact list modification  
						
						 
						
						
						
						
					 
					
						2020-02-11 17:44:58 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						e2e9253413 
					 
					
						
						
							
							Adjusted to event system refactoring  
						
						 
						
						
						
						
					 
					
						2020-02-11 17:17:45 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						8a6f729abf 
					 
					
						
						
							
							Adjusted to event system refactoring  
						
						 
						
						
						
						
					 
					
						2020-02-11 17:17:22 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						a4b96258e0 
					 
					
						
						
							
							Merge pull request  #12  from informatik-ag-ngl/f/contact_search_result  
						
						 
						
						... 
						
						
						
						Made Event<T> an abstract class, added ContactSearchResult 
						
						
					 
					
						2020-02-11 16:59:47 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						189432e798 
					 
					
						
						
							
							Made Event<T> an abstract class, added ContactSearchResult  
						
						 
						
						
						
						
					 
					
						2020-02-11 16:53:41 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						39d4cbd8ba 
					 
					
						
						
							
							Merge branch 'develop' into f/contacts  
						
						 
						
						
						
						
					 
					
						2020-02-11 10:06:06 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								DieGurke 
							
						 
					 
					
						
						
							
						
						73ba6b0456 
					 
					
						
						
							
							Small improvements  
						
						 
						
						... 
						
						
						
						* Resettings the searchField after adding a contact and clearing the
contactsModel after adding a contact.
* Revised LoginDialoge UI 
						
						
					 
					
						2020-02-10 23:21:06 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						c90bbbc262 
					 
					
						
						
							
							Refactored to the new contact related classes in envoy-common  
						
						 
						
						
						
						
					 
					
						2020-02-10 22:31:40 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						c5017e71fc 
					 
					
						
						
							
							Refactored contact search, added Javadoc  
						
						 
						
						
						
						
					 
					
						2020-02-10 22:29:34 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								DieGurke 
							
						 
					 
					
						
						
							
						
						15b5289267 
					 
					
						
						
							
							Merge pull request  #10  from informatik-ag-ngl/f/contacts  
						
						 
						
						... 
						
						
						
						Contact-handling related Events 
						
						
					 
					
						2020-02-10 21:46:27 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						4edfc78139 
					 
					
						
						
							
							Small refactoring  
						
						 
						
						
						
						
					 
					
						2020-02-10 21:44:20 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								DieGurke 
							
						 
					 
					
						
						
							
						
						a96199ccd7 
					 
					
						
						
							
							Implemented contact adding mechanism + database update on both clients.  
						
						 
						
						... 
						
						
						
						* Added filtering on searchRequest response (temporary: has to be done
in query not manually in ContactsRequestProcessor.) 
						
						
					 
					
						2020-02-10 20:02:05 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								DieGurke 
							
						 
					 
					
						
						
							
						
						128d5bec4a 
					 
					
						
						
							
							Updated client  
						
						 
						
						... 
						
						
						
						* Updated ContactsRequest constructor to work with new versin of this
event.
*Implemented LocalDB updates when adding a contact and display it
immediately, so you can chat directly. 
						
						
					 
					
						2020-02-10 19:51:50 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								DieGurke 
							
						 
					 
					
						
						
							
						
						06b8594f42 
					 
					
						
						
							
							Adjusted ContactsRequest  
						
						 
						
						
						
						
					 
					
						2020-02-09 23:58:09 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								DieGurke 
							
						 
					 
					
						
						
							
						
						37f1594989 
					 
					
						
						
							
							Implemented AddContact mechanism on the server  
						
						 
						
						... 
						
						
						
						(currently unfinished an not working see stack trace for current
problem) 
						
						
					 
					
						2020-02-09 22:16:33 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								DieGurke 
							
						 
					 
					
						
						
							
						
						48a64b08f9 
					 
					
						
						
							
							Commented out the localDb client update stuff (temporary)  
						
						 
						
						
						
						
					 
					
						2020-02-09 22:15:15 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						6b5ed80727 
					 
					
						
						
							
							Merge pull request  #23  from informatik-ag-ngl/b/online_status  
						
						 
						
						... 
						
						
						
						Fixed incorrect online status 
						
						
					 
					
						2020-02-09 21:43:37 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								delvh 
							
						 
					 
					
						
						
							
						
						d663f3ff8f 
					 
					
						
						
							
							fixed Javadoc error. Current implementation is NOT working!  
						
						 
						
						
						
						
					 
					
						2020-02-09 20:48:08 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								delvh 
							
						 
					 
					
						
						
							
						
						d37ab53275 
					 
					
						
						
							
							Added handling of incorrect logins  
						
						 
						
						
						
						
					 
					
						2020-02-09 20:43:12 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								delvh 
							
						 
					 
					
						
						
							
						
						3079ee8346 
					 
					
						
						
							
							fixed bug that made registering a new user impossible  
						
						 
						
						
						
						
					 
					
						2020-02-09 20:41:29 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								delvh 
							
						 
					 
					
						
						
							
						
						4b7051c78e 
					 
					
						
						
							
							adapted Javadoc slightly  
						
						 
						
						
						
						
					 
					
						2020-02-09 16:42:02 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								delvh 
							
						 
					 
					
						
						
							
						
						163141e3a3 
					 
					
						
						
							
							added methods to signal an invalid login  
						
						 
						
						... 
						
						
						
						additionally added a failsafe to set all users to offline in case of
shutdown of the server 
						
						
					 
					
						2020-02-09 16:37:53 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								DieGurke 
							
						 
					 
					
						
						
							
						
						e8062be346 
					 
					
						
						
							
							Adding contacts technical aspects  
						
						 
						
						... 
						
						
						
						* Contact SearchResult from server is now getting processed and
correctly displayed.
* Sending a AddContact event to server, if button is pressed.
* Added several interface objects 
						
						
					 
					
						2020-02-09 16:26:36 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						8d4de87dbb 
					 
					
						
						
							
							Fixed incorrect online status  
						
						 
						
						... 
						
						
						
						User objects were created with the status ONLINE even if the actual
status in the database was a different one. This issue has been fixed. 
						
						
					 
					
						2020-02-09 16:01:05 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						ac2a1aad56 
					 
					
						
						
							
							Merge pull request  #106  from informatik-ag-ngl/b/unread_messages  
						
						 
						
						... 
						
						
						
						Fixed threading issue when receiving unread messages 
						
						
					 
					
						2020-02-08 15:04:29 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						24c0cdd38d 
					 
					
						
						
							
							Added ContactOperationProcessor for the ADD operation  
						
						 
						
						
						
						
					 
					
						2020-02-08 15:03:03 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								DieGurke 
							
						 
					 
					
						
						
							
						
						9110073d16 
					 
					
						
						
							
							Fixed user search  
						
						 
						
						
						
						
					 
					
						2020-02-08 14:27:21 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						33dc6ba4ac 
					 
					
						
						
							
							Implemented user search response  
						
						 
						
						
						
						
					 
					
						2020-02-08 13:53:58 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								DieGurke 
							
						 
					 
					
						
						
							
						
						efe5fd30ce 
					 
					
						
						
							
							Removed user id from Contacts  
						
						 
						
						
						
						
					 
					
						2020-02-08 13:44:05 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								DieGurke 
							
						 
					 
					
						
						
							
						
						90409c1d90 
					 
					
						
						
							
							Implemented ContactRenderer and built a properScrollPane with list, etc.  
						
						 
						
						
						
						
					 
					
						2020-02-08 11:43:37 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						e6c4139b4d 
					 
					
						
						
							
							Fixed threading issue when receiving unread messages  
						
						 
						
						
						
						
					 
					
						2020-02-08 11:43:02 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								delvh 
							
						 
					 
					
						
						
							
						
						6d614580ef 
					 
					
						
						
							
							Removed ID artifact from LoginCredentials  
						
						 
						
						
						
						
					 
					
						2020-02-08 09:47:59 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								delvh 
							
						 
					 
					
						
						
							
						
						d7eb2d904c 
					 
					
						
						
							
							Added another default reason  
						
						 
						
						
						
						
					 
					
						2020-02-08 09:17:11 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								delvh 
							
						 
					 
					
						
						
							
						
						65b016b9b7 
					 
					
						
						
							
							Implemented method to check for the validity of logins  
						
						 
						
						... 
						
						
						
						Warning: will only work once f/advanced_login of envoy-common will be merged into develop 
						
						
					 
					
						2020-02-07 23:37:33 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								delvh 
							
						 
					 
					
						
						
							
						
						a006dd4dc8 
					 
					
						
						
							
							Added default reasons to HandshakeRejectionEvent  
						
						 
						
						
						
						
					 
					
						2020-02-07 23:29:22 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								delvh 
							
						 
					 
					
						
						
							
						
						bcbe0aeb3f 
					 
					
						
						
							
							Updated LoginCredentials constructor  
						
						 
						
						
						
						
					 
					
						2020-02-07 22:37:48 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						e73ad7b871 
					 
					
						
						
							
							Merge pull request  #21  from informatik-ag-ngl/f/single_transaction  
						
						 
						
						... 
						
						
						
						Adding user to their own contacts, reusing one database transaction 
						
						
					 
					
						2020-02-07 20:35:12 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								delvh 
							
						 
					 
					
						
						
							
						
						f76d0cdeb4 
					 
					
						
						
							
							Merge pull request  #105  from informatik-ag-ngl/f/user_status_change_processor  
						
						 
						
						... 
						
						
						
						Added the UserStatusChangeProcessor and its implementation 
						
						
					 
					
						2020-02-07 16:56:33 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								delvh 
							
						 
					 
					
						
						
							
						
						337c74ded1 
					 
					
						
						
							
							Redesigned UserStatusChangeProcessor to please @CyB3RC0nN0R s wishes  
						
						 
						
						
						
						
					 
					
						2020-02-07 15:57:41 +01:00