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

Fix multi device display name updating issue

This commit is contained in:
Niels Andriesse 2021-03-04 09:58:19 +11:00
parent 105b54d84e
commit ea43d68c72
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift
View File

@ -177,16 +177,20 @@ extension MessageReceiver {
// MARK: - Configuration Messages
private static func handleConfigurationMessage(_ message: ConfigurationMessage, using transaction: Any) {
guard message.sender == getUserHexEncodedPublicKey() else { return }
let userPublicKey = getUserHexEncodedPublicKey()
guard message.sender == userPublicKey else { return }
SNLog("Configuration message received.")
let storage = SNMessagingKitConfiguration.shared.storage
let transaction = transaction as! YapDatabaseReadWriteTransaction
let userDefaults = UserDefaults.standard
// Profile
let userProfile = storage.getUserProfile(using: transaction)
if let displayName = message.displayName {
let user = storage.getUser() ?? Contact(sessionID: userPublicKey)
if let name = message.displayName {
let shouldUpdate = given(userDefaults[.lastDisplayNameUpdate]) { message.sentTimestamp! > UInt64($0.timeIntervalSince1970 * 1000) } ?? true
if shouldUpdate {
userProfile.profileName = displayName
userProfile.profileName = name
user.name = name
userDefaults[.lastDisplayNameUpdate] = Date(timeIntervalSince1970: TimeInterval(message.sentTimestamp! / 1000))
}
}
@ -194,11 +198,14 @@ extension MessageReceiver {
let shouldUpdate = given(userDefaults[.lastProfilePictureUpdate]) { message.sentTimestamp! > UInt64($0.timeIntervalSince1970 * 1000) } ?? true
if shouldUpdate {
userProfile.avatarUrlPath = profilePictureURL
user.profilePictureURL = profilePictureURL
userProfile.profileKey = OWSAES256Key(data: profileKeyAsData)
user.profilePictureEncryptionKey = OWSAES256Key(data: profileKeyAsData)
userDefaults[.lastProfilePictureUpdate] = Date(timeIntervalSince1970: TimeInterval(message.sentTimestamp! / 1000))
}
}
userProfile.save(with: transaction)
Storage.shared.setContact(user, using: transaction)
transaction.addCompletionQueue(DispatchQueue.main) {
SSKEnvironment.shared.profileManager.downloadAvatar(for: userProfile)
}