Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2026-05-08 08:58:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

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
js/libtextsecure.js
+2 -2
View File
@@ -38135,7 +38135,7 @@ axolotlInternal.RecipientRecord = function() {
// Use textsecure.storage.devices.removeIdentityKeyForNumber (which calls this) instead // Use textsecure.storage.devices.removeIdentityKeyForNumber (which calls this) instead
_removeIdentityKeyForNumber: function(number) { _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) if (map === undefined)
throw new Error("Tried to remove identity for unknown number"); throw new Error("Tried to remove identity for unknown number");
textsecure.storage.remove("devices" + number); textsecure.storage.remove("devices" + number);
textsecure.storage.sessions._removeIdentityKeyForNumber(number); return textsecure.storage.sessions._removeIdentityKeyForNumber(number);
}, },
getDeviceObject: function(encodedNumber) { getDeviceObject: function(encodedNumber) {
js/models/conversations.js
+7 -6
View File
@@ -241,12 +241,13 @@
throw 'No conflicts to resolve'; throw 'No conflicts to resolve';
} }
textsecure.storage.devices.removeIdentityKeyForNumber(number); return textsecure.storage.devices.removeIdentityKeyForNumber(number).then(function() {
this.messageCollection.each(function(message) { this.messageCollection.each(function(message) {
if (message.hasKeyConflict(number)) { if (message.hasKeyConflict(number)) {
message.resolveConflict(number); message.resolveConflict(number);
} }
}); });
}.bind(this));
} }
}); });
js/views/key_conflict_dialogue_view.js
+1 -2
View File
@@ -41,8 +41,7 @@
}, },
resolve: function() { resolve: function() {
new Promise(function(resolve) { new Promise(function(resolve) {
this.conversation.resolveConflicts(this.model.number); this.conversation.resolveConflicts(this.model.number).then(resolve);
resolve();
}.bind(this)); }.bind(this));
this.trigger('resolve'); this.trigger('resolve');
this.remove(); this.remove();
libtextsecure/storage/devices.js
+2 -2
View File
@@ -64,7 +64,7 @@
// Use textsecure.storage.devices.removeIdentityKeyForNumber (which calls this) instead // Use textsecure.storage.devices.removeIdentityKeyForNumber (which calls this) instead
_removeIdentityKeyForNumber: function(number) { _removeIdentityKeyForNumber: function(number) {
textsecure.storage.remove("sessions" + number); return Promise.resolve(textsecure.storage.remove("sessions" + number));
}, },
}; };
@@ -116,7 +116,7 @@
if (map === undefined) if (map === undefined)
throw new Error("Tried to remove identity for unknown number"); throw new Error("Tried to remove identity for unknown number");
textsecure.storage.remove("devices" + number); textsecure.storage.remove("devices" + number);
textsecure.storage.sessions._removeIdentityKeyForNumber(number); return textsecure.storage.sessions._removeIdentityKeyForNumber(number);
}, },
getDeviceObject: function(encodedNumber) { getDeviceObject: function(encodedNumber) {