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

Disable notification actions with screen lock enabled

Browse Source
This commit is contained in:
Elaine 2026-06-10 14:08:15 -04:00 committed by GitHub
parent aa353b3f59
commit c4b6b61da7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
SignalServiceKit/Notifications/NotificationPresenterImpl.swift
View File

@ -153,6 +153,7 @@ public enum AppNotificationCategory: String, CaseIterable {
case incomingMessageFromNoLongerVerifiedIdentity = "Signal.AppNotificationCategory.incomingMessageFromNoLongerVerifiedIdentity"
case incomingReactionWithActions_CanReply = "Signal.AppNotificationCategory.incomingReactionWithActions"
case incomingReactionWithActions_CannotReply = "Signal.AppNotificationCategory.incomingReactionWithActionsNoReply"
case incomingReactionWithoutActions = "Signal.AppNotificationCategory.incomingReaction"
case infoOrErrorMessage = "Signal.AppNotificationCategory.infoOrErrorMessage"
case missedCallWithActions = "Signal.AppNotificationCategory.missedCallWithActions"
case missedCallWithoutActions = "Signal.AppNotificationCategory.missedCall"
@ -179,6 +180,7 @@ public enum AppNotificationCategory: String, CaseIterable {
.incomingMessageFromNoLongerVerifiedIdentity,
.incomingReactionWithActions_CanReply,
.incomingReactionWithActions_CannotReply,
.incomingReactionWithoutActions,
.infoOrErrorMessage,
.missedCallWithActions,
.missedCallWithoutActions,
@ -212,7 +214,8 @@ public enum AppNotificationCategory: String, CaseIterable {
case .incomingReactionWithActions_CannotReply:
return [.markAsRead]
case .incomingMessageWithoutActions,
.incomingMessageFromNoLongerVerifiedIdentity:
.incomingMessageFromNoLongerVerifiedIdentity,
.incomingReactionWithoutActions:
return []
case .infoOrErrorMessage:
return []
@ -272,8 +275,8 @@ public class NotificationPresenterImpl: NotificationPresenter {
return preferences.notificationPreviewType(tx: tx)
}
static func shouldShowActions(for previewType: NotificationType) -> Bool {
return previewType == .namePreview
private static func shouldShowActions(for previewType: NotificationType, tx: DBReadTransaction) -> Bool {
return previewType == .namePreview && !ScreenLock.shared.isScreenLockEnabled(tx: tx)
}
// MARK: - Notifications Permissions
@ -335,7 +338,7 @@ public class NotificationPresenterImpl: NotificationPresenter {
return CallPreview(
notificationTitle: $0,
threadIdentifier: thread.rawValue.uniqueId,
shouldShowActions: Self.shouldShowActions(for: previewType),
shouldShowActions: Self.shouldShowActions(for: previewType, tx: tx),
)
}
}
@ -636,7 +639,6 @@ public class NotificationPresenterImpl: NotificationPresenter {
guard previewType == .namePreview else {
return
}
owsPrecondition(Self.shouldShowActions(for: previewType))
let notificationTitle = self.notificationTitle(
for: notifiableThread,
@ -700,7 +702,6 @@ public class NotificationPresenterImpl: NotificationPresenter {
guard previewType == .namePreview else {
return
}
owsPrecondition(Self.shouldShowActions(for: previewType))
let notificationTitle = self.notificationTitle(
for: notifiableThread,
@ -897,7 +898,7 @@ public class NotificationPresenterImpl: NotificationPresenter {
let category: AppNotificationCategory
if didIdentityChange {
category = .incomingMessageFromNoLongerVerifiedIdentity
} else if !Self.shouldShowActions(for: previewType) {
} else if !Self.shouldShowActions(for: previewType, tx: transaction) {
category = .incomingMessageWithoutActions
} else if incomingMessage.isGroupStoryReply {
category = .incomingGroupStoryReply
@ -956,7 +957,6 @@ public class NotificationPresenterImpl: NotificationPresenter {
guard previewType == .namePreview else {
return
}
owsPrecondition(Self.shouldShowActions(for: previewType))
let notificationTitle = self.notificationTitle(
for: notifiableThread,
@ -1033,6 +1033,8 @@ public class NotificationPresenterImpl: NotificationPresenter {
let category: AppNotificationCategory
if didIdentityChange {
category = .incomingMessageFromNoLongerVerifiedIdentity
} else if !Self.shouldShowActions(for: previewType, tx: transaction) {
category = .incomingReactionWithoutActions
} else {
category = (
thread.canSendChatMessagesToThread()

4
SignalServiceKit/Notifications/UserNotificationsPresenter.swift
View File

@ -143,7 +143,8 @@ public class UserNotificationPresenter {
|| category == .incomingMessageWithActions_CannotReply
|| category == .incomingMessageWithoutActions
|| category == .incomingReactionWithActions_CanReply
|| category == .incomingReactionWithActions_CannotReply,
|| category == .incomingReactionWithActions_CannotReply
|| category == .incomingReactionWithoutActions,
)
if checkForCancel, !isMainAppAndActive, hasReceivedSyncMessageRecentlyWithSneakyTransaction {
assert(userInfo.threadId != nil)
@ -239,6 +240,7 @@ public class UserNotificationPresenter {
.incomingMessageWithoutActions,
.incomingReactionWithActions_CanReply,
.incomingReactionWithActions_CannotReply,
.incomingReactionWithoutActions,
.infoOrErrorMessage,
.pollEndNotification,
.pollVoteNotification: