mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Don't mark messages read if a call is fullscreen

Browse source
This commit is contained in:
Evan Hahn 2022-02-15 17:00:47 -06:00 • committed by GitHub
parent 68537902fb
commit 2c848d85bc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ts/views/conversation_view.ts
View file

@ -54,6 +54,7 @@ import {
getConversationSelector, getConversationSelector,
getMessagesByConversation, getMessagesByConversation,
} from '../state/selectors/conversations'; } from '../state/selectors/conversations';
import { getActiveCallState } from '../state/selectors/calling';
import { ConversationDetailsMembershipList } from '../components/conversation/conversation-details/ConversationDetailsMembershipList'; import { ConversationDetailsMembershipList } from '../components/conversation/conversation-details/ConversationDetailsMembershipList';
import { showSafetyNumberChangeDialog } from '../shims/showSafetyNumberChangeDialog'; import { showSafetyNumberChangeDialog } from '../shims/showSafetyNumberChangeDialog';
import type { import type {
@ -472,6 +473,11 @@ export class ConversationView extends window.Backbone.View<ConversationModel> {
return; return;
} }
const activeCall = getActiveCallState(window.reduxStore.getState());
if (activeCall && !activeCall.pip) {
return;
}
const message = await getMessageById(messageId); const message = await getMessageById(messageId);
if (!message) { if (!message) {
throw new Error(`markMessageRead: failed to load message ${messageId}`); throw new Error(`markMessageRead: failed to load message ${messageId}`);