Merge issues

2019-11-12 23:27:31 -05:00
parent bb816209ba
commit 29068f52c9
1 changed files with 2 additions and 2 deletions
@@ -190,9 +190,9 @@ class ConversationRepositoryImpl @Inject constructor(
    override fun getUnmanagedConversations(): Observable<List<Conversation>> {
        val realm = Realm.getDefaultInstance()
        return realm.where(Conversation::class.java)
-                .sort("date", Sort.DESCENDING)
+                .sort("lastMessage.date", Sort.DESCENDING)
                .notEqualTo("id", 0L)
-                .greaterThan("count", 0)
+                .isNotNull("lastMessage")
                .equalTo("archived", false)
                .equalTo("blocked", false)
                .isNotEmpty("recipients")