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

models/messages.initialize: If no ourConversationId, skip migration

Browse source
This commit is contained in:
Scott Nonnenberg 2022-06-27 10:27:20 -07:00 • committed by GitHub
parent 09124446a6
commit c35f901387
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ts/models/messages.ts
View file

@ -226,16 +226,20 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
); );
} }
const ourConversationId =
window.ConversationController.getOurConversationId();
if (ourConversationId) {
const sendStateByConversationId = migrateLegacySendAttributes( const sendStateByConversationId = migrateLegacySendAttributes(
this.attributes, this.attributes,
window.ConversationController.get.bind(window.ConversationController), window.ConversationController.get.bind(window.ConversationController),
window.ConversationController.getOurConversationIdOrThrow() ourConversationId
); );
if (sendStateByConversationId) { if (sendStateByConversationId) {
this.set('sendStateByConversationId', sendStateByConversationId, { this.set('sendStateByConversationId', sendStateByConversationId, {
silent: true, silent: true,
}); });
} }
}
this.CURRENT_PROTOCOL_VERSION = Proto.DataMessage.ProtocolVersion.CURRENT; this.CURRENT_PROTOCOL_VERSION = Proto.DataMessage.ProtocolVersion.CURRENT;
this.INITIAL_PROTOCOL_VERSION = Proto.DataMessage.ProtocolVersion.INITIAL; this.INITIAL_PROTOCOL_VERSION = Proto.DataMessage.ProtocolVersion.INITIAL;