Merge branch 'develop' into f/reject_handshake
This commit is contained in:
@ -1,10 +1,7 @@
|
||||
package envoy.server.processors;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.Arrays;
|
||||
import java.util.Date;
|
||||
import java.util.InputMismatchException;
|
||||
import java.util.List;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import javax.persistence.NoResultException;
|
||||
@ -56,8 +53,7 @@ public class LoginCredentialProcessor implements ObjectProcessor<LoginCredential
|
||||
UserStatusChangeProcessor.updateUserStatus(user);
|
||||
|
||||
// Create contacts
|
||||
Contacts contacts = new Contacts(user.getId(),
|
||||
user.getContacts().stream().map(envoy.server.data.User::toCommonUser).collect(Collectors.toList()));
|
||||
Contacts contacts = new Contacts(user.getContacts().stream().map(envoy.server.data.User::toCommonUser).collect(Collectors.toList()));
|
||||
contacts.getContacts().add(user.toCommonUser());
|
||||
|
||||
// Complete handshake
|
||||
@ -134,7 +130,6 @@ public class LoginCredentialProcessor implements ObjectProcessor<LoginCredential
|
||||
user.setLastSeen(new Date());
|
||||
user.setStatus(User.UserStatus.ONLINE);
|
||||
user.setPasswordHash(credentials.getPasswordHash());
|
||||
user.setContacts(PersistenceManager.getPersistenceManager().getContacts(user));
|
||||
persistenceManager.addUser(user);
|
||||
return user;
|
||||
}
|
||||
|
Reference in New Issue
Block a user