From 9bf80a215f9bc4a7b0fa6a54986dacfe343dd251 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 23 Aug 2017 15:52:14 -0400 Subject: [PATCH] Don't add avatar to new contacts. // FREEBIE --- Signal/src/Profiles/OWSProfileManager.h | 4 ---- Signal/src/Profiles/OWSProfileManager.m | 9 --------- Signal/src/ViewControllers/ContactsViewHelper.m | 1 - 3 files changed, 14 deletions(-) diff --git a/Signal/src/Profiles/OWSProfileManager.h b/Signal/src/Profiles/OWSProfileManager.h index 9183fba27..892755f63 100644 --- a/Signal/src/Profiles/OWSProfileManager.h +++ b/Signal/src/Profiles/OWSProfileManager.h @@ -69,10 +69,6 @@ extern const NSUInteger kOWSProfileManager_MaxAvatarDiameter; - (nullable UIImage *)profileAvatarForRecipientId:(NSString *)recipientId; -// Reads raw avatar data from disk if available. Uncached, so shouldn't be used frequently, -// but useful to get the raw image data for populating cnContact.imageData without lossily re-encoding. -- (nullable NSData *)profileAvatarDataForRecipientId:(NSString *)recipientId; - - (void)refreshProfileForRecipientId:(NSString *)recipientId; - (void)updateProfileForRecipientId:(NSString *)recipientId diff --git a/Signal/src/Profiles/OWSProfileManager.m b/Signal/src/Profiles/OWSProfileManager.m index 7f9dddb9b..831543844 100644 --- a/Signal/src/Profiles/OWSProfileManager.m +++ b/Signal/src/Profiles/OWSProfileManager.m @@ -912,15 +912,6 @@ const NSUInteger kOWSProfileManager_MaxAvatarDiameter = 640; } } -- (nullable NSData *)profileAvatarDataForRecipientId:(NSString *)recipientId -{ - UserProfile *userProfile = [self getOrBuildUserProfileForRecipientId:recipientId]; - if (userProfile.avatarFileName.length > 0) { - return [self loadProfileDataWithFilename:userProfile.avatarFileName]; - } - return nil; -} - - (nullable UIImage *)profileAvatarForRecipientId:(NSString *)recipientId { OWSAssert(recipientId.length > 0); diff --git a/Signal/src/ViewControllers/ContactsViewHelper.m b/Signal/src/ViewControllers/ContactsViewHelper.m index d4c14a624..a2fe54eb4 100644 --- a/Signal/src/ViewControllers/ContactsViewHelper.m +++ b/Signal/src/ViewControllers/ContactsViewHelper.m @@ -413,7 +413,6 @@ NS_ASSUME_NONNULL_BEGIN newContact.phoneNumbers = @[ labeledPhoneNumber ]; newContact.givenName = [self.profileManager profileNameForRecipientId:recipientId]; - newContact.imageData = [self.profileManager profileAvatarDataForRecipientId:recipientId]; contactViewController = [CNContactViewController viewControllerForNewContact:newContact]; }