matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-11 20:22:36 +03:00
Code Activity

Merge pull request #1972 from matrix-org/t3chguy/media_fixes

Browse Source 
fix e2ee file/media stuff
This commit is contained in:
David Baker
2018-06-18 13:56:00 +01:00
committed by GitHub
parent e7aa2ae009 1ae51a8332
commit 499bb5cfb4
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/ContentMessages.js
View File

@@ -243,6 +243,7 @@ function uploadFile(matrixClient, roomId, file, progressHandler) {
const blob = new Blob([encryptResult.data]); const blob = new Blob([encryptResult.data]);
return matrixClient.uploadContent(blob, { return matrixClient.uploadContent(blob, {
progressHandler: progressHandler, progressHandler: progressHandler,
includeFilename: false,
}).then(function(url) { }).then(function(url) {
// If the attachment is encrypted then bundle the URL along // If the attachment is encrypted then bundle the URL along
// with the information needed to decrypt the attachment and // with the information needed to decrypt the attachment and

1
src/components/views/messages/MFileBody.js
View File

@@ -327,6 +327,7 @@ module.exports = React.createClass({
// will have the correct name when the user tries to download it. // will have the correct name when the user tries to download it.
// We can't provide a Content-Disposition header like we would for HTTP. // We can't provide a Content-Disposition header like we would for HTTP.
download: fileName, download: fileName,
rel: "noopener",
target: "_blank", target: "_blank",
textContent: _t("Download %(text)s", { text: text }), textContent: _t("Download %(text)s", { text: text }),
}, "*"); }, "*");