Browse Source

Update last messages when coming to a screen

Signed-off-by: Mario Danic <mario@lovelyhq.com>
Mario Danic 6 years ago
parent
commit
bb4252bdbf

+ 12 - 11
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