Merge branch 'charlesmchen/corruptThreadView'

Signal/src/ViewControllers/ConversationView/ConversationViewController.m

@@ -4904,11 +4904,9 @@ typedef enum : NSUInteger {
     }];
 
     // Flag to ensure that we only increment once per launch.
-    static BOOL hasIncrementedDatabaseView = NO;
-    if (hasError && !hasIncrementedDatabaseView) {
+    if (hasError) {
         OWSLogWarn(@"incrementing version of: %@", TSMessageDatabaseViewExtensionName);
         [OWSPrimaryStorage incrementVersionOfDatabaseExtension:TSMessageDatabaseViewExtensionName];
-        hasIncrementedDatabaseView = YES;
     }
 
     // Update the "break" properties (shouldShowDate and unreadIndicator) of the view items.

Signal/src/ViewControllers/HomeView/HomeViewController.m

@@ -880,6 +880,11 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations
                                                                                  withMappings:self.threadMappings];
     }];
 
+    if (![thread isKindOfClass:[TSThread class]]) {
+        OWSLogError(@"Invalid object in thread view: %@", [thread class]);
+        [OWSStorage incrementVersionOfDatabaseExtension:TSThreadDatabaseViewExtensionName];
+    }
+
     return thread;
 }
 

SignalServiceKit/src/Storage/OWSStorage.m

@@ -515,6 +515,21 @@ NSString *const kNSUserDefaults_DatabaseExtensionVersionMap = @"kNSUserDefaults_
 {
     OWSLogError(@"%@", extensionName);
 
+    // Don't increment version of a given extension more than once
+    // per launch.
+    static NSMutableSet<NSString *> *incrementedViewSet = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        incrementedViewSet = [NSMutableSet new];
+    });
+    @synchronized(incrementedViewSet) {
+        if ([incrementedViewSet containsObject:extensionName]) {
+            OWSLogInfo(@"Ignoring redundant increment: %@", extensionName);
+            return;
+        }
+        [incrementedViewSet addObject:extensionName];
+    }
+
     NSUserDefaults *appUserDefaults = [NSUserDefaults appUserDefaults];
     OWSAssertDebug(appUserDefaults);
     NSMutableDictionary<NSString *, NSNumber *> *_Nullable versionMap =