toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Automated cherry pick of #4160 (#4161)

Browse source 
* Correctly load file attachment images

* Remove cache control from gallery

* Remove unused import

Co-authored-by: Elias Nahum <nahumhbl@gmail.com>
This commit is contained in:
Mattermost Build 2020-04-16 22:33:45 +02:00 committed by GitHub
parent fc25935482
commit 7a4e7711d1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/components/file_attachment_list/file_attachment_image.js
View file

@ -13,7 +13,6 @@ import FastImage from 'react-native-fast-image';
import {Client4} from 'mattermost-redux/client';
import ProgressiveImage from 'app/components/progressive_image';
import {isGif} from 'app/utils/file';
import {changeOpacity} from 'app/utils/theme';
import thumb from 'assets/images/thumb.png';
@ -57,11 +56,16 @@ export default class FileAttachmentImage extends PureComponent {
const {file} = props;
if (file && file.id) {
const preloadImages = [{uri: Client4.getFileThumbnailUrl(file.id)}];
const headers = {
Authorization: `Bearer ${Client4.getToken()}`,
'X-CSRF-Token': Client4.csrf,
'X-Requested-With': 'XMLHttpRequest',
};
if (isGif(file)) {
preloadImages.push({uri: Client4.getFileUrl(file.id)});
}
const preloadImages = [
{uri: Client4.getFileThumbnailUrl(file.id), headers},
{uri: Client4.getFileUrl(file.id), headers},
];
FastImage.preload(preloadImages);
}
@ -94,7 +98,7 @@ export default class FileAttachmentImage extends PureComponent {
imageProps.defaultSource = {uri: file.localPath};
} else if (file.id) {
imageProps.thumbnailUri = Client4.getFileThumbnailUrl(file.id);
imageProps.imageUri = Client4.getFilePreviewUrl(file.id);
imageProps.imageUri = Client4.getFileUrl(file.id);
}
return imageProps;
};
@ -149,6 +153,8 @@ export default class FileAttachmentImage extends PureComponent {
return this.renderSmallImage();
}
const imageProps = this.imageProps(file);
return (
<View
ref={this.handleCaptureRef}
@ -162,7 +168,7 @@ export default class FileAttachmentImage extends PureComponent {
filename={file.name}
resizeMode={resizeMode}
resizeMethod={resizeMethod}
{...this.imageProps(file)}
{...imageProps}
/>
</View>
);

4
app/components/file_attachment_list/file_attachment_list.js
View file

@ -120,10 +120,8 @@ export default class FileAttachmentList extends PureComponent {
let uri;
if (file.localPath) {
uri = file.localPath;
} else if (isGif(file)) {
uri = Client4.getFileUrl(file.id);
} else {
uri = Client4.getFilePreviewUrl(file.id);
uri = Client4.getFileUrl(file.id);
}
results.push({

3
app/components/progressive_image/progressive_image.js
View file

@ -74,8 +74,7 @@ export default class ProgressiveImage extends PureComponent {
load = () => {
const {imageUri, thumbnailUri} = this.props;
if (thumbnailUri && imageUri) {
FastImage.preload([{uri: imageUri}]);
if (thumbnailUri) {
this.setThumbnail(thumbnailUri);
} else if (imageUri) {
this.setImage(imageUri);