From bb4252bdbf9545958a8141f9ebde66904c1eeb96 Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Fri, 24 Aug 2018 10:26:26 +0200 Subject: [PATCH] Update last messages when coming to a screen Signed-off-by: Mario Danic --- .../ConversationsListController.java | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java b/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java index 15db5dc79..ef419942a 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java @@ -152,20 +152,9 @@ public class ConversationsListController extends BaseController implements Searc getActionBar().show(); } - currentUser = userUtils.getCurrentUser(); - - if (currentUser != null) { - credentials = ApiUtils.getCredentials(currentUser.getUserId(), currentUser.getToken()); - } if (adapter == null) { adapter = new FlexibleAdapter<>(callItems, getActivity(), false); - - if (currentUser != null) { - shouldUseLastMessageLayout = currentUser.hasSpreedCapabilityWithName("last-room-activity"); - - fetchData(false); - } } adapter.addListener(this); @@ -179,6 +168,18 @@ public class ConversationsListController extends BaseController implements Searc if (getActionBar() != null) { getActionBar().setDisplayHomeAsUpEnabled(false); } + + currentUser = userUtils.getCurrentUser(); + + if (currentUser != null) { + credentials = ApiUtils.getCredentials(currentUser.getUserId(), currentUser.getToken()); + } + + if (currentUser != null) { + shouldUseLastMessageLayout = currentUser.hasSpreedCapabilityWithName("last-room-activity"); + + fetchData(false); + } } @Override