Replace load/decode/index around our own number with helpers

This commit is contained in:
Matt Corallo 2015-03-24 15:48:59 -07:00 committed by lilia
parent 3759fe46e9
commit 454b4726bd
12 changed files with 120 additions and 41 deletions

View file

@ -31,7 +31,7 @@
while (groupId === undefined || textsecure.storage.getEncrypted("group" + groupId) !== undefined)
groupId = getString(textsecure.crypto.getRandomBytes(16));
var me = textsecure.utils.unencodeNumber(textsecure.storage.getUnencrypted("number_id"))[0];
var me = textsecure.storage.user.getNumber();
var haveMe = false;
var finalNumbers = [];
for (var i in numbers) {
@ -69,7 +69,7 @@
if (group === undefined)
return undefined;
var me = textsecure.utils.unencodeNumber(textsecure.storage.getUnencrypted("number_id"))[0];
var me = textsecure.storage.user.getNumber();
if (number == me)
throw new Error("Cannot remove ourselves from a group, leave the group instead");