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

Use FileReader to base64 encode attachments

Browse source 
* Implements #82
This commit is contained in:
Arlo Breault 2014-11-02 13:48:35 -08:00 • committed by lilia
parent 6e3014895b
commit bc5dea62c3
3 changed files with 69 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

64
js/models/threads.js
View file

@ -22,37 +22,41 @@ var Whisper = Whisper || {};
},
sendMessage: function(message, attachments) {
var timestamp = Date.now();
var base64_attachments = _.map(attachments, function(a) {
return ['data:', a.contentType, ';base64,', btoa(getString(a.data))].join('');
return Promise.all(attachments.map(function(a) {
return new Promise(function(resolve, reject) {
var dataView = new DataView(a.data);
var blob = new Blob([dataView], { type: a.contentType });
var FR = new FileReader();
FR.onload = function(e) {
resolve(e.target.result);
};
FR.onerror = reject;
FR.readAsDataURL(blob);
});
})).then(function(base64_attachments) {
var timestamp = Date.now();
this.messages().add({ type: 'outgoing',
body: message,
threadId: this.id,
attachments: base64_attachments,
timestamp: timestamp }).save();
this.save({ timestamp: timestamp,
unreadCount: 0,
active: true});
if (this.get('type') == 'private') {
return textsecure.messaging.sendMessageToNumber(this.get('id'), message, attachments);
}
else {
return textsecure.messaging.sendMessageToGroup(this.get('groupId'), message, attachments);
}
}.bind(this)).then(function(result) {
console.log(result);
}).catch(function(error) {
console.log(error);
});
this.messages().add({ type: 'outgoing',
body: message,
threadId: this.id,
attachments: base64_attachments,
timestamp: timestamp }).save();
this.save({ timestamp: timestamp,
unreadCount: 0,
active: true});
if (this.get('type') == 'private') {
var promise = textsecure.messaging.sendMessageToNumber(this.get('id'), message, attachments)
}
else {
var promise = textsecure.messaging.sendMessageToGroup(this.get('groupId'), message, attachments);
}
promise.then(
function(result) {
console.log(result);
}
).catch(
function(error) {
console.log(error);
}
);
},
messages: function() {