Fix profile name being cleared when setting profile picture.

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

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];

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];