diff --git a/Session/Meta/Images.xcassets/Session/NotifyMentions.imageset/Contents.json b/Session/Meta/Images.xcassets/Session/NotifyMentions.imageset/Contents.json index 60527f39d..87de6e895 100644 --- a/Session/Meta/Images.xcassets/Session/NotifyMentions.imageset/Contents.json +++ b/Session/Meta/Images.xcassets/Session/NotifyMentions.imageset/Contents.json @@ -1,19 +1,8 @@ { "images" : [ { - "filename" : "ic_notification_mentions.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "ic_notification_mentions-1.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "ic_notification_mentions-2.png", - "idiom" : "universal", - "scale" : "3x" + "filename" : "ic_notifications_mentions.pdf", + "idiom" : "universal" } ], "info" : { diff --git a/Session/Meta/Images.xcassets/Session/NotifyMentions.imageset/ic_notification_mentions-1.png b/Session/Meta/Images.xcassets/Session/NotifyMentions.imageset/ic_notification_mentions-1.png deleted file mode 100644 index fe39a8b35..000000000 Binary files a/Session/Meta/Images.xcassets/Session/NotifyMentions.imageset/ic_notification_mentions-1.png and /dev/null differ diff --git a/Session/Meta/Images.xcassets/Session/NotifyMentions.imageset/ic_notification_mentions-2.png b/Session/Meta/Images.xcassets/Session/NotifyMentions.imageset/ic_notification_mentions-2.png deleted file mode 100644 index fe39a8b35..000000000 Binary files a/Session/Meta/Images.xcassets/Session/NotifyMentions.imageset/ic_notification_mentions-2.png and /dev/null differ diff --git a/Session/Meta/Images.xcassets/Session/NotifyMentions.imageset/ic_notification_mentions.png b/Session/Meta/Images.xcassets/Session/NotifyMentions.imageset/ic_notification_mentions.png deleted file mode 100644 index fe39a8b35..000000000 Binary files a/Session/Meta/Images.xcassets/Session/NotifyMentions.imageset/ic_notification_mentions.png and /dev/null differ diff --git a/Session/Meta/Images.xcassets/Session/NotifyMentions.imageset/ic_notifications_mentions.pdf b/Session/Meta/Images.xcassets/Session/NotifyMentions.imageset/ic_notifications_mentions.pdf new file mode 100644 index 000000000..4dae2b8b6 Binary files /dev/null and b/Session/Meta/Images.xcassets/Session/NotifyMentions.imageset/ic_notifications_mentions.pdf differ diff --git a/SessionNotificationServiceExtension/NotificationServiceExtension.swift b/SessionNotificationServiceExtension/NotificationServiceExtension.swift index 35cd7f1ac..2cb60549b 100644 --- a/SessionNotificationServiceExtension/NotificationServiceExtension.swift +++ b/SessionNotificationServiceExtension/NotificationServiceExtension.swift @@ -61,7 +61,7 @@ public final class NotificationServiceExtension : UNNotificationServiceExtension if let thread = TSThread.fetch(uniqueId: threadID, transaction: transaction), let group = thread as? TSGroupThread, group.groupModel.groupType == .closedGroup { // Should always be true because we don't get PNs for open groups senderDisplayName = String(format: NotificationStrings.incomingGroupMessageTitleFormat, senderDisplayName, group.groupModel.groupName ?? MessageStrings.newGroupDefaultTitle) - if let messageBody = tsIncomingMessage.previewText(with: transaction).filterForDisplay, !messageBody.contains("@\(userPublicKey)") && group.isOnlyNotifyMentions { + if let messageBody = tsIncomingMessage.previewText(with: transaction).filterForDisplay, !messageBody.contains("@\(userPublicKey)") && group.isOnlyNotifyingForMentions { // Ignore PNs if the group is set to only notify mentions return self.completeSilenty() }