oxen-io/session-ios
1
0
Fork 0
mirror of https://github.com/oxen-io/session-ios.git synced 2023-12-13 21:30:14 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'mkirk/profile-avatar-in-contact-picker'

Browse source
This commit is contained in:
Michael Kirk 2018-05-17 11:08:35 -04:00
parent 87a25804d7 2098ec570b
commit 8d1d62b610
2 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Signal/src/views/ContactCell.swift
View file

@ -92,7 +92,7 @@ class ContactCell: UITableViewCell {
diameter: ContactCell.kAvatarDiameter,
contactsManager: contactsManager)
contactImageView.image = avatarBuilder.buildDefaultImage()
contactImageView.image = avatarBuilder.build()
}
}

16
SignalMessaging/contacts/OWSContactsManager.m
View file

@ -724,6 +724,10 @@ NSString *const OWSContactsManagerSignalAccountsDidChangeNotification
- (UIImage *_Nullable)systemContactImageForPhoneIdentifier:(NSString *_Nullable)identifier
{
if (identifier.length == 0) {
return nil;
}
Contact *contact = self.allContactsMap[identifier];
if (!contact) {
// If we haven't loaded system contacts yet, we may have a cached
@ -736,16 +740,28 @@ NSString *const OWSContactsManagerSignalAccountsDidChangeNotification
- (nullable UIImage *)profileImageForPhoneIdentifier:(nullable NSString *)identifier
{
if (identifier.length == 0) {
return nil;
}
return [self.profileManager profileAvatarForRecipientId:identifier];
}
- (nullable NSData *)profileImageDataForPhoneIdentifier:(nullable NSString *)identifier
{
if (identifier.length == 0) {
return nil;
}
return [self.profileManager profileAvatarDataForRecipientId:identifier];
}
- (UIImage *_Nullable)imageForPhoneIdentifier:(NSString *_Nullable)identifier
{
if (identifier.length == 0) {
return nil;
}
// Prefer the contact image from the local address book if available
UIImage *_Nullable image = [self systemContactImageForPhoneIdentifier:identifier];