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

Fixed null pointer in ProfilePicture (#1595)

Browse source
This commit is contained in:
Harrison Healey 2018-04-17 10:40:09 -04:00 committed by Saturnino Abril
parent 1e79923e95
commit 5a23129a50
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/components/profile_picture/profile_picture.js
View file

@ -52,7 +52,7 @@ export default class ProfilePicture extends PureComponent {
if (edit && imageUri) {
this.setImageURL(imageUri);
} else {
} else if (user) {
ImageCacheManager.cache('', Client4.getProfilePictureUrl(user.id, user.last_picture_update), this.setImageURL);
}
}
@ -63,6 +63,18 @@ export default class ProfilePicture extends PureComponent {
}
}
componentWillUpdate(nextProps) {
if (Boolean(nextProps.user) !== Boolean(this.props.user) || nextProps.user.id !== this.props.user.id) {
this.setState({pictureUrl: null});
const nextUser = nextProps.user;
if (nextUser) {
ImageCacheManager.cache('', Client4.getProfilePictureUrl(nextUser.id, nextUser.last_picture_update), this.setImageURL);
}
}
}
setImageURL = (pictureUrl) => {
this.setState({pictureUrl});
};