Merge (un)encrypted storage layers
This commit is contained in:
parent
454b4726bd
commit
00cb420d37
12 changed files with 102 additions and 143 deletions
|
@ -46,7 +46,7 @@
|
|||
},
|
||||
|
||||
getDeviceObjectsForNumber: function(number) {
|
||||
var map = textsecure.storage.getEncrypted("devices" + number);
|
||||
var map = textsecure.storage.get("devices" + number);
|
||||
if (map === undefined)
|
||||
return [];
|
||||
for (key in map.devices) {
|
||||
|
@ -62,23 +62,23 @@
|
|||
},
|
||||
|
||||
getIdentityKeyForNumber: function(number) {
|
||||
var map = textsecure.storage.getEncrypted("devices" + number);
|
||||
var map = textsecure.storage.get("devices" + number);
|
||||
return map === undefined ? undefined : map.identityKey;
|
||||
},
|
||||
|
||||
checkSaveIdentityKeyForNumber: function(number, identityKey) {
|
||||
var map = textsecure.storage.getEncrypted("devices" + number);
|
||||
var map = textsecure.storage.get("devices" + number);
|
||||
if (map === undefined)
|
||||
textsecure.storage.putEncrypted("devices" + number, { devices: [], identityKey: identityKey});
|
||||
textsecure.storage.put("devices" + number, { devices: [], identityKey: identityKey});
|
||||
else if (getString(map.identityKey) !== getString(identityKey))
|
||||
throw new Error("Attempted to overwrite a different identity key");
|
||||
},
|
||||
|
||||
removeIdentityKeyForNumber: function(number) {
|
||||
var map = textsecure.storage.getEncrypted("devices" + number);
|
||||
var map = textsecure.storage.get("devices" + number);
|
||||
if (map === undefined)
|
||||
throw new Error("Tried to remove identity for unknown number");
|
||||
textsecure.storage.removeEncrypted("devices" + number);
|
||||
textsecure.storage.remove("devices" + number);
|
||||
},
|
||||
|
||||
getDeviceObject: function(encodedNumber, returnIdentityKey) {
|
||||
|
@ -104,7 +104,7 @@
|
|||
},
|
||||
|
||||
removeDeviceIdsForNumber: function(number, deviceIdsToRemove) {
|
||||
var map = textsecure.storage.getEncrypted("devices" + number);
|
||||
var map = textsecure.storage.get("devices" + number);
|
||||
if (map === undefined)
|
||||
throw new Error("Tried to remove device for unknown number");
|
||||
|
||||
|
@ -126,10 +126,10 @@
|
|||
throw new Error("Tried to remove unknown device");
|
||||
|
||||
if (newDevices.length === 0)
|
||||
textsecure.storage.removeEncrypted("devices" + number);
|
||||
textsecure.storage.remove("devices" + number);
|
||||
else {
|
||||
map.devices = newDevices;
|
||||
textsecure.storage.putEncrypted("devices" + number, map);
|
||||
textsecure.storage.put("devices" + number, map);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
@ -139,7 +139,7 @@
|
|||
throw new Error("Tried to store invalid deviceObject");
|
||||
|
||||
var number = textsecure.utils.unencodeNumber(deviceObject.encodedNumber)[0];
|
||||
var map = textsecure.storage.getEncrypted("devices" + number);
|
||||
var map = textsecure.storage.get("devices" + number);
|
||||
|
||||
if (deviceObject.sessions !== undefined)
|
||||
deviceObject.sessions = deviceObject.sessions.serialize()
|
||||
|
@ -170,6 +170,6 @@
|
|||
map.devices.push(deviceObject);
|
||||
}
|
||||
|
||||
textsecure.storage.putEncrypted("devices" + number, map);
|
||||
textsecure.storage.put("devices" + number, map);
|
||||
};
|
||||
})();
|
||||
|
|
|
@ -25,10 +25,10 @@
|
|||
|
||||
window.textsecure.storage.groups = {
|
||||
createNewGroup: function(numbers, groupId) {
|
||||
if (groupId !== undefined && textsecure.storage.getEncrypted("group" + groupId) !== undefined)
|
||||
if (groupId !== undefined && textsecure.storage.get("group" + groupId) !== undefined)
|
||||
throw new Error("Tried to recreate group");
|
||||
|
||||
while (groupId === undefined || textsecure.storage.getEncrypted("group" + groupId) !== undefined)
|
||||
while (groupId === undefined || textsecure.storage.get("group" + groupId) !== undefined)
|
||||
groupId = getString(textsecure.crypto.getRandomBytes(16));
|
||||
|
||||
var me = textsecure.storage.user.getNumber();
|
||||
|
@ -51,13 +51,13 @@
|
|||
for (var i in finalNumbers)
|
||||
groupObject.numberRegistrationIds[finalNumbers[i]] = {};
|
||||
|
||||
textsecure.storage.putEncrypted("group" + groupId, groupObject);
|
||||
textsecure.storage.put("group" + groupId, groupObject);
|
||||
|
||||
return {id: groupId, numbers: finalNumbers};
|
||||
},
|
||||
|
||||
getNumbers: function(groupId) {
|
||||
var group = textsecure.storage.getEncrypted("group" + groupId);
|
||||
var group = textsecure.storage.get("group" + groupId);
|
||||
if (group === undefined)
|
||||
return undefined;
|
||||
|
||||
|
@ -65,7 +65,7 @@
|
|||
},
|
||||
|
||||
removeNumber: function(groupId, number) {
|
||||
var group = textsecure.storage.getEncrypted("group" + groupId);
|
||||
var group = textsecure.storage.get("group" + groupId);
|
||||
if (group === undefined)
|
||||
return undefined;
|
||||
|
||||
|
@ -77,14 +77,14 @@
|
|||
if (i > -1) {
|
||||
group.numbers.slice(i, 1);
|
||||
delete group.numberRegistrationIds[number];
|
||||
textsecure.storage.putEncrypted("group" + groupId, group);
|
||||
textsecure.storage.put("group" + groupId, group);
|
||||
}
|
||||
|
||||
return group.numbers;
|
||||
},
|
||||
|
||||
addNumbers: function(groupId, numbers) {
|
||||
var group = textsecure.storage.getEncrypted("group" + groupId);
|
||||
var group = textsecure.storage.get("group" + groupId);
|
||||
if (group === undefined)
|
||||
return undefined;
|
||||
|
||||
|
@ -98,16 +98,16 @@
|
|||
}
|
||||
}
|
||||
|
||||
textsecure.storage.putEncrypted("group" + groupId, group);
|
||||
textsecure.storage.put("group" + groupId, group);
|
||||
return group.numbers;
|
||||
},
|
||||
|
||||
deleteGroup: function(groupId) {
|
||||
textsecure.storage.removeEncrypted("group" + groupId);
|
||||
textsecure.storage.remove("group" + groupId);
|
||||
},
|
||||
|
||||
getGroup: function(groupId) {
|
||||
var group = textsecure.storage.getEncrypted("group" + groupId);
|
||||
var group = textsecure.storage.get("group" + groupId);
|
||||
if (group === undefined)
|
||||
return undefined;
|
||||
|
||||
|
@ -115,7 +115,7 @@
|
|||
},
|
||||
|
||||
needUpdateByDeviceRegistrationId: function(groupId, number, encodedNumber, registrationId) {
|
||||
var group = textsecure.storage.getEncrypted("group" + groupId);
|
||||
var group = textsecure.storage.get("group" + groupId);
|
||||
if (group === undefined)
|
||||
throw new Error("Unknown group for device registration id");
|
||||
|
||||
|
@ -127,7 +127,7 @@
|
|||
|
||||
var needUpdate = group.numberRegistrationIds[number][encodedNumber] !== undefined;
|
||||
group.numberRegistrationIds[number][encodedNumber] = registrationId;
|
||||
textsecure.storage.putEncrypted("group" + groupId, group);
|
||||
textsecure.storage.put("group" + groupId, group);
|
||||
return needUpdate;
|
||||
},
|
||||
};
|
||||
|
|
|
@ -25,18 +25,18 @@
|
|||
|
||||
window.textsecure.storage.user = {
|
||||
setNumberAndDeviceId: function(number, deviceId) {
|
||||
textsecure.storage.putUnencrypted("number_id", number + "." + deviceId);
|
||||
textsecure.storage.put("number_id", number + "." + deviceId);
|
||||
},
|
||||
|
||||
getNumber: function(key, defaultValue) {
|
||||
var number_id = textsecure.storage.getUnencrypted("number_id");
|
||||
var number_id = textsecure.storage.get("number_id");
|
||||
if (number_id === undefined)
|
||||
return undefined;
|
||||
return textsecure.utils.unencodeNumber(number_id)[0];
|
||||
},
|
||||
|
||||
getDeviceId: function(key) {
|
||||
var number_id = textsecure.storage.getUnencrypted("number_id");
|
||||
var number_id = textsecure.storage.get("number_id");
|
||||
if (number_id === undefined)
|
||||
return undefined;
|
||||
return textsecure.utils.unencodeNumber(number_id)[1];
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue