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

Debug

This commit is contained in:
Niels Andriesse 2021-07-23 09:00:28 +10:00
parent 9d605c03f0
commit 6bf25e28f7
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
SessionMessagingKit/Database/Storage+Contacts.swift
View File

@ -32,11 +32,6 @@ extension Storage {
OWSFileSystem.deleteFileIfExists(path)
}
}
// Download new profile picture if needed
if contact.profilePictureURL != nil && contact.profilePictureURL != oldContact?.profilePictureURL {
let profileManager = SSKEnvironment.shared.profileManager
profileManager.downloadAvatar(forUserProfile: contact)
}
// Post notification
let notificationCenter = NotificationCenter.default
notificationCenter.post(name: .contactUpdated, object: contact.sessionID)

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

@ -183,10 +183,6 @@ extension MessageReceiver {
// Profile
updateProfileIfNeeded(publicKey: userPublicKey, name: message.displayName, profilePictureURL: message.profilePictureURL,
profileKey: given(message.profileKey) { OWSAES256Key(data: $0)! }, sentTimestamp: message.sentTimestamp!, transaction: transaction)
transaction.addCompletionQueue(DispatchQueue.main) {
let userProfile = storage.getUser() ?? Contact(sessionID: userPublicKey)
SSKEnvironment.shared.profileManager.downloadAvatar(forUserProfile: userProfile)
}
// Initial configuration sync
if !UserDefaults.standard[.hasSyncedInitialConfiguration] {
UserDefaults.standard[.hasSyncedInitialConfiguration] = true
@ -320,8 +316,8 @@ extension MessageReceiver {
}
}
// Profile picture & profile key
if let profileKey = profileKey, let profilePictureURL = profilePictureURL, profileKey.keyData.count == kAES256_KeyByteLength,
profileKey != contact.profileEncryptionKey {
if let profileKey = profileKey, let profilePictureURL = profilePictureURL,
profileKey.keyData.count == kAES256_KeyByteLength, profileKey != contact.profileEncryptionKey {
let shouldUpdate: Bool
if isCurrentUser {
shouldUpdate = given(userDefaults[.lastProfilePictureUpdate]) { sentTimestamp > UInt64($0.timeIntervalSince1970 * 1000) } ?? true
@ -338,6 +334,10 @@ extension MessageReceiver {
}
// Persist changes
Storage.shared.setContact(contact, using: transaction)
// Download the profile picture if needed
transaction.addCompletionQueue(DispatchQueue.main) {
SSKEnvironment.shared.profileManager.downloadAvatar(forUserProfile: contact)
}
}