diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 861314ec2..09cb860b8 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -3834,6 +3834,10 @@ typedef enum : NSUInteger { DDLogInfo(@"%@ Not marking messages as read; another view is presented.", self.logTag); return; } + if (OWSWindowManager.sharedManager.shouldShowCallView) { + DDLogInfo(@"%@ Not marking messages as read; call view is presented.", self.logTag); + return; + } if (self.navigationController.topViewController != self) { DDLogInfo(@"%@ Not marking messages as read; another view is pushed.", self.logTag); return; diff --git a/SignalMessaging/utils/OWSWindowManager.h b/SignalMessaging/utils/OWSWindowManager.h index 6d7046d15..e325f2a21 100644 --- a/SignalMessaging/utils/OWSWindowManager.h +++ b/SignalMessaging/utils/OWSWindowManager.h @@ -29,6 +29,8 @@ extern const UIWindowLevel UIWindowLevel_Background; #pragma mark - Calls +@property (nonatomic, readonly) BOOL shouldShowCallView; + - (void)startCall:(UIViewController *)callViewController; - (void)endCall:(UIViewController *)callViewController; - (void)leaveCallView;