mirror of
https://github.com/signalapp/Signal-Android.git
synced 2026-04-02 00:17:41 +01:00
Include links in the "All" tab of media overview.
This commit is contained in:
@@ -288,8 +288,17 @@ class MediaTable internal constructor(context: Context?, databaseHelper: SignalD
|
||||
|
||||
@JvmOverloads
|
||||
fun getAllMediaForThread(threadId: Long, sorting: Sorting, limit: Int = 0): Cursor {
|
||||
var query = sorting.applyToQuery(applyEqualityOperator(threadId, applyIndexHint(ALL_MEDIA_QUERY, threadId, sorting)))
|
||||
val args = arrayOf(threadId.toString() + "")
|
||||
val allMediaSubquery = applyEqualityOperator(threadId, applyIndexHint(ALL_MEDIA_QUERY, threadId, sorting))
|
||||
val linkSubquery = applyEqualityOperator(threadId, LINK_MEDIA_QUERY)
|
||||
|
||||
val orderBy = when (sorting) {
|
||||
Sorting.Newest -> " ORDER BY $MEDIA_MESSAGE_ID DESC"
|
||||
Sorting.Oldest -> " ORDER BY $MEDIA_MESSAGE_ID ASC"
|
||||
Sorting.Largest -> " ORDER BY ${AttachmentTable.DATA_SIZE} DESC"
|
||||
}
|
||||
|
||||
var query = "$allMediaSubquery UNION ALL $linkSubquery$orderBy"
|
||||
val args = arrayOf(threadId.toString(), threadId.toString())
|
||||
|
||||
if (limit > 0) {
|
||||
query = "$query LIMIT $limit"
|
||||
|
||||
Reference in New Issue
Block a user