From f93820362c4cda6e92bcbf3d9d601749632068b7 Mon Sep 17 00:00:00 2001 From: ryanzhao Date: Wed, 17 Aug 2022 14:19:14 +1000 Subject: [PATCH] add silence audio file --- Session.xcodeproj/project.pbxproj | 4 ++++ .../messageReceivedSounds/silence.aiff | Bin 0 -> 1656 bytes .../Database/Models/Interaction.swift | 2 +- SessionMessagingKit/Utilities/Preferences.swift | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 Session/Meta/AudioFiles/messageReceivedSounds/silence.aiff diff --git a/Session.xcodeproj/project.pbxproj b/Session.xcodeproj/project.pbxproj index e77691409..83eaaa839 100644 --- a/Session.xcodeproj/project.pbxproj +++ b/Session.xcodeproj/project.pbxproj @@ -126,6 +126,7 @@ 7B1D74B027C365960030B423 /* Timer+MainThread.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B1D74AF27C365960030B423 /* Timer+MainThread.swift */; }; 7B4C75CB26B37E0F0000AC89 /* UnsendRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B4C75CA26B37E0F0000AC89 /* UnsendRequest.swift */; }; 7B4C75CD26BB92060000AC89 /* DeletedMessageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B4C75CC26BB92060000AC89 /* DeletedMessageView.swift */; }; + 7B50D64D28AC7CF80086CCEC /* silence.aiff in Resources */ = {isa = PBXBuildFile; fileRef = 7B50D64C28AC7CF80086CCEC /* silence.aiff */; }; 7B7CB189270430D20079FF93 /* CallMessageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B7CB188270430D20079FF93 /* CallMessageView.swift */; }; 7B7CB18B270591630079FF93 /* ShareLogsModal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B7CB18A270591630079FF93 /* ShareLogsModal.swift */; }; 7B7CB18E270D066F0079FF93 /* IncomingCallBanner.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B7CB18D270D066F0079FF93 /* IncomingCallBanner.swift */; }; @@ -1148,6 +1149,7 @@ 7B2DB2AD26F1B0FF0035B509 /* si */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = si; path = si.lproj/Localizable.strings; sourceTree = ""; }; 7B4C75CA26B37E0F0000AC89 /* UnsendRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnsendRequest.swift; sourceTree = ""; }; 7B4C75CC26BB92060000AC89 /* DeletedMessageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeletedMessageView.swift; sourceTree = ""; }; + 7B50D64C28AC7CF80086CCEC /* silence.aiff */ = {isa = PBXFileReference; lastKnownFileType = audio.aiff; path = silence.aiff; sourceTree = ""; }; 7B7CB188270430D20079FF93 /* CallMessageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CallMessageView.swift; sourceTree = ""; }; 7B7CB18A270591630079FF93 /* ShareLogsModal.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareLogsModal.swift; sourceTree = ""; }; 7B7CB18D270D066F0079FF93 /* IncomingCallBanner.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IncomingCallBanner.swift; sourceTree = ""; }; @@ -2036,6 +2038,7 @@ 34074FC5203E5435004596AE /* messageReceivedSounds */ = { isa = PBXGroup; children = ( + 7B50D64C28AC7CF80086CCEC /* silence.aiff */, 45B74A5B2044AAB300CD42F8 /* aurora-quiet.aifc */, 45B74A6F2044AAB500CD42F8 /* aurora.aifc */, 45B74A5F2044AAB400CD42F8 /* bamboo-quiet.aifc */, @@ -4492,6 +4495,7 @@ 45B74A872044AAB600CD42F8 /* complete-quiet.aifc in Resources */, 45B74A772044AAB600CD42F8 /* hello.aifc in Resources */, 45B74A7C2044AAB600CD42F8 /* hello-quiet.aifc in Resources */, + 7B50D64D28AC7CF80086CCEC /* silence.aiff in Resources */, 45B74A792044AAB600CD42F8 /* input.aifc in Resources */, C3CA3ABE255CDB0D00F4C6D4 /* portuguese.txt in Resources */, 45B74A8C2044AAB600CD42F8 /* input-quiet.aifc in Resources */, diff --git a/Session/Meta/AudioFiles/messageReceivedSounds/silence.aiff b/Session/Meta/AudioFiles/messageReceivedSounds/silence.aiff new file mode 100644 index 0000000000000000000000000000000000000000..c968a3c031567cca5a8147684f482b7045df8598 GIT binary patch literal 1656 zcmZ?s5AtPTV2g9~baQj|_XV;UgcukZ7?>p(1RS`30l6R$9PH-;RAm9-jgq4wFd71* YAut*Oqai?C2za^}D}Yo2X=aEH0KSe0cK`qY literal 0 HcmV?d00001 diff --git a/SessionMessagingKit/Database/Models/Interaction.swift b/SessionMessagingKit/Database/Models/Interaction.swift index d94708b0d..ccd696ad9 100644 --- a/SessionMessagingKit/Database/Models/Interaction.swift +++ b/SessionMessagingKit/Database/Models/Interaction.swift @@ -582,7 +582,7 @@ public extension Interaction { func notificationIdentifier(isBackgroundPoll: Bool) -> String { // When the app is in the background we want the notifications to be grouped to prevent spam - guard isBackgroundPoll else { return threadId } + guard !isBackgroundPoll else { return threadId } return "\(threadId)-\(id ?? 0)" } diff --git a/SessionMessagingKit/Utilities/Preferences.swift b/SessionMessagingKit/Utilities/Preferences.swift index ff19030cf..ca164888e 100644 --- a/SessionMessagingKit/Utilities/Preferences.swift +++ b/SessionMessagingKit/Utilities/Preferences.swift @@ -224,7 +224,7 @@ public enum Preferences { // Other case .messageSent: return "message_sent.aiff" - case .none: return nil + case .none: return "silence.aiff" } }