From 140676fdaf3dcc6b9dc53312fec20c9ec8f2fc2b Mon Sep 17 00:00:00 2001 From: ryanzhao Date: Tue, 14 Sep 2021 14:32:39 +1000 Subject: [PATCH] fix expiration sync messages show display name rather than "You" --- .../Sending & Receiving/MessageReceiver+Handling.swift | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift b/SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift index 72e7a94a8..e1707284c 100644 --- a/SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift +++ b/SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift @@ -145,7 +145,10 @@ extension MessageReceiver { guard let thread = threadOrNil else { return } let configuration = OWSDisappearingMessagesConfiguration(threadId: thread.uniqueId!, enabled: true, durationSeconds: duration) configuration.save(with: transaction) - let senderDisplayName = Storage.shared.getContact(with: senderPublicKey)?.displayName(for: .regular) ?? senderPublicKey + var senderDisplayName: String? = nil + if senderPublicKey != getUserHexEncodedPublicKey() { + senderDisplayName = Storage.shared.getContact(with: senderPublicKey)?.displayName(for: .regular) ?? senderPublicKey + } let message = OWSDisappearingConfigurationUpdateInfoMessage(timestamp: messageSentTimestamp, thread: thread, configuration: configuration, createdByRemoteName: senderDisplayName, createdInExistingGroup: false) message.save(with: transaction) @@ -165,7 +168,10 @@ extension MessageReceiver { guard let thread = threadOrNil else { return } let configuration = OWSDisappearingMessagesConfiguration(threadId: thread.uniqueId!, enabled: false, durationSeconds: 24 * 60 * 60) configuration.save(with: transaction) - let senderDisplayName = Storage.shared.getContact(with: senderPublicKey)?.displayName(for: .regular) ?? senderPublicKey + var senderDisplayName: String? = nil + if senderPublicKey != getUserHexEncodedPublicKey() { + senderDisplayName = Storage.shared.getContact(with: senderPublicKey)?.displayName(for: .regular) ?? senderPublicKey + } let message = OWSDisappearingConfigurationUpdateInfoMessage(timestamp: messageSentTimestamp, thread: thread, configuration: configuration, createdByRemoteName: senderDisplayName, createdInExistingGroup: false) message.save(with: transaction)