Merge tag '2.26.0.24'

Signal/Signal-Info.plist

@@ -38,7 +38,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2.26.0.23</string>
+	<string>2.26.0.24</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LOGS_EMAIL</key>

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;

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;

SignalShareExtension/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>2.26.0</string>
 	<key>CFBundleVersion</key>
-	<string>2.26.0.23</string>
+	<string>2.26.0.24</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>NSAppTransportSecurity</key>