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

Sender Key: Prepare for production

Browse source
This commit is contained in:
Scott Nonnenberg 2021-06-08 14:51:58 -07:00 • committed by GitHub
parent f226822dff
commit bff3f0c74a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 334 additions and 183 deletions
Download patch file Download diff file Expand all files Collapse all files

12
ts/models/conversations.ts
View file

@ -1201,7 +1201,7 @@ export class ConversationModel extends window.Backbone
timestamp,
groupMembers,
contentMessage,
ContentHint.SUPPLEMENTARY,
ContentHint.IMPLICIT,
undefined,
{
...sendOptions,
@ -1212,7 +1212,7 @@ export class ConversationModel extends window.Backbone
} else {
handleMessageSend(
window.Signal.Util.sendContentMessageToGroup({
contentHint: ContentHint.SUPPLEMENTARY,
contentHint: ContentHint.IMPLICIT,
contentMessage,
conversation: this,
online: true,
@ -3289,7 +3289,7 @@ export class ConversationModel extends window.Backbone
targetTimestamp,
timestamp,
undefined, // expireTimer
ContentHint.SUPPLEMENTARY,
ContentHint.DEFAULT,
undefined, // groupId
profileKey,
options
@ -3305,7 +3305,7 @@ export class ConversationModel extends window.Backbone
profileKey,
},
this,
ContentHint.SUPPLEMENTARY,
ContentHint.DEFAULT,
options
);
})();
@ -3446,7 +3446,7 @@ export class ConversationModel extends window.Backbone
undefined, // deletedForEveryoneTimestamp
timestamp,
expireTimer,
ContentHint.SUPPLEMENTARY,
ContentHint.DEFAULT,
undefined, // groupId
profileKey,
options
@ -3465,7 +3465,7 @@ export class ConversationModel extends window.Backbone
profileKey,
},
this,
ContentHint.SUPPLEMENTARY,
ContentHint.DEFAULT,
options
);
})();

8
ts/models/messages.ts
View file

@ -3601,9 +3601,13 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
conversationId,
message.get('sent_at')
);
if (item) {
if (item && item.wasOpened) {
window.log.info(
`handleDataMessage: found retry placeholder. Updating ${message.idForLogging()} received_at/received_at_ms`
`handleDataMessage: found retry placeholder for ${message.idForLogging()}, but conversation was opened. No updates made.`
);
} else if (item) {
window.log.info(
`handleDataMessage: found retry placeholder for ${message.idForLogging()}. Updating received_at/received_at_ms`
);
message.set({
received_at: item.receivedAtCounter,