Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2025-12-27 13:40:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace custom with blob-util functions

Browse Source 
IMPORTANT: All of them are async so we need to use `await`, otherwise we get
strange or silent errors.
This commit is contained in:
Daniel Gasienica
2018-02-13 11:34:23 -05:00
parent f95150f6a9
commit e56101e229
1 changed files with 3 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
js/modules/types/attachment.js
View File

@@ -1,7 +1,7 @@
/* eslint-env browser */
const dataURLToBlob = require('blueimp-canvas-to-blob');
const MIME = require('./mime');
const { arrayBufferToBlob, blobToArrayBuffer, dataURLToBlob } = require('blob-util');
const { autoOrientImage } = require('../auto_orient_image');
// Increment this everytime we change how attachments are processed. This allows us to
@@ -23,26 +23,6 @@ const CURRENT_PROCESS_VERSION = 1;
// data: ArrayBuffer
// }
// Data type conversion
const blobToArrayBuffer = blob =>
new Promise((resolve, reject) => {
const fileReader = new FileReader();
fileReader.onload = event =>
resolve(event.target.result);
fileReader.onerror = (event) => {
const error = new Error('blobToArrayBuffer: Failed to convert blob');
error.cause = event;
reject(error);
};
fileReader.readAsArrayBuffer(blob);
});
const arrayBufferToBlob = (arrayBuffer, mimeType) =>
new Blob([arrayBuffer], { type: mimeType });
// Middleware
// type ProcessingStep = Attachment -> Promise Attachment
@@ -80,8 +60,8 @@ const autoOrientJPEG = async (attachment) => {
return attachment;
}
const dataBlob = arrayBufferToBlob(attachment.data, attachment.contentType);
const newDataBlob = dataURLToBlob(await autoOrientImage(dataBlob));
const dataBlob = await arrayBufferToBlob(attachment.data, attachment.contentType);
const newDataBlob = await dataURLToBlob(await autoOrientImage(dataBlob));
const newDataArrayBuffer = await blobToArrayBuffer(newDataBlob);
// IMPORTANT: We overwrite the existing `data` `ArrayBuffer` losing the original