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

Move Session storage to axolotlstore

Browse source
This commit is contained in:
lilia 2015-04-21 13:30:22 -07:00
parent 9de1572ba6
commit f38b18ef63
4 changed files with 80 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

48
js/libtextsecure.js
View file

@ -38094,52 +38094,6 @@ axolotlInternal.RecipientRecord = function() {
window.textsecure = window.textsecure || {};
window.textsecure.storage = window.textsecure.storage || {};
window.textsecure.storage.sessions = {
getSessionsForNumber: function(encodedNumber) {
return Promise.resolve((function() {
var number = textsecure.utils.unencodeNumber(encodedNumber)[0];
var deviceId = textsecure.utils.unencodeNumber(encodedNumber)[1];
var sessions = textsecure.storage.get("sessions" + number);
if (sessions === undefined)
return undefined;
if (sessions[deviceId] === undefined)
return undefined;
return sessions[deviceId];
})());
},
putSessionsForDevice: function(encodedNumber, record) {
var number = textsecure.utils.unencodeNumber(encodedNumber)[0];
var deviceId = textsecure.utils.unencodeNumber(encodedNumber)[1];
var sessions = textsecure.storage.get("sessions" + number);
if (sessions === undefined)
sessions = {};
sessions[deviceId] = record;
textsecure.storage.put("sessions" + number, sessions);
return textsecure.storage.devices.getDeviceObject(encodedNumber).then(function(device) {
if (device === undefined) {
return textsecure.storage.devices.getIdentityKeyForNumber(number).then(function(identityKey) {
device = { encodedNumber: encodedNumber,
//TODO: Remove this duplication
identityKey: identityKey
};
return textsecure.storage.devices.saveDeviceObject(device);
});
}
});
},
// Use textsecure.storage.devices.removeIdentityKeyForNumber (which calls this) instead
_removeIdentityKeyForNumber: function(number) {
return Promise.resolve(textsecure.storage.remove("sessions" + number));
},
};
window.textsecure.storage.devices = {
saveDeviceObject: function(deviceObject) {
return internalSaveDeviceObject(deviceObject, false);
@ -38195,7 +38149,7 @@ axolotlInternal.RecipientRecord = function() {
if (map === undefined)
throw new Error("Tried to remove identity for unknown number");
textsecure.storage.remove("devices" + number);
return textsecure.storage.sessions._removeIdentityKeyForNumber(number);
return textsecure.storage.axolotl.removeAllSessions(number);
})());
},