DRY up PushMessageContentProtobuf construction

Messages now know how to protobuf-ify themselves.
This commit is contained in:
lilia 2014-05-18 14:26:55 -07:00
parent 2601c3cc3a
commit 3bd559bbaa
3 changed files with 31 additions and 20 deletions

View file

@ -81,17 +81,19 @@ var Whisper = Whisper || {};
$button.attr("disabled", "disabled");
$button.find('span').text("Sending");
var messageProto = new PushMessageContentProtobuf();
messageProto.body = $input.val();
Whisper.Messages.addOutgoingMessage(messageProto, options.recipients);
var message = Whisper.Messages.addOutgoingMessage(
$input.val(), options.recipients
);
textsecure.sendMessage(options.recipients, messageProto, function(result) {
console.log(result);
$button.removeAttr("disabled");
$button.find('span').text("Send");
$input.val("");
});
textsecure.sendMessage(options.recipients, message.toProto(),
function(result) {
console.log(result);
$button.removeAttr("disabled");
$button.find('span').text("Send");
$input.val("");
}
);
});
},