thegamer/Cable-Desktop
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Replace numer->group with group->number->registrationId tracking

Browse source
This commit is contained in:
Matt Corallo 2014-12-24 18:48:02 -05:00
parent 67bb400b87
commit 0b19e5b9c3
1 changed files with 28 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
js/storage/groups.js
View file

@ -24,18 +24,12 @@
window.textsecure.storage = window.textsecure.storage || {}; window.textsecure.storage = window.textsecure.storage || {};
window.textsecure.storage.groups = { window.textsecure.storage.groups = {
getGroupListForNumber: function(number) {
return textsecure.storage.getEncrypted("groupMembership" + number, []);
},
createNewGroup: function(numbers, groupId) { createNewGroup: function(numbers, groupId) {
if (groupId !== undefined && textsecure.storage.getEncrypted("group" + groupId) !== undefined) { if (groupId !== undefined && textsecure.storage.getEncrypted("group" + groupId) !== undefined)
throw new Error("Tried to recreate group"); throw new Error("Tried to recreate group");
}
while (groupId === undefined || textsecure.storage.getEncrypted("group" + groupId) !== undefined) { while (groupId === undefined || textsecure.storage.getEncrypted("group" + groupId) !== undefined)
groupId = getString(textsecure.crypto.getRandomBytes(16)); groupId = getString(textsecure.crypto.getRandomBytes(16));
}
var me = textsecure.utils.unencodeNumber(textsecure.storage.getUnencrypted("number_id"))[0]; var me = textsecure.utils.unencodeNumber(textsecure.storage.getUnencrypted("number_id"))[0];
var haveMe = false; var haveMe = false;
@ -44,16 +38,18 @@
var number = libphonenumber.util.verifyNumber(numbers[i]); var number = libphonenumber.util.verifyNumber(numbers[i]);
if (number == me) if (number == me)
haveMe = true; haveMe = true;
if (finalNumbers.indexOf(number) < 0) { if (finalNumbers.indexOf(number) < 0)
finalNumbers.push(number); finalNumbers.push(number);
addGroupToNumber(groupId, number);
}
} }
if (!haveMe) if (!haveMe)
finalNumbers.push(me); finalNumbers.push(me);
textsecure.storage.putEncrypted("group" + groupId, {numbers: finalNumbers}); var groupObject = {numbers: finalNumbers, numberRegistrationIds: {}};
for (var i in finalNumbers)
groupObject.numberRegistrationIds[finalNumbers[i]] = {};
textsecure.storage.putEncrypted("group" + groupId, groupObject);
return {id: groupId, numbers: finalNumbers}; return {id: groupId, numbers: finalNumbers};
}, },
@ -84,8 +80,8 @@
var i = group.numbers.indexOf(number); var i = group.numbers.indexOf(number);
if (i > -1) { if (i > -1) {
group.numbers.slice(i, 1); group.numbers.slice(i, 1);
delete group.numberRegistrationIds[number];
textsecure.storage.putEncrypted("group" + groupId, group); textsecure.storage.putEncrypted("group" + groupId, group);
removeGroupFromNumber(groupId, number);
} }
return group.numbers; return group.numbers;
@ -100,7 +96,7 @@
var number = libphonenumber.util.verifyNumber(numbers[i]); var number = libphonenumber.util.verifyNumber(numbers[i]);
if (group.numbers.indexOf(number) < 0) { if (group.numbers.indexOf(number) < 0) {
group.numbers.push(number); group.numbers.push(number);
addGroupToNumber(groupId, number); group.numberRegistrationIds[number] = {};
} }
} }
@ -118,23 +114,24 @@
return 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.getEncrypted("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][encodedNumber] == registrationId)
return false;
var needUpdate = group.numberRegistrationIds[number][encodedNumber] !== undefined;
group.numberRegistrationIds[number][encodedNumber] = registrationId;
textsecure.storage.putEncrypted("group" + groupId, group);
return needUpdate;
},
}; };
var addGroupToNumber = function(groupId, number) {
var membership = textsecure.storage.getEncrypted("groupMembership" + number, [groupId]);
if (membership.indexOf(groupId) < 0)
membership.push(groupId);
textsecure.storage.putEncrypted("groupMembership" + number, membership);
}
var removeGroupFromNumber = function(groupId, number) {
var membership = textsecure.storage.getEncrypted("groupMembership" + number, [groupId]);
membership = membership.filter(function(group) { return group != groupId; });
if (membership.length == 0)
textsecure.storage.removeEncrypted("groupMembership" + number);
else
textsecure.storage.putEncrypted("groupMembership" + number, membership);
}
})(); })();