Merge branch 'charlesmchen/profileNotificationsVsConversationView'

8 years ago · cf246a41cf
parent 9f803fa440 541966aaf6
commit cf246a41cf
1 changed files with 1 additions and 2 deletions
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@ -376,8 +376,6 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) {
    _networkManager = [TSNetworkManager sharedManager];
    _blockingManager = [OWSBlockingManager sharedManager];
    _contactsViewHelper = [[ContactsViewHelper alloc] initWithDelegate:self];
-
-    [self addNotificationListeners];
 }

 - (void)addNotificationListeners
@ -650,6 +648,7 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) {
    [self initializeToolbars];
    [self createScrollDownButton];
    [self createHeaderViews];
+    [self addNotificationListeners];
 }

 - (void)registerCustomMessageNibs