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

Bug and test fixes for contact sync

Browse source 
Closes #135

// FREEBIE
This commit is contained in:
lilia 2015-06-17 15:59:14 -07:00
parent 6a5f923cac
commit 8dc4e34aaf
4 changed files with 29 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
js/background.js
View file

@ -53,7 +53,8 @@
messageReceiver = new textsecure.MessageReceiver(window); messageReceiver = new textsecure.MessageReceiver(window);
} }
function onContactReceived(contactInfo) { function onContactReceived(ev) {
var contactInfo = ev.contactInfo;
new Whisper.Conversation({ new Whisper.Conversation({
name: contactInfo.name, name: contactInfo.name,
id: contactInfo.number, id: contactInfo.number,
@ -63,7 +64,8 @@
}).save(); }).save();
} }
function onGroupReceived(group) { function onGroupReceived(ev) {
var group = ev.group;
new Whisper.Conversation({ new Whisper.Conversation({
members: group.members, members: group.members,
name: group.name, name: group.name,

7
js/libtextsecure.js
View file

@ -40134,13 +40134,18 @@ ContactBuffer.prototype = {
constructor: ContactBuffer, constructor: ContactBuffer,
readContact: function() { readContact: function() {
try { try {
var len = this.buffer.readVarint32(); if (this.buffer.limit === this.buffer.offset) {
return undefined; // eof
}
var len = this.buffer.readVarint64().toNumber();
var contactInfoBuffer = this.buffer.slice(this.buffer.offset, this.buffer.offset+len); var contactInfoBuffer = this.buffer.slice(this.buffer.offset, this.buffer.offset+len);
var contactInfo = textsecure.protobuf.ContactDetails.decode(contactInfoBuffer); var contactInfo = textsecure.protobuf.ContactDetails.decode(contactInfoBuffer);
this.buffer.skip(len); this.buffer.skip(len);
if (contactInfo.avatar) {
var attachmentLen = contactInfo.avatar.length.toNumber(); var attachmentLen = contactInfo.avatar.length.toNumber();
contactInfo.avatar.data = this.buffer.slice(this.buffer.offset, this.buffer.offset + attachmentLen).toArrayBuffer(true); contactInfo.avatar.data = this.buffer.slice(this.buffer.offset, this.buffer.offset + attachmentLen).toArrayBuffer(true);
this.buffer.skip(attachmentLen); this.buffer.skip(attachmentLen);
}
return contactInfo; return contactInfo;
} catch(e) { } catch(e) {

7
libtextsecure/contacts_parser.js
View file

@ -11,13 +11,18 @@ ContactBuffer.prototype = {
constructor: ContactBuffer, constructor: ContactBuffer,
readContact: function() { readContact: function() {
try { try {
var len = this.buffer.readVarint32(); if (this.buffer.limit === this.buffer.offset) {
return undefined; // eof
}
var len = this.buffer.readVarint64().toNumber();
var contactInfoBuffer = this.buffer.slice(this.buffer.offset, this.buffer.offset+len); var contactInfoBuffer = this.buffer.slice(this.buffer.offset, this.buffer.offset+len);
var contactInfo = textsecure.protobuf.ContactDetails.decode(contactInfoBuffer); var contactInfo = textsecure.protobuf.ContactDetails.decode(contactInfoBuffer);
this.buffer.skip(len); this.buffer.skip(len);
if (contactInfo.avatar) {
var attachmentLen = contactInfo.avatar.length.toNumber(); var attachmentLen = contactInfo.avatar.length.toNumber();
contactInfo.avatar.data = this.buffer.slice(this.buffer.offset, this.buffer.offset + attachmentLen).toArrayBuffer(true); contactInfo.avatar.data = this.buffer.slice(this.buffer.offset, this.buffer.offset + attachmentLen).toArrayBuffer(true);
this.buffer.skip(attachmentLen); this.buffer.skip(attachmentLen);
}
return contactInfo; return contactInfo;
} catch(e) { } catch(e) {

8
libtextsecure/test/contacts_parser_test.js
View file

@ -39,16 +39,18 @@ describe("ContactsBuffer", function() {
buffer.append(avatarBuffer.clone()); buffer.append(avatarBuffer.clone());
} }
buffer.limit = buffer.offset;
buffer.offset = 0; buffer.offset = 0;
buffer.limit = buffer.buffer.byteLength;
return buffer.toArrayBuffer(); return buffer.toArrayBuffer();
} }
it("parses an array buffer of contacts", function() { it("parses an array buffer of contacts", function() {
var arrayBuffer = getTestBuffer(); var arrayBuffer = getTestBuffer();
var contactBuffer = new ContactBuffer(arrayBuffer); var contactBuffer = new ContactBuffer(arrayBuffer);
for (var i=0; i < 3; ++i) {
var contact = contactBuffer.readContact(); var contact = contactBuffer.readContact();
var count = 0;
while (contact !== undefined) {
count++;
assert.strictEqual(contact.name, "Zero Cool"); assert.strictEqual(contact.name, "Zero Cool");
assert.strictEqual(contact.number, "+10000000000"); assert.strictEqual(contact.number, "+10000000000");
assert.strictEqual(contact.avatar.contentType, "image/jpg"); assert.strictEqual(contact.avatar.contentType, "image/jpg");
@ -56,6 +58,8 @@ describe("ContactsBuffer", function() {
for (var j=0; j < 255; ++j) { for (var j=0; j < 255; ++j) {
assert.strictEqual(avatarBytes[j],j); assert.strictEqual(avatarBytes[j],j);
} }
contact = contactBuffer.readContact();
} }
assert.strictEqual(count, 3);
}); });
}); });