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

Async remove identity

Browse source
This commit is contained in:
lilia 2015-04-09 14:58:26 -07:00
parent 26f1aa4db5
commit 71715c95bc
4 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

13
js/models/conversations.js
View file

@ -241,12 +241,13 @@
throw 'No conflicts to resolve';
}
textsecure.storage.devices.removeIdentityKeyForNumber(number);
this.messageCollection.each(function(message) {
if (message.hasKeyConflict(number)) {
message.resolveConflict(number);
}
});
return textsecure.storage.devices.removeIdentityKeyForNumber(number).then(function() {
this.messageCollection.each(function(message) {
if (message.hasKeyConflict(number)) {
message.resolveConflict(number);
}
});
}.bind(this));
}
});