oxen-io/session-desktop
1
0
Fork 0
mirror of https://github.com/oxen-io/session-desktop.git synced 2023-12-14 02:12:57 +01:00
Code Issues Projects Releases Wiki Activity

Fix wrong contact in some timer updates

Browse source 
Mistakenly showed 'You' for timer updates inferred from incoming
messages.
This commit is contained in:
lilia 2016-10-05 22:31:27 +09:00
parent 73e69fe5eb
commit 4ee2652367
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
js/models/messages.js
View file

@ -120,6 +120,17 @@
id: this.get('conversationId')
});
},
getExpirationTimerUpdateSource: function() {
if (this.isExpirationTimerUpdate()) {
var conversationId = this.get('expirationTimerUpdate').source;
var c = ConversationController.get(conversationId);
if (!c) {
c = ConversationController.create({id: conversationId, type: 'private'});
c.fetch();
}
return c;
}
},
getContact: function() {
var conversationId = this.get('source');
if (!this.isIncoming()) {

2
js/views/message_view.js
View file

@ -51,7 +51,7 @@
return this.model.id;
},
initialize: function() {
this.conversation = this.model.getContact();
this.conversation = this.model.getExpirationTimerUpdateSource();
this.listenTo(this.conversation, 'change', this.render);
},
render_attributes: function() {