mirror of
https://github.com/quik-sms/quik.git
synced 2026-11-20 20:58:54 +01:00
Don't show empty conversations in conversation list
This commit is contained in:
@@ -21,7 +21,6 @@ package mapper
|
|||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.database.Cursor
|
import android.database.Cursor
|
||||||
import android.net.Uri
|
import android.net.Uri
|
||||||
import android.provider.Telephony
|
|
||||||
import android.provider.Telephony.Threads
|
import android.provider.Telephony.Threads
|
||||||
import model.Conversation
|
import model.Conversation
|
||||||
import model.Recipient
|
import model.Recipient
|
||||||
@@ -35,14 +34,16 @@ class CursorToConversationImpl @Inject constructor(private val context: Context)
|
|||||||
Threads._ID,
|
Threads._ID,
|
||||||
Threads.DATE,
|
Threads.DATE,
|
||||||
Threads.RECIPIENT_IDS,
|
Threads.RECIPIENT_IDS,
|
||||||
|
Threads.MESSAGE_COUNT,
|
||||||
Threads.READ,
|
Threads.READ,
|
||||||
Threads.SNIPPET)
|
Threads.SNIPPET)
|
||||||
|
|
||||||
const val ID = 0
|
const val ID = 0
|
||||||
const val DATE = 1
|
const val DATE = 1
|
||||||
const val RECIPIENT_IDS = 2
|
const val RECIPIENT_IDS = 2
|
||||||
const val READ = 3
|
const val MESSAGE_COUNT = 3
|
||||||
const val SNIPPET = 4
|
const val READ = 4
|
||||||
|
const val SNIPPET = 5
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun map(from: Cursor): Conversation {
|
override fun map(from: Cursor): Conversation {
|
||||||
@@ -54,6 +55,7 @@ class CursorToConversationImpl @Inject constructor(private val context: Context)
|
|||||||
.filter { it.isNotBlank() }
|
.filter { it.isNotBlank() }
|
||||||
.map { recipientId -> recipientId.toLong() }
|
.map { recipientId -> recipientId.toLong() }
|
||||||
.map { recipientId -> Recipient().apply { id = recipientId } })
|
.map { recipientId -> Recipient().apply { id = recipientId } })
|
||||||
|
count = from.getInt(MESSAGE_COUNT)
|
||||||
read = from.getInt(READ) == 1
|
read = from.getInt(READ) == 1
|
||||||
snippet = from.getString(SNIPPET) ?: ""
|
snippet = from.getString(SNIPPET) ?: ""
|
||||||
}
|
}
|
||||||
@@ -61,7 +63,7 @@ class CursorToConversationImpl @Inject constructor(private val context: Context)
|
|||||||
|
|
||||||
override fun getConversationsCursor(lastSync: Long): Cursor {
|
override fun getConversationsCursor(lastSync: Long): Cursor {
|
||||||
return context.contentResolver.query(URI, PROJECTION,
|
return context.contentResolver.query(URI, PROJECTION,
|
||||||
"date > $lastSync AND ${Telephony.Threads.MESSAGE_COUNT} > 0", null,
|
"date > $lastSync", null,
|
||||||
"date desc")
|
"date desc")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -68,6 +68,7 @@ class MessageRepositoryImpl @Inject constructor(
|
|||||||
return realm
|
return realm
|
||||||
.where(Conversation::class.java)
|
.where(Conversation::class.java)
|
||||||
.notEqualTo("id", 0L)
|
.notEqualTo("id", 0L)
|
||||||
|
.greaterThan("count", 0)
|
||||||
.equalTo("archived", archived)
|
.equalTo("archived", archived)
|
||||||
.equalTo("blocked", false)
|
.equalTo("blocked", false)
|
||||||
.isNotEmpty("recipients")
|
.isNotEmpty("recipients")
|
||||||
@@ -83,6 +84,7 @@ class MessageRepositoryImpl @Inject constructor(
|
|||||||
val realm = Realm.getDefaultInstance()
|
val realm = Realm.getDefaultInstance()
|
||||||
return realm.copyFromRealm(realm.where(Conversation::class.java)
|
return realm.copyFromRealm(realm.where(Conversation::class.java)
|
||||||
.notEqualTo("id", 0L)
|
.notEqualTo("id", 0L)
|
||||||
|
.greaterThan("count", 0)
|
||||||
.equalTo("archived", false)
|
.equalTo("archived", false)
|
||||||
.equalTo("blocked", false)
|
.equalTo("blocked", false)
|
||||||
.isNotEmpty("recipients")
|
.isNotEmpty("recipients")
|
||||||
@@ -246,17 +248,20 @@ class MessageRepositoryImpl @Inject constructor(
|
|||||||
.equalTo("id", threadId)
|
.equalTo("id", threadId)
|
||||||
.findFirst() ?: return
|
.findFirst() ?: return
|
||||||
|
|
||||||
val message = realm
|
val messages = realm
|
||||||
.where(Message::class.java)
|
.where(Message::class.java)
|
||||||
.equalTo("threadId", threadId)
|
.equalTo("threadId", threadId)
|
||||||
.sort("date", Sort.DESCENDING)
|
.sort("date", Sort.DESCENDING)
|
||||||
.findAll().firstOrNull() ?: return
|
.findAll()
|
||||||
|
|
||||||
|
val message = messages.firstOrNull()
|
||||||
|
|
||||||
realm.executeTransaction {
|
realm.executeTransaction {
|
||||||
conversation.date = message.date
|
conversation.count = messages.size
|
||||||
conversation.snippet = message.getSummary()
|
conversation.date = message?.date ?: 0
|
||||||
conversation.read = message.read
|
conversation.snippet = message?.getSummary() ?: ""
|
||||||
conversation.me = message.isMe()
|
conversation.read = message?.read ?: true
|
||||||
|
conversation.me = message?.isMe() ?: false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -31,6 +31,7 @@ open class Conversation : RealmObject() {
|
|||||||
@Index var archived: Boolean = false
|
@Index var archived: Boolean = false
|
||||||
@Index var blocked: Boolean = false
|
@Index var blocked: Boolean = false
|
||||||
var recipients: RealmList<Recipient> = RealmList()
|
var recipients: RealmList<Recipient> = RealmList()
|
||||||
|
var count: Int = 0
|
||||||
var date: Long = 0
|
var date: Long = 0
|
||||||
var snippet: String = ""
|
var snippet: String = ""
|
||||||
var read: Boolean = true
|
var read: Boolean = true
|
||||||
|
|||||||
Reference in New Issue
Block a user