From 541966aaf684759e39eb8b8520e00a48fe42a161 Mon Sep 17 00:00:00 2001
From: Matthew Chen <charlesmchen@gmail.com>
Date: Wed, 13 Sep 2017 17:16:32 -0400
Subject: [PATCH] Fix NPEs when profiles change while entering conversation
 view.

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

diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index 58002a5e8..eff4e93ae 100644
--- 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