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

Rename axolotl storage

Browse source 
// FREEBIE
This commit is contained in:
lilia 2016-04-22 13:39:05 -07:00
parent ee3bc11e3c
commit 1d60dc38fb
13 changed files with 66 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

4
js/models/conversations.js
View file

@ -402,8 +402,8 @@
throw 'No conflicts to resolve';
}
return textsecure.storage.axolotl.removeIdentityKey(number).then(function() {
return textsecure.storage.axolotl.putIdentityKey(number, identityKey).then(function() {
return textsecure.storage.protocol.removeIdentityKey(number).then(function() {
return textsecure.storage.protocol.putIdentityKey(number, identityKey).then(function() {
var promise = Promise.resolve();
this.messageCollection.each(function(message) {
if (message.hasKeyConflict(number)) {