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

Wire up Message / Attachment migration functions on startup

Browse source 
Makes `migrationContext` obsolete.
This commit is contained in:
Daniel Gasienica 2018-03-26 10:17:45 -04:00
parent 867f73b80a
commit 0c06fff47b
5 changed files with 25 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

5
js/views/message_view.js
View file

@ -7,7 +7,7 @@
window.Whisper = window.Whisper || {};
const { Attachment } = window.Signal.Types;
const { context: migrationContext } = window.Signal.Migrations;
const { loadAttachmentData } = window.Signal.Migrations;
var URL_REGEX = /(^|[\s\n]|<br\/?>)((?:https?|ftp):\/\/[\-A-Z0-9\u00A0-\uD7FF\uE000-\uFDCF\uFDF0-\uFFFD+\u0026\u2019@#\/%?=()~_|!:,.;]*[\-A-Z0-9+\u0026@#\/%=~()_|])/gi;
@ -416,11 +416,10 @@
return this.loadedAttachmentViews;
}
const loadData = Attachment.loadData(migrationContext.readAttachmentData);
const attachments = this.model.get('attachments') || [];
const loadedAttachmentViews = Promise.all(attachments.map(attachment =>
new Promise(async (resolve) => {
const attachmentWithData = await loadData(attachment);
const attachmentWithData = await loadAttachmentData(attachment);
const view = new Whisper.AttachmentView({
model: attachmentWithData,
timestamp: this.model.get('sent_at'),