signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

Ignore muted, marked unread threads in badge count

Browse Source
This commit is contained in:
Max Radermacher 2023-12-08 12:39:52 -06:00 committed by GitHub
parent 0b61f88474
commit 3eb9c48d43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Signal/src/ViewControllers/HomeView/Chat List/ThreadSwipeHandler.swift
View File

@ -218,7 +218,7 @@ extension ThreadSwipeHandler where Self: UIViewController {
AssertIsOnMainThread()
databaseStorage.write { transaction in
threadViewModel.associatedData.updateWith(mutedUntilTimestamp: Date.ows_millisecondTimestamp(), updateStorageService: true, transaction: transaction)
threadViewModel.associatedData.updateWith(mutedUntilTimestamp: 0, updateStorageService: true, transaction: transaction)
}
}

30
SignalServiceKit/src/Storage/Database/Records/InteractionFinder.swift
View File

@ -188,6 +188,8 @@ public class InteractionFinder: NSObject {
public class func unreadCountInAllThreads(transaction: SDSAnyReadTransaction) -> UInt {
do {
let includeMutedThreads = SSKPreferences.includeMutedThreadsInBadgeCount(transaction: transaction)
var unreadInteractionQuery = """
SELECT COUNT(interaction.\(interactionColumn: .id))
FROM \(InteractionRecord.databaseTableName) AS interaction
@ -196,21 +198,16 @@ public class InteractionFinder: NSObject {
WHERE associatedData.isArchived = "0"
"""
if !SSKPreferences.includeMutedThreadsInBadgeCount(transaction: transaction) {
if !includeMutedThreads {
unreadInteractionQuery += " \(sqlClauseForIgnoringInteractionsWithMutedThread(threadAssociatedDataAlias: "associatedData")) "
}
unreadInteractionQuery += " AND \(sqlClauseForUnreadInteractionCounts(interactionsAlias: "interaction")) "
guard let unreadInteractionCount = try UInt.fetchOne(
transaction.unwrapGrdbRead.database,
sql: unreadInteractionQuery
) else {
owsFailDebug("unreadInteractionCount was unexpectedly nil")
return 0
}
let unreadInteractionCount = try UInt.fetchOne(transaction.unwrapGrdbRead.database, sql: unreadInteractionQuery)
owsAssertDebug(unreadInteractionCount != nil, "unreadInteractionCount was unexpectedly nil")
let markedUnreadThreadQuery = """
var markedUnreadThreadQuery = """
SELECT COUNT(*)
FROM \(ThreadRecord.databaseTableName)
INNER JOIN \(ThreadAssociatedData.databaseTableName) AS associatedData
@ -220,17 +217,16 @@ public class InteractionFinder: NSObject {
AND \(threadColumn: .shouldThreadBeVisible) = 1
"""
guard let markedUnreadCount = try UInt.fetchOne(
transaction.unwrapGrdbRead.database,
sql: markedUnreadThreadQuery
) else {
owsFailDebug("markedUnreadCount was unexpectedly nil")
return unreadInteractionCount
if !includeMutedThreads {
markedUnreadThreadQuery += " \(sqlClauseForIgnoringInteractionsWithMutedThread(threadAssociatedDataAlias: "associatedData")) "
}
return unreadInteractionCount + markedUnreadCount
let markedUnreadCount = try UInt.fetchOne(transaction.unwrapGrdbRead.database, sql: markedUnreadThreadQuery)
owsAssertDebug(markedUnreadCount != nil, "markedUnreadCount was unexpectedly nil")
return (unreadInteractionCount ?? 0) + (markedUnreadCount ?? 0)
} catch {
owsFailDebug("error: \(error)")
owsFailDebug("error: \(error.grdbErrorForLogging)")
return 0
}
}