diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index 0dc07c44b..29bc1d583 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -38,7 +38,7 @@ CFBundleVersion - 2.26.0.23 + 2.26.0.24 ITSAppUsesNonExemptEncryption LOGS_EMAIL diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 55f436262..2efccf532 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -3885,6 +3885,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; diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist index e5b0f9640..92d5ec66e 100644 --- a/SignalShareExtension/Info.plist +++ b/SignalShareExtension/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 2.26.0 CFBundleVersion - 2.26.0.23 + 2.26.0.24 ITSAppUsesNonExemptEncryption NSAppTransportSecurity