Merge branch 'charlesmchen/unregisterVsProfileCache'

Author: charlesmchen

Signal/src/Profiles/OWSProfileManager.h

@@ -18,6 +18,8 @@ extern NSString *const kNSNotificationName_OtherUsersProfileDidChange;
 
 + (instancetype)sharedManager;
 
+- (void)resetProfileStorage;
+
 #pragma mark - Local Profile
 
 // These two methods should only be called from the main thread.

Signal/src/Profiles/OWSProfileManager.m

@@ -830,6 +830,17 @@ - (NSString *)profileAvatarsDirPath
 
 // TODO: We may want to clean up this directory in the "orphan cleanup" logic.
 
+- (void)resetProfileStorage
+{
+    OWSAssert([NSThread isMainThread]);
+
+    NSError *error;
+    [[NSFileManager defaultManager] removeItemAtPath:[self profileAvatarsDirPath] error:&error];
+    if (error) {
+        DDLogError(@"Failed to delete database: %@", error.description);
+    }
+}
+
 #pragma mark - Notifications
 
 - (void)applicationDidBecomeActive:(NSNotification *)notification

Signal/src/environment/Environment.m

@@ -241,6 +241,7 @@ + (void)resetAppData {
     [DDLog flushLog];
 
     [[TSStorageManager sharedManager] resetSignalStorage];
+    [[OWSProfileManager sharedManager] resetProfileStorage];
     [Environment.preferences clear];
     [[UIApplication sharedApplication] setApplicationIconBadgeNumber:0];