Bug and test fixes for contact sync

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

View file

@ -11,13 +11,18 @@ ContactBuffer.prototype = {
constructor: ContactBuffer,
readContact: function() {
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 contactInfo = textsecure.protobuf.ContactDetails.decode(contactInfoBuffer);
this.buffer.skip(len);
var attachmentLen = contactInfo.avatar.length.toNumber();
contactInfo.avatar.data = this.buffer.slice(this.buffer.offset, this.buffer.offset + attachmentLen).toArrayBuffer(true);
this.buffer.skip(attachmentLen);
if (contactInfo.avatar) {
var attachmentLen = contactInfo.avatar.length.toNumber();
contactInfo.avatar.data = this.buffer.slice(this.buffer.offset, this.buffer.offset + attachmentLen).toArrayBuffer(true);
this.buffer.skip(attachmentLen);
}
return contactInfo;
} catch(e) {