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

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

7
libtextsecure/sendmessage.js
View file

@ -256,9 +256,8 @@ window.textsecure.messaging = function() {
}
var sendSyncMessage = function(message, timestamp, destination) {
var numberDevice = textsecure.utils.unencodeNumber(textsecure.storage.getUnencrypted("number_id"));
var myNumber = numberDevice[0];
var myDevice = numberDevice[1];
var myNumber = textsecure.storage.user.getNumber();
var myDevice = textsecure.storage.user.getDeviceId();
if (myDevice != 1) {
var sync_message = textsecure.protobuf.PushMessageContent.decode(message.encode());
sync_message.sync = new textsecure.protobuf.PushMessageContent.SyncMessageContext();
@ -270,7 +269,7 @@ window.textsecure.messaging = function() {
var sendGroupProto = function(numbers, proto, timestamp) {
timestamp = timestamp || Date.now();
var me = textsecure.utils.unencodeNumber(textsecure.storage.getUnencrypted("number_id"))[0];
var me = textsecure.storage.user.getNumber();
numbers = numbers.filter(function(number) { return number != me; });
return new Promise(function(resolve, reject) {