Merge pull request #391 from itbel/ib-cachedimage-bug

Bypassed cache due to downloading to cache sometime crashes the app
themeetinghouse · Jul 21, 2023 · 15700b6 · 15700b6
2 parents 6729c28 + 1fc41eb
commit 15700b6
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 16 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -133,18 +133,23 @@ export function App({ skipLoadingScreen }: Props): JSX.Element {
   const navRef = createRef<NavigationContainerRef>();
 
   async function loadResourcesAsync() {
-    await SplashScreen.preventAutoHideAsync();
-    await Promise.all([
-      Font.loadAsync({
-        'Graphik-Regular-App': require('../assets/fonts/Graphik-Regular-App.ttf'),
-        'Graphik-Medium-App': require('../assets/fonts/Graphik-Medium-App.ttf'),
-        'Graphik-Bold-App': require('../assets/fonts/Graphik-Bold-App.ttf'),
-        'Graphik-Semibold-App': require('../assets/fonts/Graphik-Semibold-App.ttf'),
-        'Graphik-RegularItalic': require('../assets/fonts/Graphik-RegularItalic.otf'),
-      }),
-    ]);
-    setLoadingComplete(true);
-    await SplashScreen.hideAsync();
+    try {
+      await SplashScreen.preventAutoHideAsync();
+      await Promise.all([
+        Font.loadAsync({
+          'Graphik-Regular-App': require('../assets/fonts/Graphik-Regular-App.ttf'),
+          'Graphik-Medium-App': require('../assets/fonts/Graphik-Medium-App.ttf'),
+          'Graphik-Bold-App': require('../assets/fonts/Graphik-Bold-App.ttf'),
+          'Graphik-Semibold-App': require('../assets/fonts/Graphik-Semibold-App.ttf'),
+          'Graphik-RegularItalic': require('../assets/fonts/Graphik-RegularItalic.otf'),
+        }),
+      ]);
+    } catch (error) {
+      console.log({ error });
+    } finally {
+      setLoadingComplete(true);
+      await SplashScreen.hideAsync();
+    }
   }
 
   async function registerForPushNotificationsAsync(): Promise<DevicePushToken | null> {
@@ -262,7 +267,7 @@ export function App({ skipLoadingScreen }: Props): JSX.Element {
         await trackUserId(user);
       } catch (e) {
         console.debug(e);
-        setLocationData({ id: 'unknown', name: 'unknown' });
+        setLocationData({ id: 'unknown', name: 'unknown' } as LocationData);
         try {
           const location = await SecureStore.getItemAsync('location');
           if (location) {

diff --git a/src/hooks/useCachedImage.ts b/src/hooks/useCachedImage.ts
@@ -21,19 +21,21 @@ export default function useCachedImage(url: string, cacheKey: string) {
         const path = `${FileSystem.cacheDirectory}${name}`;
         const image = await FileSystem.getInfoAsync(path);
         if (image.exists) {
+          console.log({ success: image.uri });
           setUri(image.uri);
           return;
         }
         // console.warn('Image doesnt exist!', { memoizedURL }, { name });
-        const newImage = await FileSystem.downloadAsync(memoizedURI, path);
-        setUri(newImage.uri);
+        console.warn({ path });
+        // const newImage = await FileSystem.downloadAsync(memoizedURI, path);
+        setUri(url);
       } catch (error) {
         console.error({ error });
         setUri(memoizedURL);
       } finally {
         setIsLoading(false);
       }
     })();
-  }, [memoizedKey, memoizedURI, memoizedURL]);
+  }, [url, memoizedKey, memoizedURI, memoizedURL]);
   return { isLoading, uri, setUri };
 }