Respond to CR.

// FREEBIE
pull/1/head
Matthew Chen 8 years ago
parent e222b9df68
commit 2c68b06412

@ -544,6 +544,9 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) {
keyboardOnViewAppearing:(BOOL)keyboardOnViewAppearing keyboardOnViewAppearing:(BOOL)keyboardOnViewAppearing
callOnViewAppearing:(BOOL)callOnViewAppearing callOnViewAppearing:(BOOL)callOnViewAppearing
{ {
// At most one.
OWSAssert(!keyboardOnViewAppearing || !callOnViewAppearing);
if (callOnViewAppearing) { if (callOnViewAppearing) {
keyboardOnViewAppearing = NO; keyboardOnViewAppearing = NO;
} }

@ -743,6 +743,9 @@ typedef NS_ENUM(NSInteger, CellState) { kArchiveState, kInboxState };
keyboardOnViewAppearing:(BOOL)keyboardOnViewAppearing keyboardOnViewAppearing:(BOOL)keyboardOnViewAppearing
callOnViewAppearing:(BOOL)callOnViewAppearing callOnViewAppearing:(BOOL)callOnViewAppearing
{ {
// At most one.
OWSAssert(!keyboardOnViewAppearing || !callOnViewAppearing);
if (thread == nil) { if (thread == nil) {
OWSFail(@"Thread unexpectedly nil"); OWSFail(@"Thread unexpectedly nil");
return; return;

@ -200,6 +200,9 @@ static Environment *environment = nil;
keyboardOnViewAppearing:(BOOL)keyboardOnViewAppearing keyboardOnViewAppearing:(BOOL)keyboardOnViewAppearing
callOnViewAppearing:(BOOL)callOnViewAppearing callOnViewAppearing:(BOOL)callOnViewAppearing
{ {
// At most one.
OWSAssert(!keyboardOnViewAppearing || !callOnViewAppearing);
DispatchMainThreadSafe(^{ DispatchMainThreadSafe(^{
__block TSThread *thread = nil; __block TSThread *thread = nil;
[[TSStorageManager sharedManager].dbReadWriteConnection [[TSStorageManager sharedManager].dbReadWriteConnection
@ -221,6 +224,9 @@ static Environment *environment = nil;
keyboardOnViewAppearing:(BOOL)keyboardOnViewAppearing keyboardOnViewAppearing:(BOOL)keyboardOnViewAppearing
callOnViewAppearing:(BOOL)callOnViewAppearing callOnViewAppearing:(BOOL)callOnViewAppearing
{ {
// At most one.
OWSAssert(!keyboardOnViewAppearing || !callOnViewAppearing);
if (!thread) { if (!thread) {
OWSFail(@"%@ Can't present nil thread.", self.tag); OWSFail(@"%@ Can't present nil thread.", self.tag);
return; return;

Loading…
Cancel
Save