Async remove identity

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

View file

@ -38135,7 +38135,7 @@ axolotlInternal.RecipientRecord = function() {
// Use textsecure.storage.devices.removeIdentityKeyForNumber (which calls this) instead
_removeIdentityKeyForNumber: function(number) {
textsecure.storage.remove("sessions" + number);
return Promise.resolve(textsecure.storage.remove("sessions" + number));
},
};
@ -38187,7 +38187,7 @@ axolotlInternal.RecipientRecord = function() {
if (map === undefined)
throw new Error("Tried to remove identity for unknown number");
textsecure.storage.remove("devices" + number);
textsecure.storage.sessions._removeIdentityKeyForNumber(number);
return textsecure.storage.sessions._removeIdentityKeyForNumber(number);
},
getDeviceObject: function(encodedNumber) {

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));
}
});

View file

@ -41,8 +41,7 @@
},
resolve: function() {
new Promise(function(resolve) {
this.conversation.resolveConflicts(this.model.number);
resolve();
this.conversation.resolveConflicts(this.model.number).then(resolve);
}.bind(this));
this.trigger('resolve');
this.remove();

View file

@ -64,7 +64,7 @@
// Use textsecure.storage.devices.removeIdentityKeyForNumber (which calls this) instead
_removeIdentityKeyForNumber: function(number) {
textsecure.storage.remove("sessions" + number);
return Promise.resolve(textsecure.storage.remove("sessions" + number));
},
};
@ -116,7 +116,7 @@
if (map === undefined)
throw new Error("Tried to remove identity for unknown number");
textsecure.storage.remove("devices" + number);
textsecure.storage.sessions._removeIdentityKeyForNumber(number);
return textsecure.storage.sessions._removeIdentityKeyForNumber(number);
},
getDeviceObject: function(encodedNumber) {