oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Respect mute settings in NSE

This commit is contained in:
nielsandriesse 2021-05-05 08:47:33 +10:00
parent 82eb5e115d
commit 4f80722b37
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
SessionNotificationServiceExtension/NotificationServiceExtension.swift
View File

@ -20,7 +20,7 @@ public final class NotificationServiceExtension : UNNotificationServiceExtension
if let sharedUserDefaults = UserDefaults(suiteName: "group.com.loki-project.loki-messenger") { if let sharedUserDefaults = UserDefaults(suiteName: "group.com.loki-project.loki-messenger") {
isMainAppAndActive = sharedUserDefaults.bool(forKey: "isMainAppActive") isMainAppAndActive = sharedUserDefaults.bool(forKey: "isMainAppActive")
} }
guard !isMainAppAndActive else { return self.handleFailure(for: notificationContent!) } guard !isMainAppAndActive else { return self.completeSilenty() }
// Perform main setup // Perform main setup
DispatchQueue.main.sync { self.setUpIfNecessary() { } } DispatchQueue.main.sync { self.setUpIfNecessary() { } }
@ -45,7 +45,11 @@ public final class NotificationServiceExtension : UNNotificationServiceExtension
guard let tsIncomingMessage = TSIncomingMessage.fetch(uniqueId: tsIncomingMessageID, transaction: transaction) else { guard let tsIncomingMessage = TSIncomingMessage.fetch(uniqueId: tsIncomingMessageID, transaction: transaction) else {
return self.handleFailure(for: notificationContent) return self.handleFailure(for: notificationContent)
} }
let threadID = tsIncomingMessage.thread(with: transaction).uniqueId! let thread = tsIncomingMessage.thread(with: transaction)
if thread.isMuted {
return self.completeSilenty()
}
let threadID = thread.uniqueId!
userInfo[NotificationServiceExtension.threadIdKey] = threadID userInfo[NotificationServiceExtension.threadIdKey] = threadID
snippet = tsIncomingMessage.previewText(with: transaction).filterForDisplay?.replacingMentions(for: threadID, using: transaction) snippet = tsIncomingMessage.previewText(with: transaction).filterForDisplay?.replacingMentions(for: threadID, using: transaction)
?? "You've got a new message" ?? "You've got a new message"
@ -58,9 +62,9 @@ public final class NotificationServiceExtension : UNNotificationServiceExtension
// in some cases we need to send messages (e.g. our sender key) to a number of other users. // in some cases we need to send messages (e.g. our sender key) to a number of other users.
switch closedGroupControlMessage.kind { switch closedGroupControlMessage.kind {
case .new(_, let name, _, _, _): snippet = "\(senderDisplayName) added you to \(name)" case .new(_, let name, _, _, _): snippet = "\(senderDisplayName) added you to \(name)"
default: return self.handleFailure(for: notificationContent) default: return self.completeSilenty()
} }
default: return self.handleFailure(for: notificationContent) default: return self.completeSilenty()
} }
notificationContent.userInfo = userInfo notificationContent.userInfo = userInfo
notificationContent.badge = 1 notificationContent.badge = 1
@ -171,7 +175,7 @@ public final class NotificationServiceExtension : UNNotificationServiceExtension
AppReadiness.setAppIsReady() AppReadiness.setAppIsReady()
} }
private func completeSilenty() { private func completeSilenty() {
contentHandler!(.init()) contentHandler!(.init())
} }