Applied suggestions from @delvh
This commit is contained in:
DieGurke
parent
d88f31a300
commit
a8443e6a50
|
|
@ -11,6 +11,9 @@ import envoy.data.User;
|
|||
import envoy.event.GroupMessageStatusChange;
|
||||
|
||||
/**
|
||||
* Represents a chat between a user and a group
|
||||
* as a list of messages.
|
||||
* <p>
|
||||
* Project: <strong>envoy-client</strong><br>
|
||||
* File: <strong>GroupChat.java</strong><br>
|
||||
* Created: <strong>05.07.2020</strong><br>
|
||||
|
|
@ -26,7 +29,7 @@ public class GroupChat extends Chat {
|
|||
|
||||
/**
|
||||
* @param sender the user sending the messages
|
||||
* @param recipient the user who receives the messages
|
||||
* @param recipient the group whose members receive the messages
|
||||
* @since Envoy Client v0.1-beta
|
||||
*/
|
||||
public GroupChat(User sender, Contact recipient) {
|
||||
|
|
@ -37,13 +40,13 @@ public class GroupChat extends Chat {
|
|||
@Override
|
||||
public void read(WriteProxy writeProxy) throws IOException {
|
||||
for (int i = messages.size() - 1; i >= 0; --i) {
|
||||
final GroupMessage g = (GroupMessage) messages.get(i);
|
||||
if (g.getSenderID() != sender.getID()) {
|
||||
if (g.getMemberStatuses().get(sender.getID()) == MessageStatus.READ) break;
|
||||
final GroupMessage gmsg = (GroupMessage) messages.get(i);
|
||||
if (gmsg.getSenderID() != sender.getID()) {
|
||||
if (gmsg.getMemberStatuses().get(sender.getID()) == MessageStatus.READ) break;
|
||||
else {
|
||||
g.getMemberStatuses().replace(sender.getID(), MessageStatus.READ);
|
||||
gmsg.getMemberStatuses().replace(sender.getID(), MessageStatus.READ);
|
||||
writeProxy
|
||||
.writeMessageStatusChange(new GroupMessageStatusChange(g.getID(), MessageStatus.READ, LocalDateTime.now(), sender.getID()));
|
||||
.writeMessageStatusChange(new GroupMessageStatusChange(gmsg.getID(), MessageStatus.READ, LocalDateTime.now(), sender.getID()));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -53,22 +53,26 @@ public class Client implements Closeable {
|
|||
* will block for up to 5 seconds. If the handshake does exceed this time limit,
|
||||
* an exception is thrown.
|
||||
*
|
||||
* @param credentials the login credentials of the user
|
||||
* @param receivedMessageCache a message cache containing all unread
|
||||
* messages
|
||||
* from the server that can be relayed
|
||||
* after
|
||||
* initialization
|
||||
* @param receivedGroupMessageCache a groupMessage cache containing all
|
||||
* unread
|
||||
* groupMessages
|
||||
* from the server that can be relayed
|
||||
* after
|
||||
* initialization
|
||||
* @param receivedMessageStatusChangeCache an event cache containing all
|
||||
* received messageStatusChangeEvents
|
||||
* from the server that can be relayed
|
||||
* after initialization
|
||||
* @param credentials the login credentials of the
|
||||
* user
|
||||
* @param receivedMessageCache a message cache containing all
|
||||
* unread messages from the server
|
||||
* that can be relayed after
|
||||
* initialization
|
||||
* @param receivedGroupMessageCache a groupMessage cache containing
|
||||
* all unread groupMessages from
|
||||
* the server that can be relayed
|
||||
* after initialization
|
||||
* @param receivedMessageStatusChangeCache an event cache containing all
|
||||
* received
|
||||
* messageStatusChangeEvents from
|
||||
* the server that can be relayed
|
||||
* after initialization
|
||||
* @param receivedGroupMessageStatusChangeCache an event cache containing all
|
||||
* received
|
||||
* groupMessageStatusChangeEvents
|
||||
* from the server that can be
|
||||
* relayed after initialization
|
||||
* @throws TimeoutException if the server could not be reached
|
||||
* @throws IOException if the login credentials could not be written
|
||||
* @throws InterruptedException if the current thread is interrupted while
|
||||
|
|
@ -131,24 +135,36 @@ public class Client implements Closeable {
|
|||
* Initializes the {@link Receiver} used to process data sent from the server to
|
||||
* this client.
|
||||
*
|
||||
* @param localDB the local database used to persist
|
||||
* the current
|
||||
* {@link IDGenerator}
|
||||
* @param receivedMessageCache a message cache containing all unread
|
||||
* messages
|
||||
* from the server that can be relayed
|
||||
* after
|
||||
* initialization
|
||||
* @param receivedGroupMessageCache a groupMessage cache containing all
|
||||
* unread
|
||||
* groupMessages
|
||||
* from the server that can be relayed
|
||||
* after
|
||||
* initialization
|
||||
* @param receivedMessageStatusChangeCache an event cache containing all
|
||||
* received messageStatusChangeEvents
|
||||
* from the server that can be relayed
|
||||
* after initialization
|
||||
* @param localDB the local database used to
|
||||
* persist
|
||||
* the current
|
||||
* {@link IDGenerator}
|
||||
* @param receivedMessageCache a message cache containing all
|
||||
* unread
|
||||
* messages
|
||||
* from the server that can be
|
||||
* relayed
|
||||
* after
|
||||
* initialization
|
||||
* @param receivedGroupMessageCache a groupMessage cache containing
|
||||
* all
|
||||
* unread
|
||||
* groupMessages
|
||||
* from the server that can be
|
||||
* relayed
|
||||
* after
|
||||
* initialization
|
||||
* @param receivedMessageStatusChangeCache an event cache containing all
|
||||
* received
|
||||
* messageStatusChangeEvents
|
||||
* from the server that can be
|
||||
* relayed
|
||||
* after initialization
|
||||
* @param receivedGroupMessageStatusChangeCache an event cache containing all
|
||||
* received
|
||||
* groupMessageStatusChangeEvents
|
||||
* from the server that can be
|
||||
* relayed after initialization
|
||||
* @throws IOException if no {@link IDGenerator} is present and none could be
|
||||
* requested from the server
|
||||
* @since Envoy Client v0.2-alpha
|
||||
|
|
@ -159,8 +175,8 @@ public class Client implements Closeable {
|
|||
checkOnline();
|
||||
|
||||
// Process incoming messages
|
||||
final ReceivedMessageProcessor receivedMessageProcessor = new ReceivedMessageProcessor();
|
||||
final ReceivedGroupMessageProcessor receivedGroupMessageProcessor = new ReceivedGroupMessageProcessor();
|
||||
final ReceivedMessageProcessor receivedMessageProcessor = new ReceivedMessageProcessor();
|
||||
final ReceivedGroupMessageProcessor receivedGroupMessageProcessor = new ReceivedGroupMessageProcessor();
|
||||
final MessageStatusChangeProcessor messageStatusChangeProcessor = new MessageStatusChangeProcessor();
|
||||
final GroupMessageStatusChangeProcessor groupMessageStatusChangeProcessor = new GroupMessageStatusChangeProcessor();
|
||||
|
||||
|
|
|
|||
|
|
@ -29,8 +29,8 @@ import envoy.client.ui.listcell.ContactListCellFactory;
|
|||
import envoy.client.ui.listcell.MessageControl;
|
||||
import envoy.client.ui.listcell.MessageListCellFactory;
|
||||
import envoy.data.*;
|
||||
import envoy.event.*;
|
||||
import envoy.data.Attachment.AttachmentType;
|
||||
import envoy.event.*;
|
||||
import envoy.event.contact.ContactOperation;
|
||||
import envoy.exception.EnvoyException;
|
||||
import envoy.util.EnvoyLog;
|
||||
|
|
@ -135,7 +135,7 @@ public final class ChatScene implements Restorable {
|
|||
eventBus.register(GroupMessageStatusChange.class, e -> localDB.getMessage(e.getID()).ifPresent(groupMessage -> {
|
||||
((GroupMessage) groupMessage).getMemberStatuses().replace(e.getMemberID(), e.get());
|
||||
|
||||
// Update UI id in current chat
|
||||
// Update UI if in current chat
|
||||
if (currentChat != null && groupMessage.getRecipientID() == currentChat.getRecipient().getID()) Platform.runLater(messageList::refresh);
|
||||
}));
|
||||
|
||||
|
|
@ -355,9 +355,8 @@ public final class ChatScene implements Restorable {
|
|||
}
|
||||
|
||||
/**
|
||||
* Sends a new message or groupMessage to the server based on the text entered
|
||||
* in the
|
||||
* messageTextArea.
|
||||
* Sends a new {@link Message} or {@link GroupMessage} to the server based on
|
||||
* the text entered in the {@code messageTextArea} and the given attachment.
|
||||
*
|
||||
* @since Envoy Client v0.1-beta
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -75,21 +75,29 @@ public final class LoginScene {
|
|||
/**
|
||||
* Loads the login dialog using the FXML file {@code LoginDialog.fxml}.
|
||||
*
|
||||
* @param client the client used to perform the
|
||||
* handshake
|
||||
* @param localDB the local database used for offline
|
||||
* login
|
||||
* @param receivedMessageCache the cache storing messages received
|
||||
* during
|
||||
* the handshake
|
||||
* @param receivedGroupMessageCache the cache storing groupMessages
|
||||
* received during the handshake
|
||||
* @param receivedMessageStatusChangeCache the cache storing
|
||||
* messageStatusChangeEvents received
|
||||
* during handshake
|
||||
* @param sceneContext the scene context used to initialize
|
||||
* the chat
|
||||
* scene
|
||||
* @param client the client used to perform the
|
||||
* handshake
|
||||
* @param localDB the local database used for
|
||||
* offline
|
||||
* login
|
||||
* @param receivedMessageCache the cache storing messages
|
||||
* received
|
||||
* during
|
||||
* the handshake
|
||||
* @param receivedGroupMessageCache the cache storing groupMessages
|
||||
* received during the handshake
|
||||
* @param receivedMessageStatusChangeCache the cache storing
|
||||
* messageStatusChangeEvents
|
||||
* received
|
||||
* during handshake
|
||||
* @param receivedGroupMessageStatusChangeCache the cache storing
|
||||
* groupMessageStatusChangeEvents
|
||||
* received
|
||||
* during handshake
|
||||
* @param sceneContext the scene context used to
|
||||
* initialize
|
||||
* the chat
|
||||
* scene
|
||||
* @since Envoy Client v0.1-beta
|
||||
*/
|
||||
public void initializeData(Client client, LocalDB localDB, Cache<Message> receivedMessageCache, Cache<GroupMessage> receivedGroupMessageCache,
|
||||
|
|
|
|||
Reference in New Issue