From 221448f3c22f6ea3acb519d42636b439ac36426a Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Tue, 7 Nov 2017 23:15:47 +0100 Subject: [PATCH] Implement sorting Signed-off-by: Mario Danic --- .../com/nextcloud/talk/controllers/CallsListController.java | 5 +++++ .../com/nextcloud/talk/controllers/ContactsController.java | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/app/src/main/java/com/nextcloud/talk/controllers/CallsListController.java b/app/src/main/java/com/nextcloud/talk/controllers/CallsListController.java index a3bfab22b..5b71beeb4 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/CallsListController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/CallsListController.java @@ -62,6 +62,7 @@ import com.nextcloud.talk.utils.bundle.BundleBuilder; import com.nextcloud.talk.utils.database.user.UserUtils; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import javax.inject.Inject; @@ -256,6 +257,10 @@ public class CallsListController extends BaseController implements SearchView.On } adapter.updateDataSet(roomItems, true); + + Collections.sort(roomItems, (roomItem, t1) -> + Long.compare(t1.getModel().getLastPing(), roomItem.getModel().getLastPing())); + if (searchItem != null) { searchItem.setVisible(roomItems.size() > 0); } diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java b/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java index 71c8de80d..aa0a7082d 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java @@ -60,6 +60,7 @@ import com.nextcloud.talk.persistence.entities.UserEntity; import com.nextcloud.talk.utils.database.user.UserUtils; import java.util.ArrayList; +import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -249,6 +250,9 @@ public class ContactsController extends BaseController implements SearchView.OnQ } + Collections.sort(contactItems, (userItem, t1) -> + userItem.getModel().getName().compareToIgnoreCase(t1.getModel().getName())); + adapter.updateDataSet(contactItems, true); searchItem.setVisible(contactItems.size() > 0); }