Rework how user profiles are updated and persisted. Persist other user’s profiles. Load and cache other user’s profile avatars.

// FREEBIE

SignalServiceKit/src/Profiles/OWSProfilesManager.h

@@ -17,17 +17,22 @@ extern NSString *const kNSNotificationName_OtherUsersProfileDidChange;
 #pragma mark - Local Profile
 
 @property (atomic, readonly) NSData *localProfileKey;
-@property (atomic, nullable, readonly) NSString *localProfileName;
+
-@property (atomic, nullable, readonly) UIImage *localProfileAvatarImage;
+// These two methods should only be called from the main thread.
+- (NSString *)localProfileName;
+- (UIImage *)localProfileAvatarImage;
 
 // This method is used to update the "local profile" state on the client
 // and the service.  Client state is only updated if service state is
 // successfully updated.
-- (void)updateLocalProfileName:(nullable NSString *)localProfileName
+//
-       localProfileAvatarImage:(nullable UIImage *)localProfileAvatarImage
+// This method should only be called from the main thread.
+- (void)updateLocalProfileName:(nullable NSString *)profileName
+                   avatarImage:(nullable UIImage *)avatarImage
                        success:(void (^)())successBlock
                        failure:(void (^)())failureBlock;
 
+// This method should only be called from the main thread.
 - (void)appLaunchDidBegin;
 
 #pragma mark - Profile Whitelist
@@ -52,6 +57,8 @@ extern NSString *const kNSNotificationName_OtherUsersProfileDidChange;
 
 - (nullable UIImage *)profileAvatarForRecipientId:(NSString *)recipientId;
 
+- (void)fetchProfileForRecipientId:(NSString *)recipientId;
+
 @end
 
 NS_ASSUME_NONNULL_END

SignalServiceKit/src/Profiles/OWSProfilesManager.m

@@ -4,22 +4,31 @@
 
 #import "OWSProfilesManager.h"
 #import "NSData+hexString.h"
+#import "NSDate+OWS.h"
 #import "OWSMessageSender.h"
 #import "SecurityUtils.h"
+#import "TSAccountManager.h"
 #import "TSStorageManager.h"
 #import "TSYapDatabaseObject.h"
 #import "TextSecureKitEnv.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
-@class TSThread;
+@interface UserProfile : TSYapDatabaseObject
 
-@interface AvatarMetadata : TSYapDatabaseObject
+@property (nonatomic, readonly) NSString *recipientId;
+@property (nonatomic, nullable) NSString *profileName;
+@property (nonatomic, nullable) NSString *avatarUrl;
+@property (nonatomic, nullable) NSString *avatarDigest;
 
 // This filename is relative to OWSProfilesManager.profileAvatarsDirPath.
-@property (nonatomic, readonly) NSString *fileName;
+@property (nonatomic, nullable) NSString *avatarFileName;
-@property (nonatomic, readonly) NSString *avatarUrl;
+
-@property (nonatomic, readonly) NSString *avatarDigest;
+// This should reflect when either:
+//
+// * The last successful update was started.
+// * The in-flight update was started.
+@property (nonatomic, nullable) NSDate *lastUpdateDate;
 
 - (instancetype)init NS_UNAVAILABLE;
 
@@ -27,46 +36,49 @@ NS_ASSUME_NONNULL_BEGIN
 
 #pragma mark -
 
-@implementation AvatarMetadata
+@implementation UserProfile
 
-+ (NSString *)collection
+- (instancetype)initWithRecipientId:(NSString *)recipientId
+                        profileName:(NSString *_Nullable)profileName
+                          avatarUrl:(NSString *_Nullable)avatarUrl
+                       avatarDigest:(NSString *_Nullable)avatarDigest
+                     avatarFileName:(NSString *_Nullable)avatarFileName
 {
-    return @"AvatarMetadata";
+    self = [super initWithUniqueId:recipientId];
-}
-
-- (instancetype)initWithFileName:(NSString *)fileName
-                       avatarUrl:(NSString *)avatarUrl
-                    avatarDigest:(NSString *)avatarDigest
-{
-    // TODO: Local filenames for avatars are guaranteed to be unique.
-    self = [super initWithUniqueId:fileName];
 
     if (!self) {
         return self;
     }
 
-    OWSAssert(fileName.length > 0);
+    OWSAssert(recipientId.length > 0);
-    OWSAssert(avatarUrl.length > 0);
+    _recipientId = recipientId;
-    OWSAssert(avatarDigest.length > 0);
+    _profileName = profileName;
-    _fileName = fileName;
     _avatarUrl = avatarUrl;
     _avatarDigest = avatarDigest;
+    _avatarFileName = avatarFileName;
 
     return self;
 }
 
++ (NSString *)collection
+{
+    return @"UserProfile";
+}
 
 #pragma mark - NSObject
 
-- (BOOL)isEqual:(AvatarMetadata *)other
+- (BOOL)isEqual:(UserProfile *)other
 {
-    return ([other isKindOfClass:[AvatarMetadata class]] && [self.fileName isEqualToString:other.fileName] &&
+    return ([other isKindOfClass:[UserProfile class]] && [self.recipientId isEqualToString:other.recipientId] &&
-        [self.avatarUrl isEqualToString:other.avatarUrl] && [self.avatarDigest isEqualToString:other.avatarDigest]);
+        [self.profileName isEqualToString:other.profileName] && [self.avatarUrl isEqualToString:other.avatarUrl] &&
+        [self.avatarDigest isEqualToString:other.avatarDigest] &&
+        [self.avatarFileName isEqualToString:other.avatarFileName]);
 }
 
 - (NSUInteger)hash
 {
-    return self.fileName.hash ^ self.avatarUrl.hash ^ self.avatarDigest.hash;
+    return self.recipientId.hash ^ self.profileName.hash ^ self.avatarUrl.hash ^ self.avatarDigest.hash
+        ^ self.avatarFileName.hash;
 }
 
 @end
@@ -79,19 +91,12 @@ NSString *const kNSNotificationName_OtherUsersProfileDidChange = @"kNSNotificati
 NSString *const kOWSProfilesManager_Collection = @"kOWSProfilesManager_Collection";
 // This key is used to persist the local user's profile key.
 NSString *const kOWSProfilesManager_LocalProfileSecretKey = @"kOWSProfilesManager_LocalProfileSecretKey";
-NSString *const kOWSProfilesManager_LocalProfileNameKey = @"kOWSProfilesManager_LocalProfileNameKey";
-NSString *const kOWSProfilesManager_LocalProfileAvatarMetadataKey
-    = @"kOWSProfilesManager_LocalProfileAvatarMetadataKey";
 
 NSString *const kOWSProfilesManager_UserWhitelistCollection = @"kOWSProfilesManager_UserWhitelistCollection";
 NSString *const kOWSProfilesManager_GroupWhitelistCollection = @"kOWSProfilesManager_GroupWhitelistCollection";
 
 NSString *const kOWSProfilesManager_OtherUsersProfileKeysCollection
     = @"kOWSProfilesManager_OtherUsersProfileKeysCollection";
-NSString *const kOWSProfilesManager_OtherUsersProfileNamesCollection
-    = @"kOWSProfilesManager_OtherUsersProfileNamesCollection";
-NSString *const kOWSProfilesManager_OtherUsersProfileAvatarMetadataCollection
-    = @"kOWSProfilesManager_OtherUsersProfileAvatarMetadataCollection";
 
 // TODO:
 static const NSInteger kProfileKeyLength = 16;
@@ -101,19 +106,22 @@ static const NSInteger kProfileKeyLength = 16;
 @property (nonatomic, readonly) OWSMessageSender *messageSender;
 @property (nonatomic, readonly) YapDatabaseConnection *dbConnection;
 
-// These properties should only be mutated on the main thread,
+// This property should only be mutated on the main thread,
-// but they may be accessed on other threads.
+//
-@property (atomic, nullable) NSString *localProfileName;
+// NOTE: Do not access this property directly; use getOrCreateLocalUserProfile instead.
-@property (atomic, nullable) UIImage *localProfileAvatarImage;
+@property (nonatomic, nullable) UserProfile *localUserProfile;
-@property (atomic, nullable) AvatarMetadata *localProfileAvatarMetadata;
+// This property should only be mutated on the main thread,
+@property (nonatomic, nullable) UIImage *localCachedAvatarImage;
 
 // These caches are lazy-populated.  The single point truth is the database.
-@property (nonatomic, readonly) NSMutableDictionary<NSString *, NSNumber *> *userProfileWhitelistCache;
+//
-@property (nonatomic, readonly) NSMutableDictionary<NSString *, NSNumber *> *groupProfileWhitelistCache;
+// These three properties can be accessed on any thread.
-@property (nonatomic, readonly) NSMutableDictionary<NSString *, NSData *> *otherUsersProfileKeyCache;
+@property (atomic, readonly) NSMutableDictionary<NSString *, NSNumber *> *userProfileWhitelistCache;
-@property (nonatomic, readonly) NSMutableDictionary<NSString *, NSString *> *otherUsersProfileNameCache;
+@property (atomic, readonly) NSMutableDictionary<NSString *, NSNumber *> *groupProfileWhitelistCache;
-// TODO: Replace with NSCache.
+@property (atomic, readonly) NSMutableDictionary<NSString *, NSData *> *otherUsersProfileKeyCache;
-@property (nonatomic, readonly) NSMutableDictionary<NSString *, UIImage *> *otherUsersProfileAvatarImageCache;
+
+// This property should only be mutated on the main thread,
+@property (nonatomic, readonly) NSCache<NSString *, UIImage *> *otherUsersProfileAvatarImageCache;
 
 @end
 
@@ -157,8 +165,7 @@ static const NSInteger kProfileKeyLength = 16;
     _userProfileWhitelistCache = [NSMutableDictionary new];
     _groupProfileWhitelistCache = [NSMutableDictionary new];
     _otherUsersProfileKeyCache = [NSMutableDictionary new];
-    _otherUsersProfileNameCache = [NSMutableDictionary new];
+    _otherUsersProfileAvatarImageCache = [NSCache new];
-    _otherUsersProfileAvatarImageCache = [NSMutableDictionary new];
 
     OWSSingletonAssert();
 
@@ -179,8 +186,6 @@ static const NSInteger kProfileKeyLength = 16;
     }
     OWSAssert(_localProfileKey.length == kProfileKeyLength);
 
-    [self loadLocalProfileAsync];
-
     return self;
 }
 
@@ -202,6 +207,48 @@ static const NSInteger kProfileKeyLength = 16;
     // Do nothing; we only want to make sure this singleton is created on startup.
 }
 
+#pragma mark - User Profile Accessor
+
+- (UserProfile *)getOrCreateUserProfileForRecipientId:(NSString *)recipientId
+{
+    OWSAssert([NSThread isMainThread]);
+    OWSAssert(recipientId.length > 0);
+
+    __block UserProfile *instance;
+    // Make sure to read on the local db connection for consistency.
+    [self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
+        instance = [UserProfile fetchObjectWithUniqueID:recipientId transaction:transaction];
+
+        if (!instance) {
+            instance = [[UserProfile alloc] initWithRecipientId:recipientId
+                                                    profileName:nil
+                                                      avatarUrl:nil
+                                                   avatarDigest:nil
+                                                 avatarFileName:nil];
+            [instance saveWithTransaction:transaction];
+        }
+    }];
+
+    OWSAssert(instance);
+
+    return instance;
+}
+
+- (nullable UserProfile *)getOrCreateLocalUserProfile
+{
+    OWSAssert([NSThread isMainThread]);
+
+    if (!self.localUserProfile) {
+        NSString *_Nullable recipientId = [TSAccountManager localNumber];
+        if (!recipientId) {
+            OWSFail(@"Missing local number.");
+            return nil;
+        }
+        self.localUserProfile = [self getOrCreateUserProfileForRecipientId:recipientId];
+    }
+    return self.localUserProfile;
+}
+
 #pragma mark - Local Profile Key
 
 + (NSData *)generateLocalProfileKey
@@ -213,51 +260,22 @@ static const NSInteger kProfileKeyLength = 16;
 
 #pragma mark - Local Profile
 
-// This method is use to update client "local profile" state.
+- (NSString *)localProfileName
-- (void)updateLocalProfileName:(nullable NSString *)localProfileName
-       localProfileAvatarImage:(nullable UIImage *)localProfileAvatarImage
-    localProfileAvatarMetadata:(nullable AvatarMetadata *)localProfileAvatarMetadata
 {
     OWSAssert([NSThread isMainThread]);
 
-    // The avatar image and filename should both be set, or neither should be set.
+    return [self getOrCreateLocalUserProfile].profileName;
-    if (!localProfileAvatarMetadata && localProfileAvatarImage) {
-        OWSFail(@"Missing avatar metadata.");
-        localProfileAvatarImage = nil;
-    }
-    if (localProfileAvatarMetadata && !localProfileAvatarImage) {
-        OWSFail(@"Missing avatar image.");
-        localProfileAvatarMetadata = nil;
 }
 
-    self.localProfileName = localProfileName;
+- (UIImage *)localProfileAvatarImage
-    self.localProfileAvatarImage = localProfileAvatarImage;
+{
-    self.localProfileAvatarMetadata = localProfileAvatarMetadata;
+    OWSAssert([NSThread isMainThread]);
-
-    if (localProfileName) {
-        [self.dbConnection setObject:localProfileName
-                              forKey:kOWSProfilesManager_LocalProfileNameKey
-                        inCollection:kOWSProfilesManager_Collection];
-    } else {
-        [self.dbConnection removeObjectForKey:kOWSProfilesManager_LocalProfileNameKey
-                                 inCollection:kOWSProfilesManager_Collection];
-    }
-    if (localProfileAvatarMetadata) {
-        [self.dbConnection setObject:localProfileAvatarMetadata
-                              forKey:kOWSProfilesManager_LocalProfileAvatarMetadataKey
-                        inCollection:kOWSProfilesManager_Collection];
-    } else {
-        [self.dbConnection removeObjectForKey:kOWSProfilesManager_LocalProfileAvatarMetadataKey
-                                 inCollection:kOWSProfilesManager_Collection];
-    }
 
-    [[NSNotificationCenter defaultCenter] postNotificationName:kNSNotificationName_LocalProfileDidChange
+    return self.localCachedAvatarImage;
-                                                        object:nil
-                                                      userInfo:nil];
 }
 
-- (void)updateLocalProfileName:(nullable NSString *)localProfileName
+- (void)updateLocalProfileName:(nullable NSString *)profileName
-       localProfileAvatarImage:(nullable UIImage *)localProfileAvatarImage
+                   avatarImage:(nullable UIImage *)avatarImage
                        success:(void (^)())successBlock
                        failure:(void (^)())failureBlockParameter
 {
@@ -276,15 +294,31 @@ static const NSInteger kProfileKeyLength = 16;
     //
     // * Try to update the service.
     // * Update client state on success.
-    void (^tryToUpdateService)(AvatarMetadata *_Nullable) = ^(AvatarMetadata *_Nullable avatarMetadata) {
+    void (^tryToUpdateService)(NSString *_Nullable, NSString *_Nullable, NSString *_Nullable) = ^(
-        [self updateProfileOnService:localProfileName
+        NSString *_Nullable avatarUrl, NSString *_Nullable avatarDigest, NSString *_Nullable avatarFileName) {
-            avatarMetadata:avatarMetadata
+        [self updateProfileOnService:profileName
+            avatarUrl:avatarUrl
+            avatarDigest:avatarDigest
             success:^{
+                // All reads and writes to user profiles should happen on the main thread.
                 dispatch_async(dispatch_get_main_queue(), ^{
-                    [self updateLocalProfileName:localProfileName
+                    UserProfile *userProfile = [self getOrCreateLocalUserProfile];
-                           localProfileAvatarImage:localProfileAvatarImage
+                    OWSAssert(userProfile);
-                        localProfileAvatarMetadata:avatarMetadata];
+                    userProfile.profileName = profileName;
+                    userProfile.avatarUrl = avatarUrl;
+                    userProfile.avatarDigest = avatarDigest;
+                    userProfile.avatarFileName = avatarFileName;
+                    // Make sure to save on the local db connection for consistency.
+                    [self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
+                        [userProfile saveWithTransaction:transaction];
+                    }];
+                    self.localCachedAvatarImage = avatarImage;
+
                     successBlock();
+
+                    [[NSNotificationCenter defaultCenter] postNotificationName:kNSNotificationName_LocalProfileDidChange
+                                                                        object:nil
+                                                                      userInfo:nil];
                 });
             }
             failure:^{
@@ -292,24 +326,31 @@ static const NSInteger kProfileKeyLength = 16;
             }];
     };
 
+    UserProfile *userProfile = [self getOrCreateLocalUserProfile];
+    OWSAssert(userProfile);
+
     // If we have a new avatar image, we must first:
     //
     // * Encode it to JPEG.
     // * Write it to disk.
     // * Upload it to service.
-    if (localProfileAvatarImage) {
+    if (avatarImage) {
-        if (self.localProfileAvatarMetadata && self.localProfileAvatarImage == localProfileAvatarImage) {
+        if (self.localCachedAvatarImage == avatarImage) {
+            OWSAssert(userProfile.avatarUrl.length > 0);
+            OWSAssert(userProfile.avatarDigest.length > 0);
+            OWSAssert(userProfile.avatarFileName.length > 0);
+
             DDLogVerbose(@"%@ Updating local profile on service with unchanged avatar.", self.tag);
             // If the avatar hasn't changed, reuse the existing metadata.
-            tryToUpdateService(self.localProfileAvatarMetadata);
+            tryToUpdateService(userProfile.avatarUrl, userProfile.avatarDigest, userProfile.avatarFileName);
         } else {
             DDLogVerbose(@"%@ Updating local profile on service with new avatar.", self.tag);
-            [self writeAvatarToDisk:localProfileAvatarImage
+            [self writeAvatarToDisk:avatarImage
                 success:^(NSData *data, NSString *fileName) {
                     [self uploadAvatarToService:data
                         fileName:fileName
-                        success:^(AvatarMetadata *avatarMetadata) {
+                        success:^(NSString *avatarUrl, NSString *avatarDigest) {
-                            tryToUpdateService(avatarMetadata);
+                            tryToUpdateService(avatarUrl, avatarDigest, fileName);
                         }
                         failure:^{
                             failureBlock();
@@ -321,7 +362,7 @@ static const NSInteger kProfileKeyLength = 16;
         }
     } else {
         DDLogVerbose(@"%@ Updating local profile on service with no avatar.", self.tag);
-        tryToUpdateService(nil);
+        tryToUpdateService(nil, nil, nil);
     }
 }
 
@@ -355,7 +396,7 @@ static const NSInteger kProfileKeyLength = 16;
 // TODO: The exact API & encryption scheme for avatars is not yet settled.
 - (void)uploadAvatarToService:(NSData *)data
                      fileName:(NSString *)fileName
-                      success:(void (^)(AvatarMetadata *avatarMetadata))successBlock
+                      success:(void (^)(NSString *avatarUrl, NSString *avatarDigest))successBlock
                       failure:(void (^)())failureBlock
 {
     OWSAssert(data.length > 0);
@@ -366,11 +407,9 @@ static const NSInteger kProfileKeyLength = 16;
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
         // TODO:
         NSString *avatarUrl = @"avatarUrl";
-        NSString *avatarDigest = @"digest";
+        NSString *avatarDigest = @"avatarDigest";
-        AvatarMetadata *avatarMetadata =
-            [[AvatarMetadata alloc] initWithFileName:fileName avatarUrl:avatarUrl avatarDigest:avatarDigest];
         if (YES) {
-            successBlock(avatarMetadata);
+            successBlock(avatarUrl, avatarDigest);
             return;
         }
         failureBlock();
@@ -379,7 +418,8 @@ static const NSInteger kProfileKeyLength = 16;
 
 // TODO: The exact API & encryption scheme for profiles is not yet settled.
 - (void)updateProfileOnService:(nullable NSString *)localProfileName
-                avatarMetadata:(nullable AvatarMetadata *)avatarMetadata
+                     avatarUrl:(nullable NSString *)avatarUrl
+                  avatarDigest:(nullable NSString *)avatarDigest
                        success:(void (^)())successBlock
                        failure:(void (^)())failureBlock
 {
@@ -396,34 +436,6 @@ static const NSInteger kProfileKeyLength = 16;
     });
 }
 
-- (void)loadLocalProfileAsync
-{
-    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-        NSString *_Nullable localProfileName = [self.dbConnection objectForKey:kOWSProfilesManager_LocalProfileNameKey
-                                                                  inCollection:kOWSProfilesManager_Collection];
-        AvatarMetadata *_Nullable localProfileAvatarMetadata =
-            [self.dbConnection objectForKey:kOWSProfilesManager_LocalProfileAvatarMetadataKey
-                               inCollection:kOWSProfilesManager_Collection];
-        UIImage *_Nullable localProfileAvatarImage = nil;
-        if (localProfileAvatarMetadata) {
-            localProfileAvatarImage = [self loadProfileAvatarWithFilename:localProfileAvatarMetadata.fileName];
-            if (!localProfileAvatarImage) {
-                localProfileAvatarMetadata = nil;
-            }
-        }
-
-        dispatch_async(dispatch_get_main_queue(), ^{
-            self.localProfileName = localProfileName;
-            self.localProfileAvatarImage = localProfileAvatarImage;
-            self.localProfileAvatarMetadata = localProfileAvatarMetadata;
-
-            [[NSNotificationCenter defaultCenter] postNotificationName:kNSNotificationName_LocalProfileDidChange
-                                                                object:nil
-                                                              userInfo:nil];
-        });
-    });
-}
-
 #pragma mark - Profile Whitelist
 
 - (void)addUserToProfileWhitelist:(NSString *)recipientId
@@ -531,43 +543,58 @@ static const NSInteger kProfileKeyLength = 16;
 
 - (nullable NSString *)profileNameForRecipientId:(NSString *)recipientId
 {
+    OWSAssert([NSThread isMainThread]);
     OWSAssert(recipientId.length > 0);
 
-    NSString *_Nullable profileName = self.otherUsersProfileNameCache[recipientId];
+    [self fetchProfileForRecipientId:recipientId];
-    if (profileName.length > 0) {
+
-        return profileName;
+    UserProfile *userProfile = [self getOrCreateUserProfileForRecipientId:recipientId];
+    return userProfile.profileName;
 }
 
-    profileName =
+- (nullable UIImage *)profileAvatarForRecipientId:(NSString *)recipientId
-        [self.dbConnection objectForKey:recipientId inCollection:kOWSProfilesManager_OtherUsersProfileNamesCollection];
+{
-    if (profileName) {
+    OWSAssert([NSThread isMainThread]);
-        OWSAssert(profileName.length == kProfileKeyLength);
+    OWSAssert(recipientId.length > 0);
-        self.otherUsersProfileNameCache[recipientId] = profileName;
+
-    } else {
     [self fetchProfileForRecipientId:recipientId];
+
+    UIImage *_Nullable image = [self.otherUsersProfileAvatarImageCache objectForKey:recipientId];
+    if (image) {
+        return image;
+    }
+
+    UserProfile *userProfile = [self getOrCreateUserProfileForRecipientId:recipientId];
+    if (userProfile.avatarFileName) {
+        image = [self loadProfileAvatarWithFilename:userProfile.avatarFileName];
+        if (image) {
+            [self.otherUsersProfileAvatarImageCache setObject:image forKey:recipientId];
         }
-    return profileName;
     }
 
-- (nullable UIImage *)profileAvatarForRecipientId:(NSString *)recipientId
+    return image;
-{
-    // TODO:
-    return nil;
 }
 
 - (void)fetchProfileForRecipientId:(NSString *)recipientId
 {
     OWSAssert(recipientId.length > 0);
 
-    // TODO:
+    UserProfile *userProfile = [self getOrCreateUserProfileForRecipientId:recipientId];
+
+    // Throttle and debounce the updates.
+    const NSTimeInterval kMaxRefreshFrequency = 5 * kMinuteInterval;
+    if (userProfile.lastUpdateDate && fabs([userProfile.lastUpdateDate timeIntervalSinceNow]) < kMaxRefreshFrequency) {
+        // This profile was updated recently or already has an update in flight.
+        return;
     }
 
-// NSString *const kOWSProfilesManager_OtherUsersProfileNamesCollection =
+    userProfile.lastUpdateDate = [NSDate new];
-// @"kOWSProfilesManager_OtherUsersProfileNamesCollection";  NSString *const
+    [self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
-// kOWSProfilesManager_OtherUsersProfileAvatarMetadataCollection =
+        [userProfile saveWithTransaction:transaction];
-// @"kOWSProfilesManager_OtherUsersProfileAvatarMetadataCollection";  kNSNotificationName_OtherUsersProfileDidChange
+    }];
-//@property (nonatomic, readonly) NSMutableDictionary<NSString *, NSString *> *otherUsersProfileNameCache;
+
-//@property (nonatomic, readonly) NSMutableDictionary<NSString *, UIImage *> *otherUsersProfileAvatarImageCache;
+    // TODO: Actually update the profile.
+}
 
 #pragma mark - Avatar Disk Cache