Merge branch 'bug/UIUpdateConversationItem'

miniwolf · Apr 2, 2017 · 4cb0673 · 4cb0673
2 parents 2979583 + adaec7a
commit 4cb0673
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/fagiClient/src/com/fagi/controller/MainScreen.java b/fagiClient/src/com/fagi/controller/MainScreen.java
@@ -309,8 +309,7 @@ public void setConversation(Conversation conversation) {
 
     public void addConversation(Conversation conversation) {
         conversations.add(conversation);
-        Pane pane = createMessageItem(conversation);
-        Platform.runLater(() -> conversationContentController.addToContentList(pane));
+        setupConversationList();
     }
 
     public List<MessageItemController> getMessageItems() {
@@ -375,8 +374,7 @@ private void setupConversationList() {
 
     public Pane createMessageItem(Conversation conversation) {
         MessageItemController messageItemController =
-            new MessageItemController(usernameString,
-                                      conversation);
+            new MessageItemController(usernameString, conversation);
         messageItemController.getActionable()
                              .assign(new OpenConversationFromID(this, conversation.getId()));
         messageItems.add(messageItemController);

diff --git a/fagiClient/src/com/fagi/controller/conversation/ReceivedInvitationController.java b/fagiClient/src/com/fagi/controller/conversation/ReceivedInvitationController.java
@@ -32,7 +32,7 @@ public ReceivedInvitationController(FriendRequest request, MainScreen mainScreen
 
         new LoadFXML(this, "/com/fagi/view/conversation/ReceivedInvitation.fxml").execute();
 
-        String username = request.getFriendUsername();
+        String username = request.getMessage().getMessageInfo().getSender();
         Image smallImage = new Image(
                 "/com/fagi/style/material-icons/" + username.toCharArray()[0] + ".png", 32, 32,
                 true, true);