From afeabf0fe95648ed7e3ffeeec40e65bc649562d0 Mon Sep 17 00:00:00 2001 From: nielsandriesse Date: Wed, 24 Feb 2021 09:53:17 +1100 Subject: [PATCH] Potentially fix race condition --- Podfile.lock | 2 +- .../Sending & Receiving/MessageReceiver+Handling.swift | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Podfile.lock b/Podfile.lock index 3fc70a96b..503cc3094 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -218,4 +218,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 2fca3f32c171e1324c9e3809b96a32d4a929d05c -COCOAPODS: 1.10.0.rc.1 +COCOAPODS: 1.10.1 diff --git a/SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift b/SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift index 0e4051051..8ffbac115 100644 --- a/SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift +++ b/SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift @@ -153,7 +153,7 @@ extension MessageReceiver { let shouldUpdate = given(userDefaults[.lastDisplayNameUpdate]) { message.sentTimestamp! > UInt64($0.timeIntervalSince1970 * 1000) } ?? true if shouldUpdate { userProfile.profileName = displayName - userDefaults[.lastDisplayNameUpdate] = Date() + userDefaults[.lastDisplayNameUpdate] = Date(timeIntervalSince1970: TimeInterval(message.sentTimestamp! / 1000)) } } if let profilePictureURL = message.profilePictureURL, let profileKeyAsData = message.profileKey { @@ -161,7 +161,7 @@ extension MessageReceiver { if shouldUpdate { userProfile.avatarUrlPath = profilePictureURL userProfile.profileKey = OWSAES256Key(data: profileKeyAsData) - userDefaults[.lastProfilePictureUpdate] = Date() + userDefaults[.lastProfilePictureUpdate] = Date(timeIntervalSince1970: TimeInterval(message.sentTimestamp! / 1000)) } } userProfile.save(with: transaction)