react-native-fast-image 8.6.26 → 8.6.28

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

@@ -94,15 +94,9 @@ class FastImageViewManager extends SimpleViewManager<FastImageViewWithUrl> imple
         // This will cancel existing requests.
         view.clearView(requestManager);
 
-        if (view.glideUrl != null) {
-            final String key = view.glideUrl.toString();
-            FastImageOkHttpProgressGlideModule.forget(key);
-            List<FastImageViewWithUrl> viewsForKey = VIEWS_FOR_URLS.get(key);
-            if (viewsForKey != null) {
-                viewsForKey.remove(view);
-                if (viewsForKey.size() == 0) VIEWS_FOR_URLS.remove(key);
-            }
-        }
+        // Same key as when the view was tracked (toStringUrl, not toString,
+        // which differ for urls that need escaping).
+        view.untrackUrl(VIEWS_FOR_URLS);
 
         super.onDropViewInstance(view);
     }

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

@@ -72,9 +72,7 @@ class FastImageViewWithUrl extends AppCompatImageView {
             // Cancel existing requests.
             clearView(requestManager);
 
-            if (glideUrl != null) {
-                FastImageOkHttpProgressGlideModule.forget(glideUrl.toStringUrl());
-            }
+            untrackUrl(viewsForUrlsMap);
 
             // Clear the image.
             setImageDrawable(null);
@@ -103,9 +101,7 @@ class FastImageViewWithUrl extends AppCompatImageView {
             // Cancel existing requests.
             clearView(requestManager);
 
-            if (glideUrl != null) {
-                FastImageOkHttpProgressGlideModule.forget(glideUrl.toStringUrl());
-            }
+            untrackUrl(viewsForUrlsMap);
             setImageDrawable(mDefaultSource);
             return;
         }
@@ -113,12 +109,17 @@ class FastImageViewWithUrl extends AppCompatImageView {
         // `imageSource` may be null and we still continue, if `defaultSource` is not null
         final GlideUrl glideUrl = imageSource == null ? null : imageSource.getGlideUrl();
 
+        String key = glideUrl == null ? null : glideUrl.toStringUrl();
+
+        // Loading a different url: stop tracking the old one.
+        if (this.glideUrl != null && !this.glideUrl.toStringUrl().equals(key)) {
+            untrackUrl(viewsForUrlsMap);
+        }
+
         // Cancel existing request.
         this.glideUrl = glideUrl;
         clearView(requestManager);
 
-        String key = glideUrl == null ? null : glideUrl.toStringUrl();
-
         if (glideUrl != null) {
             FastImageOkHttpProgressGlideModule.expect(key, manager);
             List<FastImageViewWithUrl> viewsForKey = viewsForUrlsMap.get(key);
@@ -163,6 +164,24 @@ class FastImageViewWithUrl extends AppCompatImageView {
         }
     }
 
+    // Removes this view from the list of views for its current url (used to send
+    // progress events), which otherwise kept it, and its Activity, alive after
+    // its source changed (#384). The url's progress listener is only forgotten
+    // when no other view uses it.
+    void untrackUrl(@Nonnull Map<String, List<FastImageViewWithUrl>> viewsForUrlsMap) {
+        if (glideUrl == null) return;
+        String key = glideUrl.toStringUrl();
+        List<FastImageViewWithUrl> viewsForKey = viewsForUrlsMap.get(key);
+        if (viewsForKey != null) {
+            viewsForKey.remove(this);
+            if (viewsForKey.isEmpty()) viewsForUrlsMap.remove(key);
+        }
+        if (viewsForKey == null || viewsForKey.isEmpty()) {
+            FastImageOkHttpProgressGlideModule.forget(key);
+        }
+        glideUrl = null;
+    }
+
     public void clearView(@Nullable RequestManager requestManager) {
         if (requestManager != null && getTag() != null && getTag() instanceof Request) {
             requestManager.clear(this);

package/ios/FastImage/FFFastImageView.m

@@ -55,7 +55,9 @@
 }
 
 - (void) setOnFastImageLoadStart: (RCTDirectEventBlock)onFastImageLoadStart {
-    if (_source && !self.hasSentOnLoadStart && onFastImageLoadStart) {
+    // Send it for a load that has already started. When a reload is pending
+    // (e.g. source set in the same update), reloadImage sends it.
+    if (_source && !_needsReload && !self.hasSentOnLoadStart && onFastImageLoadStart) {
         _onFastImageLoadStart = onFastImageLoadStart;
         onFastImageLoadStart(@{});
         self.hasSentOnLoadStart = YES;

package/package.json

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