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

Make libtextsecure group storage asynchronous

Browse source
This commit is contained in:
lilia 2015-05-06 13:11:12 -07:00
parent c26c6fc317
commit f774047935
5 changed files with 494 additions and 442 deletions
Download patch file Download diff file Expand all files Collapse all files

152
libtextsecure/storage/groups.js
View file

@ -25,110 +25,124 @@
window.textsecure.storage.groups = {
createNewGroup: function(numbers, groupId) {
if (groupId !== undefined && textsecure.storage.get("group" + groupId) !== undefined)
throw new Error("Tried to recreate group");
return Promise.resolve(function() {
if (groupId !== undefined && textsecure.storage.get("group" + groupId) !== undefined)
throw new Error("Tried to recreate group");
while (groupId === undefined || textsecure.storage.get("group" + groupId) !== undefined)
groupId = getString(textsecure.crypto.getRandomBytes(16));
while (groupId === undefined || textsecure.storage.get("group" + groupId) !== undefined)
groupId = getString(textsecure.crypto.getRandomBytes(16));
var me = textsecure.storage.user.getNumber();
var haveMe = false;
var finalNumbers = [];
for (var i in numbers) {
var number = numbers[i];
if (!textsecure.utils.isNumberSane(number))
throw new Error("Invalid number in group");
if (number == me)
haveMe = true;
if (finalNumbers.indexOf(number) < 0)
finalNumbers.push(number);
}
var me = textsecure.storage.user.getNumber();
var haveMe = false;
var finalNumbers = [];
for (var i in numbers) {
var number = numbers[i];
if (!textsecure.utils.isNumberSane(number))
throw new Error("Invalid number in group");
if (number == me)
haveMe = true;
if (finalNumbers.indexOf(number) < 0)
finalNumbers.push(number);
}
if (!haveMe)
finalNumbers.push(me);
if (!haveMe)
finalNumbers.push(me);
var groupObject = {numbers: finalNumbers, numberRegistrationIds: {}};
for (var i in finalNumbers)
groupObject.numberRegistrationIds[finalNumbers[i]] = {};
var groupObject = {numbers: finalNumbers, numberRegistrationIds: {}};
for (var i in finalNumbers)
groupObject.numberRegistrationIds[finalNumbers[i]] = {};
textsecure.storage.put("group" + groupId, groupObject);
textsecure.storage.put("group" + groupId, groupObject);
return {id: groupId, numbers: finalNumbers};
return {id: groupId, numbers: finalNumbers};
}());
},
getNumbers: function(groupId) {
var group = textsecure.storage.get("group" + groupId);
if (group === undefined)
return undefined;
return Promise.resolve(function() {
var group = textsecure.storage.get("group" + groupId);
if (group === undefined)
return undefined;
return group.numbers;
return group.numbers;
}());
},
removeNumber: function(groupId, number) {
var group = textsecure.storage.get("group" + groupId);
if (group === undefined)
return undefined;
return Promise.resolve(function() {
var group = textsecure.storage.get("group" + groupId);
if (group === undefined)
return undefined;
var me = textsecure.storage.user.getNumber();
if (number == me)
throw new Error("Cannot remove ourselves from a group, leave the group instead");
var me = textsecure.storage.user.getNumber();
if (number == me)
throw new Error("Cannot remove ourselves from a group, leave the group instead");
var i = group.numbers.indexOf(number);
if (i > -1) {
group.numbers.slice(i, 1);
delete group.numberRegistrationIds[number];
textsecure.storage.put("group" + groupId, group);
}
var i = group.numbers.indexOf(number);
if (i > -1) {
group.numbers.slice(i, 1);
delete group.numberRegistrationIds[number];
textsecure.storage.put("group" + groupId, group);
}
return group.numbers;
return group.numbers;
}());
},
addNumbers: function(groupId, numbers) {
var group = textsecure.storage.get("group" + groupId);
if (group === undefined)
return undefined;
return Promise.resolve(function() {
var group = textsecure.storage.get("group" + groupId);
if (group === undefined)
return undefined;
for (var i in numbers) {
var number = numbers[i];
if (!textsecure.utils.isNumberSane(number))
throw new Error("Invalid number in set to add to group");
if (group.numbers.indexOf(number) < 0) {
group.numbers.push(number);
group.numberRegistrationIds[number] = {};
for (var i in numbers) {
var number = numbers[i];
if (!textsecure.utils.isNumberSane(number))
throw new Error("Invalid number in set to add to group");
if (group.numbers.indexOf(number) < 0) {
group.numbers.push(number);
group.numberRegistrationIds[number] = {};
}
}
}
textsecure.storage.put("group" + groupId, group);
return group.numbers;
textsecure.storage.put("group" + groupId, group);
return group.numbers;
}());
},
deleteGroup: function(groupId) {
textsecure.storage.remove("group" + groupId);
return Promise.resolve(function() {
textsecure.storage.remove("group" + groupId);
}());
},
getGroup: function(groupId) {
var group = textsecure.storage.get("group" + groupId);
if (group === undefined)
return undefined;
return Promise.resolve(function() {
var group = textsecure.storage.get("group" + groupId);
if (group === undefined)
return undefined;
return { id: groupId, numbers: group.numbers }; //TODO: avatar/name tracking
return { id: groupId, numbers: group.numbers }; //TODO: avatar/name tracking
}());
},
needUpdateByDeviceRegistrationId: function(groupId, number, encodedNumber, registrationId) {
var group = textsecure.storage.get("group" + groupId);
if (group === undefined)
throw new Error("Unknown group for device registration id");
return Promise.resolve(function() {
var group = textsecure.storage.get("group" + groupId);
if (group === undefined)
throw new Error("Unknown group for device registration id");
if (group.numberRegistrationIds[number] === undefined)
throw new Error("Unknown number in group for device registration id");
if (group.numberRegistrationIds[number] === undefined)
throw new Error("Unknown number in group for device registration id");
if (group.numberRegistrationIds[number][encodedNumber] == registrationId)
return false;
if (group.numberRegistrationIds[number][encodedNumber] == registrationId)
return false;
var needUpdate = group.numberRegistrationIds[number][encodedNumber] !== undefined;
group.numberRegistrationIds[number][encodedNumber] = registrationId;
textsecure.storage.put("group" + groupId, group);
return needUpdate;
var needUpdate = group.numberRegistrationIds[number][encodedNumber] !== undefined;
group.numberRegistrationIds[number][encodedNumber] = registrationId;
textsecure.storage.put("group" + groupId, group);
return needUpdate;
}());
},
};
})();