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

Fix message order with insertion method

Browse Source 
Fixes #168
This commit is contained in:
Kai S. K. Engelbart 2020-07-01 08:36:21 +02:00
parent 4fbec0af11
commit eeb918d37c
No known key found for this signature in database
GPG Key ID: 0A48559CA32CB48F
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/envoy/client/data/Chat.java
View File

@ -93,6 +93,20 @@ public final class Chat implements Serializable {
*/ */
public boolean isUnread() { return !messages.isEmpty() && messages.get(messages.size() - 1).getStatus() != MessageStatus.READ; } public boolean isUnread() { return !messages.isEmpty() && messages.get(messages.size() - 1).getStatus() != MessageStatus.READ; }
/**
* Inserts a message at the correct place according to its creation date.
*
* @param message the message to insert
* @since Envoy Client v0.1-beta
*/
public void insert(Message message) {
for (int i = messages.size() - 1; i >= 0; --i)
if (message.getCreationDate().isAfter(messages.get(i).getCreationDate())) {
messages.add(i + 1, message);
break;
}
}
/** /**
* @return all messages in the current chat * @return all messages in the current chat
* @since Envoy Client v0.1-beta * @since Envoy Client v0.1-beta

2
src/main/java/envoy/client/ui/controller/ChatScene.java
View File

@ -101,7 +101,7 @@ public final class ChatScene {
eventBus.register(MessageCreationEvent.class, e -> { eventBus.register(MessageCreationEvent.class, e -> {
final var message = e.get(); final var message = e.get();
localDB.getChat(message.getSenderID()).ifPresent(chat -> { localDB.getChat(message.getSenderID()).ifPresent(chat -> {
chat.getMessages().add(message); chat.insert(message);
if (chat.equals(currentChat)) { if (chat.equals(currentChat)) {
try { try {

3
src/main/java/envoy/client/ui/controller/LoginScene.java
View File

@ -151,8 +151,7 @@ public final class LoginScene {
loadChatScene(); loadChatScene();
} }
} catch (IOException | InterruptedException | TimeoutException e) { } catch (IOException | InterruptedException | TimeoutException e) {
logger.log(Level.WARNING, "Could not connect to server: ", e); logger.log(Level.INFO, "Could not connect to server. Entering offline mode...");
logger.log(Level.FINER, "Attempting offline mode...");
attemptOfflineMode(credentials); attemptOfflineMode(credentials);
} }
} }