react-native-fast-image 9.2.0 → 9.2.1

package/README.md

@@ -765,7 +765,7 @@ How the image fades in: see [`transition`](#transition).
     - `'all'`: skips it for images from the memory or disk cache too, so images that download fade in, and local files and bundled images usually only the first time (the disk cache usually keeps them too).
     - `'none'`: always fades.
 
-    Downloads, local files and bundled images (`require()`) fade in.
+    Downloads, local files and bundled images (`require()`) fade in. On Android, a `cache: 'web'` image from its HTTP cache, without a request, counts as one from the memory cache (these images aren't kept there).
 
 <!-- api:types end -->
 

package/android/src/main/java/com/dylanvann/fastimage/FastImageSharedDownloads.java

@@ -370,11 +370,18 @@ final class FastImageSharedDownloads {
         // A preload's file is from Glide's disk cache. A download is remote
         // for every request reading it: Glide stores it in its disk cache once
         // (a request that finds it there already reads it from there), and
-        // fades the image in as for any download.
+        // fades the image in as for any download. A `web` image's response
+        // from its HTTP cache, without the network, is from a disk cache too
+        // (OkHttp's; Glide doesn't store `web` images in its own).
         @NonNull
         @Override
         public DataSource getDataSource() {
-            return fromFile ? DataSource.DATA_DISK_CACHE : DataSource.REMOTE;
+            if (fromFile) return DataSource.DATA_DISK_CACHE;
+            Download joined;
+            synchronized (downloads) {
+                joined = download;
+            }
+            return joined != null && joined.fromHttpCache ? DataSource.DATA_DISK_CACHE : DataSource.REMOTE;
         }
     }
 
@@ -553,6 +560,9 @@ final class FastImageSharedDownloads {
         // bytes it had received).
         private long reserved = 0;
         private boolean silent = false;
+        // Whether the response came from the HTTP cache of `web` images
+        // without the network (set before its bytes are read).
+        private volatile boolean fromHttpCache = false;
 
         // With downloads locked.
         private Download(String key, GlideUrl url, OkHttpClient client, Request request, Priority priority) {
@@ -838,6 +848,9 @@ final class FastImageSharedDownloads {
                 fail(new HttpException(response.message(), response.code()));
                 return;
             }
+            // OkHttp has no network response for one it served from the
+            // cache without checking with the server.
+            fromHttpCache = response.networkResponse() == null && response.cacheResponse() != null;
             final long length = body.contentLength();
             synchronized (downloads) {
                 // No progress without a length.

package/android/src/main/java/com/dylanvann/fastimage/FastImageViewWithUrl.java

@@ -288,14 +288,20 @@ class FastImageViewWithUrl extends AppCompatImageView implements ReactPointerEve
     // Fades a loaded image in, unless it's from a cache that skipOnCacheHit
     // skips, as Glide's and Coil's cross-fades and Fresco decide: from the
     // memory cache it shows at once (by default), and from the disk cache
-    // too with 'all'. Downloads, local files and bundled images fade.
+    // too with 'all'. Downloads, local files and bundled images fade. A `web`
+    // image isn't kept in the memory cache, so one from its HTTP cache
+    // without the network (a disk cache hit, see FastImageSharedDownloads)
+    // counts as one from memory: shown again, e.g. in a list scrolled back
+    // up, it shows at once.
     private final class FadeFactory implements TransitionFactory<Drawable> {
         private final int duration;
         private final String skipOnCacheHit;
+        private final boolean webCache;
 
-        FadeFactory(int duration, String skipOnCacheHit) {
+        FadeFactory(int duration, String skipOnCacheHit, boolean webCache) {
             this.duration = duration;
             this.skipOnCacheHit = skipOnCacheHit;
+            this.webCache = webCache;
         }
 
         @Override
@@ -314,6 +320,7 @@ class FastImageViewWithUrl extends AppCompatImageView implements ReactPointerEve
         private boolean skips(DataSource dataSource) {
             if (skipOnCacheHit.equals("none")) return false;
             if (dataSource == DataSource.MEMORY_CACHE) return true;
+            if (webCache && dataSource == DataSource.DATA_DISK_CACHE) return true;
             // Glide also keeps a local file's or bundled image's decoded
             // image in its disk cache (at the size it was decoded at, and not
             // for GIFs), so with 'all' they usually only fade the first time.
@@ -1056,7 +1063,10 @@ class FastImageViewWithUrl extends AppCompatImageView implements ReactPointerEve
             boolean replacing = shownRequest != null && model != null;
             if (mTransitionDuration > 0 && !switching && (!replacing || mTransitionBetweenImages)) {
                 builder = builder.transition(DrawableTransitionOptions.with(
-                        new FadeFactory(mTransitionDuration, mTransitionSkipOnCacheHit)));
+                        new FadeFactory(
+                                mTransitionDuration,
+                                mTransitionSkipOnCacheHit,
+                                imageSource != null && imageSource.isWebCache())));
             }
             if (thumbnail) {
                 builder = builder.thumbnail(fromCache(shownRequest));

package/dist/index.d.ts

@@ -122,7 +122,9 @@ export type Transition = {
      *   usually only the first time (the disk cache usually keeps them too).
      * - `'none'`: always fades.
      *
-     * Downloads, local files and bundled images (`require()`) fade in.
+     * Downloads, local files and bundled images (`require()`) fade in. On
+     * Android, a `cache: 'web'` image from its HTTP cache, without a request,
+     * counts as one from the memory cache (these images aren't kept there).
      * @default 'memory'
      */
     skipOnCacheHit?: 'none' | 'memory' | 'all' | null;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "react-native-fast-image",
-    "version": "9.2.0",
+    "version": "9.2.1",
     "description": "FastImage, performant React Native image component.",
     "keywords": [
         "cache",