Merge pull request #266 from apptentive/IOSOSX-537

IOSOSX-537: "Crash" when clicking no in ED
apptentive · Jun 2, 2016 · 98280bc · 98280bc
2 parents 26a3b2b + b168b42
commit 98280bc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/ApptentiveConnect/resources/Apptentive.storyboard b/ApptentiveConnect/resources/Apptentive.storyboard
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>

diff --git a/ApptentiveConnect/source/Message Center/Controllers/ApptentiveMessageCenterViewController.m b/ApptentiveConnect/source/Message Center/Controllers/ApptentiveMessageCenterViewController.m
@@ -233,11 +233,6 @@ - (void)viewDidLoad {
 		self.navigationItem.leftBarButtonItem = nil;
 	}
 
-	self.contextMessage = nil;
-	if (self.interaction.contextMessageBody) {
-		self.contextMessage = [[Apptentive sharedConnection].backend automatedMessageWithTitle:nil body:self.interaction.contextMessageBody];
-	}
-
 	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(resizeFooterView:) name:UIKeyboardWillChangeFrameNotification object:nil];
 	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(scrollToFooterView:) name:UIKeyboardWillShowNotification object:nil];
 	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(resizeFooterView:) name:UIKeyboardDidHideNotification object:nil];
@@ -326,6 +321,11 @@ - (void)viewWillAppear:(BOOL)animated {
 
 		self.isSubsequentDisplay = YES;
 	}
+
+	self.contextMessage = nil;
+	if (self.interaction.contextMessageBody) {
+		self.contextMessage = [[Apptentive sharedConnection].backend automatedMessageWithTitle:nil body:self.interaction.contextMessageBody];
+	}
 }
 
 - (void)viewWillDisappear:(BOOL)animated {