diff --git a/SignalMessaging/profiles/OWSProfileManager.h b/SignalMessaging/profiles/OWSProfileManager.h index ee3b64f51..a0b5a379b 100644 --- a/SignalMessaging/profiles/OWSProfileManager.h +++ b/SignalMessaging/profiles/OWSProfileManager.h @@ -83,8 +83,6 @@ extern const NSUInteger kOWSProfileManager_MaxAvatarDiameter; profileNameEncrypted:(nullable NSData *)profileNameEncrypted avatarUrlPath:(nullable NSString *)avatarUrlPath; -- (void)updateProfileForContactWithID:(NSString *)contactID displayName:(NSString *)displayName with:(YapDatabaseReadWriteTransaction *)transaction; - #pragma mark - User Interface - (void)presentAddThreadToProfileWhitelist:(TSThread *)thread diff --git a/SignalMessaging/profiles/OWSProfileManager.m b/SignalMessaging/profiles/OWSProfileManager.m index adf81aa0f..fb944741f 100644 --- a/SignalMessaging/profiles/OWSProfileManager.m +++ b/SignalMessaging/profiles/OWSProfileManager.m @@ -975,7 +975,7 @@ typedef void (^ProfileManagerFailureBlock)(NSError *error); dispatch_async(dispatch_get_main_queue(), ^{ [self.udManager setUnidentifiedAccessMode:UnidentifiedAccessModeUnknown recipientId:recipientId]; - [userProfile updateWithProfileName:userProfile.profileName avatarUrlPath:avatarURL dbConnection:self.dbConnection completion:^{ + [userProfile updateWithAvatarUrlPath:avatarURL avatarFileName:nil dbConnection:self.dbConnection completion:^{ [self downloadAvatarForUserProfile:userProfile]; }]; // [self fetchProfileForRecipientId:recipientId]; diff --git a/SignalMessaging/profiles/OWSUserProfile.m b/SignalMessaging/profiles/OWSUserProfile.m index 26e20ee55..6eb0a0e1a 100644 --- a/SignalMessaging/profiles/OWSUserProfile.m +++ b/SignalMessaging/profiles/OWSUserProfile.m @@ -351,7 +351,7 @@ NSString *const kLocalProfileUniqueId = @"kLocalProfileUniqueId"; { [self applyChanges:^(OWSUserProfile *userProfile) { [userProfile setProfileKey:profileKey]; - [userProfile setProfileName:nil]; + // [userProfile setProfileName:nil]; - Loki disabled until we include profile name inside the encrypted profile from the url // Always setAvatarUrlPath: before you setAvatarFileName: since // setAvatarUrlPath: may clear the avatar filename. [userProfile setAvatarUrlPath:nil];