Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2026-04-25 10:58:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move, rename, and simplify toArrayBuffer helper

Browse Source 
This function is only ever used to convert groupIds from strings to
array buffers in sendmessage.

// FREEBIE
This commit is contained in:
lilia
2016-03-12 16:58:21 -08:00
parent c22a205d2e
commit 3e0bce2b21
4 changed files with 49 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
libtextsecure/sendmessage.js
View File

@@ -2,6 +2,18 @@
* vim: ts=4:sw=4:expandtab
*/
function stringToArrayBuffer(str) {
if (typeof str !== 'string') {
throw new Error('Passed non-string to stringToArrayBuffer');
}
var res = new ArrayBuffer(str.length);
var uint = new Uint8Array(res);
for (var i = 0; i < str.length; i++) {
uint[i] = str.charCodeAt(i);
}
return res;
}
function Message(options) {
this.body = options.body;
this.attachments = options.attachments || [];
@@ -68,7 +80,7 @@ Message.prototype = {
}
if (this.group) {
proto.group = new textsecure.protobuf.GroupContext();
proto.group.id = toArrayBuffer(this.group.id);
proto.group.id = stringToArrayBuffer(this.group.id);
proto.group.type = this.group.type
}
@@ -324,7 +336,7 @@ MessageSender.prototype = {
proto.group = new textsecure.protobuf.GroupContext();
return textsecure.storage.groups.createNewGroup(numbers).then(function(group) {
proto.group.id = toArrayBuffer(group.id);
proto.group.id = stringToArrayBuffer(group.id);
var numbers = group.numbers;
proto.group.type = textsecure.protobuf.GroupContext.Type.UPDATE;
@@ -344,7 +356,7 @@ MessageSender.prototype = {
var proto = new textsecure.protobuf.DataMessage();
proto.group = new textsecure.protobuf.GroupContext();
proto.group.id = toArrayBuffer(groupId);
proto.group.id = stringToArrayBuffer(groupId);
proto.group.type = textsecure.protobuf.GroupContext.Type.UPDATE;
proto.group.name = name;
@@ -366,7 +378,7 @@ MessageSender.prototype = {
addNumberToGroup: function(groupId, number) {
var proto = new textsecure.protobuf.DataMessage();
proto.group = new textsecure.protobuf.GroupContext();
proto.group.id = toArrayBuffer(groupId);
proto.group.id = stringToArrayBuffer(groupId);
proto.group.type = textsecure.protobuf.GroupContext.Type.UPDATE;
return textsecure.storage.groups.addNumbers(groupId, [number]).then(function(numbers) {
@@ -381,7 +393,7 @@ MessageSender.prototype = {
setGroupName: function(groupId, name) {
var proto = new textsecure.protobuf.DataMessage();
proto.group = new textsecure.protobuf.GroupContext();
proto.group.id = toArrayBuffer(groupId);
proto.group.id = stringToArrayBuffer(groupId);
proto.group.type = textsecure.protobuf.GroupContext.Type.UPDATE;
proto.group.name = name;
@@ -397,7 +409,7 @@ MessageSender.prototype = {
setGroupAvatar: function(groupId, avatar) {
var proto = new textsecure.protobuf.DataMessage();
proto.group = new textsecure.protobuf.GroupContext();
proto.group.id = toArrayBuffer(groupId);
proto.group.id = stringToArrayBuffer(groupId);
proto.group.type = textsecure.protobuf.GroupContext.Type.UPDATE;
return textsecure.storage.groups.getNumbers(groupId).then(function(numbers) {
@@ -415,7 +427,7 @@ MessageSender.prototype = {
leaveGroup: function(groupId) {
var proto = new textsecure.protobuf.DataMessage();
proto.group = new textsecure.protobuf.GroupContext();
proto.group.id = toArrayBuffer(groupId);
proto.group.id = stringToArrayBuffer(groupId);
proto.group.type = textsecure.protobuf.GroupContext.Type.QUIT;
return textsecure.storage.groups.getNumbers(groupId).then(function(numbers) {