From 38d62dd8e218167bff4b7eb777e8c2aa21e13e2f Mon Sep 17 00:00:00 2001 From: StackOverflowIsBetterThanAnyAI Date: Thu, 19 Nov 2026 15:58:53 +0100 Subject: [PATCH 1/2] set token in header --- app/(tabs)/live.tsx | 10 ++++++---- components/highlight-image.tsx | 32 ++++++++++++++++++++----------- components/image-grid-item.tsx | 17 ++++++---------- hooks/use-highlight-image-size.ts | 27 +++++++++++++++++--------- 4 files changed, 51 insertions(+), 35 deletions(-) diff --git a/app/(tabs)/live.tsx b/app/(tabs)/live.tsx index 0bfd893..484c125 100644 --- a/app/(tabs)/live.tsx +++ b/app/(tabs)/live.tsx @@ -1,8 +1,8 @@ +import { Image } from 'expo-image' import { useFocusEffect, useRouter } from 'expo-router' import { useCallback, useContext, useState } from 'react' import { ActivityIndicator, - Image, Pressable, RefreshControl, StyleSheet, @@ -65,11 +65,11 @@ const LiveScreen = () => { ) const router = useRouter() - const fullUriWithToken = `${URL}/live?token=${userToken}&time=${refreshTime}` + const fullUri = `${URL}/live?time=${refreshTime}` const imageSource = imageLoadFailed ? errorImageSource - : { uri: fullUriWithToken } + : { uri: fullUri, headers: { Authorization: `Bearer ${userToken}` } } const formattedDate = () => { if ( @@ -241,7 +241,9 @@ const LiveScreen = () => { alt={formattedDate()} source={imageSource} style={styles.image} - resizeMode="cover" + contentFit="cover" + // every refresh has a new URL, so don't fill the disk cache + cachePolicy="none" onError={() => { setImageLoadFailed(true) setImageIsLoaded(true) diff --git a/components/highlight-image.tsx b/components/highlight-image.tsx index 03e56ec..13caa60 100644 --- a/components/highlight-image.tsx +++ b/components/highlight-image.tsx @@ -1,9 +1,8 @@ -import { useContext, useRef, useState } from 'react' +import { Image } from 'expo-image' +import { useContext, useMemo, useState } from 'react' import { ActivityIndicator, Dimensions, - Image, - ImageInstance, Pressable, StyleSheet, View, @@ -11,6 +10,7 @@ import { import ThemedText from '@/components/themed-text' import { ContextImageRotation } from '@/context/ContextImageRotation' +import { ContextUser } from '@/context/ContextUser' import { useHighlightImageSize } from '@/hooks/use-highlight-image-size' import { useThemeColor } from '@/hooks/use-theme-color' import { downloadImage } from '@/utils/downloadImage' @@ -34,20 +34,32 @@ const HighlightImage = ({ } const { imageRotation } = contextImageRotation + const contextUser = useContext(ContextUser) + if (!contextUser) { + throw new Error( + 'HighlightImage must be used within a ContextUser.Provider' + ) + } + const { userToken } = contextUser + + const imageHeaders = useMemo( + () => ({ Authorization: `Bearer ${userToken}` }), + [userToken] + ) + const { width, height } = Dimensions.get('window') const activityColor = useThemeColor({}, 'text') const backgroundColor = useThemeColor({}, 'background') const highlightColor = useThemeColor({}, 'highlight') - const imageRef = useRef(null) const [imageHeight, setImageHeight] = useState(256) const [imageIsLoaded, setImageIsLoaded] = useState(false) const [imageIsLoadedSuccess, setImageIsLoadedSuccess] = useState(false) const imageSource = imageIsLoadedSuccess - ? { uri: imageHighlighted! } + ? { uri: imageHighlighted!, headers: imageHeaders } : errorImageSource const formattedDate = () => { @@ -88,6 +100,7 @@ const HighlightImage = ({ useHighlightImageSize({ height, imageHighlighted, + imageHeaders, setImageHeight, setImageIsLoaded, setImageIsLoadedSuccess, @@ -106,6 +119,7 @@ const HighlightImage = ({ backgroundColor, height: imageHeight, transform: [{ rotate: `${imageRotation}deg` }], + width, }, wrapper: { backgroundColor: highlightColor, @@ -133,12 +147,10 @@ const HighlightImage = ({ {imageIsLoaded && imageIsLoadedSuccess && imageSource.uri && ( <> {formattedDate() {formattedDate().length ? ( @@ -152,12 +164,10 @@ const HighlightImage = ({ )} {imageIsLoaded && !imageIsLoadedSuccess && ( Error Image )} diff --git a/components/image-grid-item.tsx b/components/image-grid-item.tsx index 1659f34..b3da439 100644 --- a/components/image-grid-item.tsx +++ b/components/image-grid-item.tsx @@ -1,11 +1,6 @@ +import { Image } from 'expo-image' import { useContext, useState } from 'react' -import { - ActivityIndicator, - Image, - Pressable, - StyleSheet, - View, -} from 'react-native' +import { ActivityIndicator, Pressable, StyleSheet, View } from 'react-native' import { URL } from '@/constants/api' import { Colors } from '@/constants/theme' @@ -48,11 +43,11 @@ const ImageGridItem = ({ ) const safeItem = encodeURI(item) - const fullUriWithToken = `${URL}${safeItem}?token=${userToken}` + const fullUri = `${URL}${safeItem}` const imageSource = imageLoadFailed ? errorImageSource - : { uri: fullUriWithToken } + : { uri: fullUri, headers: { Authorization: `Bearer ${userToken}` } } const [prevItem, setPrevItem] = useState(item) if (item !== prevItem) { @@ -63,7 +58,7 @@ const ImageGridItem = ({ const handlePress = () => { if (imageIsLoaded) { - setImageHighlighted(fullUriWithToken) + setImageHighlighted(fullUri) } } @@ -116,7 +111,7 @@ const ImageGridItem = ({ alt={item} source={imageSource} style={styles.image} - resizeMode="cover" + contentFit="cover" onError={() => { setImageLoadFailed(true) setImageIsLoaded(true) diff --git a/hooks/use-highlight-image-size.ts b/hooks/use-highlight-image-size.ts index 8c36e42..b3ef8f7 100644 --- a/hooks/use-highlight-image-size.ts +++ b/hooks/use-highlight-image-size.ts @@ -1,9 +1,10 @@ +import { Image } from 'expo-image' import { useEffect } from 'react' -import { Image } from 'react-native' type useHighlightImageSizeProps = { height: number imageHighlighted: string | null + imageHeaders: Record setImageHeight: (value: React.SetStateAction) => void setImageIsLoaded: (value: React.SetStateAction) => void setImageIsLoadedSuccess: (value: React.SetStateAction) => void @@ -13,6 +14,7 @@ type useHighlightImageSizeProps = { export const useHighlightImageSize = ({ height, imageHighlighted, + imageHeaders, setImageHeight, setImageIsLoaded, setImageIsLoadedSuccess, @@ -22,26 +24,33 @@ export const useHighlightImageSize = ({ setImageIsLoaded(false) setImageIsLoadedSuccess(false) + let cancelled = false + if (imageHighlighted) { - Image.getSize( - imageHighlighted, - (originalWidth, originalHeight) => { + Image.loadAsync({ uri: imageHighlighted, headers: imageHeaders }) + .then((image) => { + if (cancelled) return const calculatedHeight = - (width / originalWidth) * originalHeight + (width / image.width) * image.height setImageHeight(Math.min(calculatedHeight, height)) setImageIsLoaded(true) setImageIsLoadedSuccess(true) - }, - () => { + }) + .catch(() => { + if (cancelled) return setImageHeight(256) setImageIsLoaded(true) setImageIsLoadedSuccess(false) - } - ) + }) + } + + return () => { + cancelled = true } }, [ height, imageHighlighted, + imageHeaders, setImageHeight, setImageIsLoaded, setImageIsLoadedSuccess, From c2c0cfd73fda4cc000341cad120a2b23a1ea9891 Mon Sep 17 00:00:00 2001 From: StackOverflowIsBetterThanAnyAI Date: Thu, 19 Nov 2026 15:59:02 +0100 Subject: [PATCH 2/2] download image --- utils/downloadImage.ts | 55 +++++++++++++++++++++++++++++++++--------- 1 file changed, 44 insertions(+), 11 deletions(-) diff --git a/utils/downloadImage.ts b/utils/downloadImage.ts index 17fd9f5..2da1f82 100644 --- a/utils/downloadImage.ts +++ b/utils/downloadImage.ts @@ -1,6 +1,7 @@ import * as FileSystem from 'expo-file-system/legacy' -import { manipulateAsync, SaveFormat } from 'expo-image-manipulator' +import { ImageManipulator, SaveFormat } from 'expo-image-manipulator' import { shareAsync } from 'expo-sharing' +import { Alert } from 'react-native' type downloadImageProps = { imageName: string @@ -8,6 +9,17 @@ type downloadImageProps = { imageRotation: number } +const IMAGE_NAME_PATTERN = + /^security_image_\d{4}-\d{2}-\d{2}_\d{2}-\d{2}-\d{2}\.jpg$/ + +const getServedImageName = (headers: Record) => { + const key = Object.keys(headers).find( + (header) => header.toLowerCase() === 'x-image-name' + ) + const name = key ? headers[key] : undefined + return name && IMAGE_NAME_PATTERN.test(name) ? name : undefined +} + export const downloadImage = async ({ imageName, imageSource, @@ -15,22 +27,41 @@ export const downloadImage = async ({ }: downloadImageProps) => { const tempDownloadUri = FileSystem.cacheDirectory + 'raw_download_' + imageName - const finalTargetUri = FileSystem.cacheDirectory + imageName try { - const checkTarget = await FileSystem.getInfoAsync(finalTargetUri) - if (checkTarget.exists) { - await FileSystem.deleteAsync(finalTargetUri, { idempotent: true }) + const download = await FileSystem.downloadAsync( + imageSource.uri, + tempDownloadUri, + { headers: imageSource.headers } + ) + + if (download.status !== 200) { + await FileSystem.deleteAsync(tempDownloadUri, { idempotent: true }) + Alert.alert( + 'Image not available', + download.status === 404 + ? 'This image no longer exists. It has probably been replaced by a newer one.' + : `The image could not be downloaded (HTTP ${download.status}).` + ) + return } - await FileSystem.downloadAsync(imageSource.uri, tempDownloadUri) + const finalImageName = getServedImageName(download.headers) ?? imageName + const finalTargetUri = FileSystem.cacheDirectory + finalImageName + + await FileSystem.deleteAsync(finalTargetUri, { idempotent: true }) if (imageRotation) { - const manipulatedImage = await manipulateAsync( - tempDownloadUri, - [{ rotate: imageRotation }], - { compress: 1, format: SaveFormat.JPEG } + const rotatedImage = await ImageManipulator.manipulate( + tempDownloadUri ) + .rotate(imageRotation) + .renderAsync() + const manipulatedImage = await rotatedImage.saveAsync({ + compress: 1, + format: SaveFormat.JPEG, + }) + rotatedImage.release() await FileSystem.copyAsync({ from: manipulatedImage.uri, @@ -51,9 +82,11 @@ export const downloadImage = async ({ await shareAsync(finalTargetUri, { mimeType: 'image/jpeg', - dialogTitle: imageName, + dialogTitle: finalImageName, }) } catch (error: any) { console.error('Download/Processing failed:', error) + await FileSystem.deleteAsync(tempDownloadUri, { idempotent: true }) + Alert.alert('Download failed', 'The image could not be shared.') } }