Unarchive conversation if another device sent a message to it
This commit is contained in:
parent
1c670977d3
commit
5e9f3d5171
1 changed files with 7 additions and 3 deletions
|
@ -2763,6 +2763,12 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
|
||||||
|
|
||||||
window.MessageController.register(message.id, message);
|
window.MessageController.register(message.id, message);
|
||||||
conversation.incrementMessageCount();
|
conversation.incrementMessageCount();
|
||||||
|
|
||||||
|
// If we sent a message in a given conversation, unarchive it!
|
||||||
|
if (type === 'outgoing') {
|
||||||
|
conversation.setArchived(false);
|
||||||
|
}
|
||||||
|
|
||||||
window.Signal.Data.updateConversation(conversation.attributes);
|
window.Signal.Data.updateConversation(conversation.attributes);
|
||||||
|
|
||||||
const reduxState = window.reduxStore.getState();
|
const reduxState = window.reduxStore.getState();
|
||||||
|
@ -3017,9 +3023,7 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
|
||||||
!isGroupStoryReply &&
|
!isGroupStoryReply &&
|
||||||
!keepThisConversationArchived
|
!keepThisConversationArchived
|
||||||
) {
|
) {
|
||||||
conversation.set({
|
conversation.setArchived(false);
|
||||||
isArchived: false,
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!isFirstRun && this.pendingMarkRead) {
|
if (!isFirstRun && this.pendingMarkRead) {
|
||||||
|
|
Loading…
Reference in a new issue