diff --git a/background.html b/background.html
index c664fe5b4..49f52b134 100644
--- a/background.html
+++ b/background.html
@@ -231,7 +231,6 @@
-
diff --git a/background_test.html b/background_test.html
index 9eb5b923f..19e98cc31 100644
--- a/background_test.html
+++ b/background_test.html
@@ -231,7 +231,6 @@
-
diff --git a/js/views/file_input_view.js b/js/views/file_input_view.js
index 3181f3362..be69b1432 100644
--- a/js/views/file_input_view.js
+++ b/js/views/file_input_view.js
@@ -1,6 +1,5 @@
/* global textsecure: false */
/* global Whisper: false */
-/* global i18n: false */
/* global loadImage: false */
/* global Backbone: false */
/* global _: false */
@@ -27,16 +26,6 @@
});
},
- remove() {
- if (this.attachmentListView) {
- this.attachmentListView.remove();
- }
- if (this.captionEditorView) {
- this.captionEditorView.remove();
- }
-
- Backbone.View.prototype.remove.call(this);
- },
render() {
this.attachmentListView.update(this.getPropsForAttachmentList());
@@ -159,94 +148,6 @@
},
// Public interface
-
- hasFiles() {
- return this.attachments.length > 0;
- },
-
- async getFiles() {
- const files = await Promise.all(
- this.attachments.map(attachment => this.getFile(attachment))
- );
- this.clearAttachments();
- return files;
- },
-
- clearAttachments() {
- this.attachments.forEach(attachment => {
- if (attachment.url) {
- URL.revokeObjectURL(attachment.url);
- }
- if (attachment.videoUrl) {
- URL.revokeObjectURL(attachment.videoUrl);
- }
- });
-
- this.attachments = [];
- this.render();
- this.$el.trigger('force-resize');
- },
-
- // Show errors
- showLoadFailure() {
- window.pushToast({
- title: i18n('unableToLoadAttachment'),
- type: 'error',
- id: 'unableToLoadAttachment',
- });
- },
-
- showDangerousError() {
- window.pushToast({
- title: i18n('dangerousFileType'),
- type: 'error',
- id: 'dangerousFileType',
- });
- },
-
- showFileSizeError(limit, units) {
- window.pushToast({
- title: i18n('fileSizeWarning'),
- description: `Max size: ${limit} ${units}`,
- type: 'error',
- id: 'fileSizeWarning',
- });
- },
-
- showCannotMixError() {
- window.pushToast({
- title: i18n('cannotMixImageAndNonImageAttachments'),
- type: 'error',
- id: 'cannotMixImageAndNonImageAttachments',
- });
- },
-
- showMultipleNonImageError() {
- window.pushToast({
- title: i18n('oneNonImageAtATimeToast'),
- type: 'error',
- id: 'oneNonImageAtATimeToast',
- });
- },
-
- showMaximumAttachmentsError() {
- window.pushToast({
- title: i18n('maximumAttachments'),
- type: 'error',
- id: 'maximumAttachments',
- });
- },
-
- // Housekeeping
- addAttachment(attachment) {
- if (attachment.isVoiceNote && this.attachments.length > 0) {
- throw new Error('A voice note cannot be sent with other attachments');
- }
-
- this.attachments.push(attachment);
- this.render();
- },
-
async maybeAddAttachment(file) {
if (!file) {
return;
@@ -407,113 +308,5 @@
});
}
},
-
- autoScale(attachment) {
- const { contentType, file } = attachment;
- if (
- contentType.split('/')[0] !== 'image' ||
- contentType === 'image/tiff'
- ) {
- // nothing to do
- return Promise.resolve(attachment);
- }
-
- return new Promise((resolve, reject) => {
- const url = URL.createObjectURL(file);
- const img = document.createElement('img');
- img.onerror = reject;
- img.onload = () => {
- URL.revokeObjectURL(url);
-
- const maxSize = 6000 * 1024;
- const maxHeight = 4096;
- const maxWidth = 4096;
- if (
- img.naturalWidth <= maxWidth &&
- img.naturalHeight <= maxHeight &&
- file.size <= maxSize
- ) {
- resolve(attachment);
- return;
- }
-
- const gifMaxSize = 25000 * 1024;
- if (file.type === 'image/gif' && file.size <= gifMaxSize) {
- resolve(attachment);
- return;
- }
-
- if (file.type === 'image/gif') {
- reject(new Error('GIF is too large'));
- return;
- }
-
- const canvas = loadImage.scale(img, {
- canvas: true,
- maxWidth,
- maxHeight,
- });
-
- let quality = 0.95;
- let i = 4;
- let blob;
- do {
- i -= 1;
- blob = window.dataURLToBlobSync(
- canvas.toDataURL('image/jpeg', quality)
- );
- quality = (quality * maxSize) / blob.size;
- // NOTE: During testing with a large image, we observed the
- // `quality` value being > 1. Should we clamp it to [0.5, 1.0]?
- // See: https://developer.mozilla.org/en-US/docs/Web/API/HTMLCanvasElement/toBlob#Syntax
- if (quality < 0.5) {
- quality = 0.5;
- }
- } while (i > 0 && blob.size > maxSize);
-
- resolve({
- ...attachment,
- file: blob,
- });
- };
- img.src = url;
- });
- },
-
- async getFile(attachment) {
- if (!attachment) {
- return Promise.resolve();
- }
-
- const attachmentFlags = attachment.isVoiceNote
- ? textsecure.protobuf.AttachmentPointer.Flags.VOICE_MESSAGE
- : null;
-
- const scaled = await this.autoScale(attachment);
- const fileRead = await this.readFile(scaled);
- return {
- ...fileRead,
- url: undefined,
- videoUrl: undefined,
- flags: attachmentFlags || null,
- };
- },
-
- readFile(attachment) {
- return new Promise((resolve, reject) => {
- const FR = new FileReader();
- FR.onload = e => {
- const data = e.target.result;
- resolve({
- ...attachment,
- data,
- size: data.byteLength,
- });
- };
- FR.onerror = reject;
- FR.onabort = reject;
- FR.readAsArrayBuffer(attachment.file);
- });
- },
});
})();
diff --git a/test/index.html b/test/index.html
index fa36bea9e..ee8c252b8 100644
--- a/test/index.html
+++ b/test/index.html
@@ -268,7 +268,6 @@
-
diff --git a/ts/components/session/conversation/SessionCompositionBox.tsx b/ts/components/session/conversation/SessionCompositionBox.tsx
index c64733998..a5f87ddeb 100644
--- a/ts/components/session/conversation/SessionCompositionBox.tsx
+++ b/ts/components/session/conversation/SessionCompositionBox.tsx
@@ -19,6 +19,7 @@ import { toArray } from 'react-emoji-render';
import { SessionQuotedMessageComposition } from './SessionQuotedMessageComposition';
import { Flex } from '../Flex';
import { AttachmentList } from '../../conversation/AttachmentList';
+import { ToastUtils } from '../../../session/utils';
export interface ReplyingToMessageProps {
convoId: string;
@@ -499,12 +500,12 @@ export class SessionCompositionBox extends React.Component {
const { stagedAttachments } = this.state;
if (window.Signal.Util.isFileDangerous(fileName)) {
- // this.showDangerousError();
+ ToastUtils.pushDangerousFileError();
return;
}
if (stagedAttachments.length >= 32) {
- // this.showMaximumAttachmentsError();
+ ToastUtils.pushMaximumAttachmentsError();
return;
}
@@ -514,13 +515,13 @@ export class SessionCompositionBox extends React.Component {
);
// You can't add another attachment if you already have a non-image staged
if (haveNonImage) {
- // this.showMultipleNonImageError();
+ ToastUtils.pushMultipleNonImageError();
return;
}
// You can't add a non-image attachment if you already have attachments staged
if (!MIME.isImage(contentType) && stagedAttachments.length > 0) {
- // this.showCannotMixError();
+ ToastUtils.pushCannotMixError();
return;
}
const { VisualAttachment } = window.Signal.Types;
@@ -623,7 +624,7 @@ export class SessionCompositionBox extends React.Component {
error && error.stack ? error.stack : error
);
- // this.showLoadFailure();
+ ToastUtils.pushLoadAttachmentFailure();
return;
}
diff --git a/ts/session/utils/Toast.ts b/ts/session/utils/Toast.ts
index bf2edb945..664fc3cb1 100644
--- a/ts/session/utils/Toast.ts
+++ b/ts/session/utils/Toast.ts
@@ -8,3 +8,53 @@ export function push(options: {
}) {
window.pushToast(options);
}
+
+export function pushLoadAttachmentFailure() {
+ window.pushToast({
+ title: window.i18n('unableToLoadAttachment'),
+ type: 'error',
+ id: 'unableToLoadAttachment',
+ });
+}
+
+
+export function pushDangerousFileError() {
+ window.pushToast({
+ title: window.i18n('dangerousFileType'),
+ type: 'error',
+ id: 'dangerousFileType',
+ });
+}
+
+export function pushFileSizeError(limit: number, units: string) {
+ window.pushToast({
+ title: window.i18n('fileSizeWarning'),
+ description: `Max size: ${limit} ${units}`,
+ type: 'error',
+ id: 'fileSizeWarning',
+ });
+}
+
+export function pushMultipleNonImageError() {
+ window.pushToast({
+ title: window.i18n('cannotMixImageAndNonImageAttachments'),
+ type: 'error',
+ id: 'cannotMixImageAndNonImageAttachments',
+ });
+}
+
+export function pushCannotMixError() {
+ window.pushToast({
+ title: window.i18n('oneNonImageAtATimeToast'),
+ type: 'error',
+ id: 'oneNonImageAtATimeToast',
+ });
+}
+
+export function pushMaximumAttachmentsError() {
+ window.pushToast({
+ title: window.i18n('maximumAttachments'),
+ type: 'error',
+ id: 'maximumAttachments',
+ });
+}
diff --git a/ts/util/lint/linter.ts b/ts/util/lint/linter.ts
index a0773fbc6..36c8462ab 100644
--- a/ts/util/lint/linter.ts
+++ b/ts/util/lint/linter.ts
@@ -52,7 +52,6 @@ const excludedFiles = [
// High-traffic files in our project
'^js/models/messages.js',
'^js/views/conversation_view.js',
- '^js/views/file_input_view.js',
'^js/background.js',
// Generated files