From 92a2fd6b699952a21268715fa7aecc76bb67ee5b Mon Sep 17 00:00:00 2001
From: Matthew Chen <charlesmchen@gmail.com>
Date: Tue, 19 Sep 2017 09:29:36 -0400
Subject: [PATCH] Avoid NPEs when entering conversation view.

// FREEBIE
---
 .../ViewControllers/ConversationView/MessagesViewController.m  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Signal/src/ViewControllers/ConversationView/MessagesViewController.m b/Signal/src/ViewControllers/ConversationView/MessagesViewController.m
index 71851ed6a..da3d2dce0 100644
--- a/Signal/src/ViewControllers/ConversationView/MessagesViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/MessagesViewController.m
@@ -309,8 +309,6 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) {
     _networkManager = [TSNetworkManager sharedManager];
     _blockingManager = [OWSBlockingManager sharedManager];
     _contactsViewHelper = [[ContactsViewHelper alloc] initWithDelegate:self];
-
-    [self addNotificationListeners];
 }
 
 - (void)addNotificationListeners
@@ -580,6 +578,7 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) {
     [self initializeToolbars];
     [self createScrollDownButton];
     [self createHeaderViews];
+    [self addNotificationListeners];
 }
 
 - (void)registerCustomMessageNibs