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

Fix bug overwriting existing conversation names

Browse source 
On incoming messages for pre-existing conversations, don't update any
attributes unless it's a group update message.
This commit is contained in:
lilia 2014-12-22 13:24:12 -08:00
parent 30bca85f5a
commit 80993753de
1 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

20
js/background.js
View file

@ -123,13 +123,16 @@
var now = new Date().getTime(); var now = new Date().getTime();
var conversationId = pushMessageContent.group ? pushMessageContent.group.id : source; var conversationId = pushMessageContent.group ? pushMessageContent.group.id : source;
var conversation = conversations.add({id: conversationId}, {merge: true}); var conversation = conversations.add({id: conversationId}, {merge: true});
conversation.fetch().always(function() { var attributes = {};
var attributes = { active_at: now }; conversation.fetch().fail(function() {
// this is a new conversation
if (pushMessageContent.group) { if (pushMessageContent.group) {
attributes = { attributes = {
type : 'group',
groupId : pushMessageContent.group.id, groupId : pushMessageContent.group.id,
name : pushMessageContent.group.name, name : pushMessageContent.group.name,
type : 'group', avatar : pushMessageContent.group.avatar,
members : pushMessageContent.group.members,
}; };
} else { } else {
attributes = { attributes = {
@ -137,6 +140,17 @@
type : 'private' type : 'private'
}; };
} }
}).always(function() {
if (pushMessageContent.group &&
pushMessageContent.group.type === textsecure.protobuf.PushMessageContent.GroupContext.Type.UPDATE) {
attributes = {
groupId : pushMessageContent.group.id,
name : pushMessageContent.group.name,
avatar : pushMessageContent.group.avatar,
members : pushMessageContent.group.members,
};
}
attributes.active_at = now;
conversation.set(attributes); conversation.set(attributes);
message.set({ message.set({