From 26ad9814ee2f7831669d8947b611e20c590e40e0 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 15 Aug 2018 14:41:20 -0400 Subject: [PATCH 1/3] Add temporary logging around conversation view crashes. --- .../ConversationViewController.m | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 1431fe65d..57d512dfe 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -3311,6 +3311,9 @@ typedef enum : NSUInteger { return; } + + DDLogInfo(@"%@ uiDatabaseDidUpdate notifications: %@", self.logTag, notifications); + NSArray *sectionChanges = nil; NSArray *rowChanges = nil; [[self.uiDatabaseConnection ext:TSMessageDatabaseViewExtensionName] getSectionChanges:§ionChanges @@ -3402,7 +3405,8 @@ typedef enum : NSUInteger { for (YapDatabaseViewRowChange *rowChange in rowChanges) { switch (rowChange.type) { case YapDatabaseViewChangeDelete: { - DDLogVerbose(@"YapDatabaseViewChangeDelete collectionKey: %@, indexPath: %@, finalIndex: %lu", + DDLogInfo(@"%@ YapDatabaseViewChangeDelete collectionKey: %@, indexPath: %@, finalIndex: %lu", + self.logTag, rowChange.collectionKey, rowChange.indexPath, (unsigned long)rowChange.finalIndex); @@ -3412,7 +3416,8 @@ typedef enum : NSUInteger { break; } case YapDatabaseViewChangeInsert: { - DDLogVerbose(@"YapDatabaseViewChangeInsert collectionKey: %@, newIndexPath: %@, finalIndex: %lu", + DDLogInfo(@"%@ YapDatabaseViewChangeInsert collectionKey: %@, newIndexPath: %@, finalIndex: %lu", + self.logTag, rowChange.collectionKey, rowChange.newIndexPath, (unsigned long)rowChange.finalIndex); @@ -3429,8 +3434,9 @@ typedef enum : NSUInteger { break; } case YapDatabaseViewChangeMove: { - DDLogVerbose(@"YapDatabaseViewChangeMove collectionKey: %@, indexPath: %@, newIndexPath: %@, " - @"finalIndex: %lu", + DDLogInfo(@"%@ YapDatabaseViewChangeMove collectionKey: %@, indexPath: %@, newIndexPath: %@, " + @"finalIndex: %lu", + self.logTag, rowChange.collectionKey, rowChange.indexPath, rowChange.newIndexPath, @@ -3439,7 +3445,8 @@ typedef enum : NSUInteger { break; } case YapDatabaseViewChangeUpdate: { - DDLogVerbose(@"YapDatabaseViewChangeUpdate collectionKey: %@, indexPath: %@, finalIndex: %lu", + DDLogInfo(@"%@ YapDatabaseViewChangeUpdate collectionKey: %@, indexPath: %@, finalIndex: %lu", + self.logTag, rowChange.collectionKey, rowChange.indexPath, (unsigned long)rowChange.finalIndex); @@ -3450,7 +3457,7 @@ typedef enum : NSUInteger { } }; - DDLogVerbose(@"self.viewItems.count: %zd -> %zd", oldViewItemCount, self.viewItems.count); + DDLogInfo(@"%@ viewItems.count: %zd -> %zd", self.logTag, oldViewItemCount, self.viewItems.count); BOOL shouldAnimateUpdates = [self shouldAnimateRowUpdates:rowChanges oldViewItemCount:oldViewItemCount]; void (^batchUpdatesCompletion)(BOOL) = ^(BOOL finished) { From 408689bbfc7fbef40c9cdeb26ea7498febb7adec Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 15 Aug 2018 14:41:30 -0400 Subject: [PATCH 2/3] "Bump build to 2.29.0.5." --- Signal/Signal-Info.plist | 2 +- SignalShareExtension/Info.plist | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index 3afdd0112..ac9a10bf0 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -38,7 +38,7 @@ CFBundleVersion - 2.29.0.4 + 2.29.0.5 ITSAppUsesNonExemptEncryption LOGS_EMAIL diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist index 88893b533..f67553de3 100644 --- a/SignalShareExtension/Info.plist +++ b/SignalShareExtension/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 2.29.0 CFBundleVersion - 2.29.0.4 + 2.29.0.5 ITSAppUsesNonExemptEncryption NSAppTransportSecurity From 664e13fb462f2045f88326612bc684a136d64632 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 15 Aug 2018 15:38:38 -0400 Subject: [PATCH 3/3] Revert "Add temporary logging around conversation view crashes." This reverts commit 26ad9814ee2f7831669d8947b611e20c590e40e0. --- .../ConversationViewController.m | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 57d512dfe..1431fe65d 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -3311,9 +3311,6 @@ typedef enum : NSUInteger { return; } - - DDLogInfo(@"%@ uiDatabaseDidUpdate notifications: %@", self.logTag, notifications); - NSArray *sectionChanges = nil; NSArray *rowChanges = nil; [[self.uiDatabaseConnection ext:TSMessageDatabaseViewExtensionName] getSectionChanges:§ionChanges @@ -3405,8 +3402,7 @@ typedef enum : NSUInteger { for (YapDatabaseViewRowChange *rowChange in rowChanges) { switch (rowChange.type) { case YapDatabaseViewChangeDelete: { - DDLogInfo(@"%@ YapDatabaseViewChangeDelete collectionKey: %@, indexPath: %@, finalIndex: %lu", - self.logTag, + DDLogVerbose(@"YapDatabaseViewChangeDelete collectionKey: %@, indexPath: %@, finalIndex: %lu", rowChange.collectionKey, rowChange.indexPath, (unsigned long)rowChange.finalIndex); @@ -3416,8 +3412,7 @@ typedef enum : NSUInteger { break; } case YapDatabaseViewChangeInsert: { - DDLogInfo(@"%@ YapDatabaseViewChangeInsert collectionKey: %@, newIndexPath: %@, finalIndex: %lu", - self.logTag, + DDLogVerbose(@"YapDatabaseViewChangeInsert collectionKey: %@, newIndexPath: %@, finalIndex: %lu", rowChange.collectionKey, rowChange.newIndexPath, (unsigned long)rowChange.finalIndex); @@ -3434,9 +3429,8 @@ typedef enum : NSUInteger { break; } case YapDatabaseViewChangeMove: { - DDLogInfo(@"%@ YapDatabaseViewChangeMove collectionKey: %@, indexPath: %@, newIndexPath: %@, " - @"finalIndex: %lu", - self.logTag, + DDLogVerbose(@"YapDatabaseViewChangeMove collectionKey: %@, indexPath: %@, newIndexPath: %@, " + @"finalIndex: %lu", rowChange.collectionKey, rowChange.indexPath, rowChange.newIndexPath, @@ -3445,8 +3439,7 @@ typedef enum : NSUInteger { break; } case YapDatabaseViewChangeUpdate: { - DDLogInfo(@"%@ YapDatabaseViewChangeUpdate collectionKey: %@, indexPath: %@, finalIndex: %lu", - self.logTag, + DDLogVerbose(@"YapDatabaseViewChangeUpdate collectionKey: %@, indexPath: %@, finalIndex: %lu", rowChange.collectionKey, rowChange.indexPath, (unsigned long)rowChange.finalIndex); @@ -3457,7 +3450,7 @@ typedef enum : NSUInteger { } }; - DDLogInfo(@"%@ viewItems.count: %zd -> %zd", self.logTag, oldViewItemCount, self.viewItems.count); + DDLogVerbose(@"self.viewItems.count: %zd -> %zd", oldViewItemCount, self.viewItems.count); BOOL shouldAnimateUpdates = [self shouldAnimateRowUpdates:rowChanges oldViewItemCount:oldViewItemCount]; void (^batchUpdatesCompletion)(BOOL) = ^(BOOL finished) {