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

fix update image on account screen when updating profile image (#7978)

Browse source
This commit is contained in:
Elias Nahum 2024-05-31 22:44:31 +08:00 committed by GitHub
parent 663f9ba01a
commit 83e4aba522
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/components/profile_picture/image.tsx
View file

@ -13,6 +13,7 @@ import {ACCOUNT_OUTLINE_IMAGE} from '@constants/profile';
import {useServerUrl} from '@context/server';
import {useTheme} from '@context/theme';
import {changeOpacity, makeStyleSheetFromTheme} from '@utils/theme';
import {getLastPictureUpdate} from '@utils/user';
import type UserModel from '@typings/database/models/servers/user';
@ -42,6 +43,7 @@ const Image = ({author, forwardRef, iconSize, size, source, url}: Props) => {
serverUrl = url || serverUrl;
const style = getStyleSheet(theme);
const lastPictureUpdateAt = author ? getLastPictureUpdate(author) : 0;
const fIStyle = useMemo(() => ({
borderRadius: size / 2,
backgroundColor: theme.centerChannelBg,
@ -56,7 +58,7 @@ const Image = ({author, forwardRef, iconSize, size, source, url}: Props) => {
const pictureUrl = buildProfileImageUrlFromUser(serverUrl, author);
return source ?? {uri: buildAbsoluteUrl(serverUrl, pictureUrl)};
}, [author, serverUrl, source]);
}, [author, serverUrl, source, lastPictureUpdateAt]);
if (typeof source === 'string') {
return (

2
app/screens/edit_profile/components/edit_profile_picture.tsx
View file

@ -82,7 +82,7 @@ const EditProfilePicture = ({user, onUpdateProfilePicture}: ChangeProfilePicture
let prefix = '';
if (pictureUrl.includes('/api/')) {
prefix = serverUrl;
} else if (Platform.OS === 'android' && !pictureUrl.startsWith('content://') && !pictureUrl.startsWith('http://') && !pictureUrl.startsWith('https://')) {
} else if (Platform.OS === 'android' && !pictureUrl.startsWith('content://') && !pictureUrl.startsWith('http://') && !pictureUrl.startsWith('https://') && !pictureUrl.startsWith('file://')) {
prefix = 'file://';
}

2
package-lock.json generated
View file

@ -6,7 +6,7 @@
"packages": {
"": {
"name": "mattermost-mobile",
"version": "2.16.0",
"version": "2.17.0",
"hasInstallScript": true,
"license": "Apache 2.0",
"dependencies": {