zdm/envoy
Archived
3
Fork 0
Code Issues 22 Pull Requests Releases 1 Wiki Activity

Add ContactListCellFactory

Browse Source 
- Refactor chatList to userList in ContactSearchScene and
  GroupCreationScene
- Narrow contact searches down to users on a datamodel basis
- Refactor ContactSearchRequest and ContactSearchResult to
  UserSearchRequest and UserSearchResult
This commit is contained in:
Kai S. K. Engelbart
2020-07-13 19:02:40 +02:00
parent bcb978ce59
commit 563499e9cf
13 changed files with 188 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/src/main/java/envoy/server/processors/ContactSearchProcessor.java
View File

@ -4,8 +4,8 @@ import java.io.IOException;
import java.util.stream.Collectors;
import envoy.data.Contact;
import envoy.event.contact.ContactSearchRequest;
import envoy.event.contact.ContactSearchResult;
import envoy.event.contact.UserSearchRequest;
import envoy.event.contact.UserSearchResult;
import envoy.server.data.PersistenceManager;
import envoy.server.data.User;
import envoy.server.net.ConnectionManager;
@ -20,7 +20,7 @@ import envoy.server.net.ObjectWriteProxy;
* @author Maximilian Käfer
* @since Envoy Server Standalone v0.1-alpha
*/
public class ContactSearchProcessor implements ObjectProcessor<ContactSearchRequest> {
public class ContactSearchProcessor implements ObjectProcessor<UserSearchRequest> {
/**
* Writes a list of contacts to the client containing all {@link Contact}s
@ -30,9 +30,9 @@ public class ContactSearchProcessor implements ObjectProcessor<ContactSearchRequ
* @since Envoy Server Standalone v0.1-alpha
*/
@Override
public void process(ContactSearchRequest request, long socketID, ObjectWriteProxy writeProxy) throws IOException {
public void process(UserSearchRequest request, long socketID, ObjectWriteProxy writeProxy) throws IOException {
writeProxy.write(socketID,
new ContactSearchResult(PersistenceManager.getInstance()
new UserSearchResult(PersistenceManager.getInstance()
.searchUsers(request.get(), ConnectionManager.getInstance().getUserIDBySocketID(socketID))
.stream()
.map(User::toCommon)
@ -40,5 +40,5 @@ public class ContactSearchProcessor implements ObjectProcessor<ContactSearchRequ
}
@Override
public Class<ContactSearchRequest> getInputClass() { return ContactSearchRequest.class; }
public Class<UserSearchRequest> getInputClass() { return UserSearchRequest.class; }
}