Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-25 05:27:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix unread mention indicator showing incorrectly bug.

Browse Source
This commit is contained in:
Cody Henthorne
2023-09-11 13:53:42 -04:00
committed by GitHub
parent 551e5a0a25
commit b72fe0d7a2
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt
View File

@@ -37,6 +37,7 @@ import org.signal.core.util.SqlUtil.buildCustomCollectionQuery
import org.signal.core.util.SqlUtil.buildSingleCollectionQuery
import org.signal.core.util.SqlUtil.buildTrueUpdateQuery
import org.signal.core.util.SqlUtil.getNextAutoIncrementId
import org.signal.core.util.count
import org.signal.core.util.delete
import org.signal.core.util.exists
import org.signal.core.util.forEach
@@ -2375,8 +2376,8 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
fun getOldestUnreadMentionDetails(threadId: Long): Pair<RecipientId, Long>? {
return readableDatabase
.select(FROM_RECIPIENT_ID, DATE_RECEIVED)
.from(TABLE_NAME)
.where("$THREAD_ID = ? AND $READ = 0 AND $MENTIONS_SELF = 1", threadId)
.from("$TABLE_NAME INDEXED BY $INDEX_THREAD_STORY_SCHEDULED_DATE_LATEST_REVISION_ID")
.where("$THREAD_ID = ? AND $STORY_TYPE = 0 AND $PARENT_STORY_ID <= 0 AND $LATEST_REVISION_ID IS NULL AND $READ = 0 AND $MENTIONS_SELF = 1", threadId)
.orderBy("$DATE_RECEIVED ASC")
.limit(1)
.run()
@@ -2390,9 +2391,9 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
fun getUnreadMentionCount(threadId: Long): Int {
return readableDatabase
.select("COUNT(*)")
.from(TABLE_NAME)
.where("$THREAD_ID = ? AND $READ = 0 AND $MENTIONS_SELF = 1", threadId)
.count()
.from("$TABLE_NAME INDEXED BY $INDEX_THREAD_STORY_SCHEDULED_DATE_LATEST_REVISION_ID")
.where("$THREAD_ID = ? AND $STORY_TYPE = 0 AND $PARENT_STORY_ID <= 0 AND $LATEST_REVISION_ID IS NULL AND $READ = 0 AND $MENTIONS_SELF = 1", threadId)
.run()
.readToSingleInt()
}