react-native-fast-image 8.6.7 → 8.6.8

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

@@ -50,6 +50,13 @@ class FastImageViewConverter {
                 put("center", ScaleType.CENTER_INSIDE);
             }};
 
+    // Whether the source has a uri to load (not null, missing or blank).
+    static boolean hasUri(@Nullable ReadableMap source) {
+        if (source == null || !source.hasKey("uri") || source.isNull("uri")) return false;
+        String uri = source.getString("uri");
+        return uri != null && !uri.trim().isEmpty();
+    }
+
     // Resolve the source uri to a file path that android understands.
     static @Nullable
     FastImageSource getImageSource(Context context, @Nullable ReadableMap source) {
@@ -79,7 +86,7 @@ class FastImageViewConverter {
         return headers;
     }
 
-    static RequestOptions getOptions(Context context, FastImageSource imageSource, ReadableMap source) {
+    static RequestOptions getOptions(Context context, @Nullable FastImageSource imageSource, @Nullable ReadableMap source) {
         // Get priority.
         final Priority priority = FastImageViewConverter.getPriority(source);
         // Get cache control method.
@@ -108,7 +115,8 @@ class FastImageViewConverter {
                 .priority(priority)
                 .placeholder(TRANSPARENT_DRAWABLE);
 
-        if (imageSource.isResource()) {
+        // imageSource is null when only a defaultSource is shown.
+        if (imageSource != null && imageSource.isResource()) {
             // Every local resource (drawable) in Android has its own unique numeric id, which are
             // generated at build time. Although these ids are unique, they are not guaranteed unique
             // across builds. The underlying glide implementation caches these resources. To make

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

@@ -37,6 +37,8 @@ class FastImageViewModule extends ReactContextBaseJavaModule {
             public void run() {
                 for (int i = 0; i < sources.size(); i++) {
                     final ReadableMap source = sources.getMap(i);
+                    // Skip sources without a uri (Glide throws on an empty url).
+                    if (!FastImageViewConverter.hasUri(source)) continue;
                     final FastImageSource imageSource = FastImageViewConverter.getImageSource(activity, source);
 
                     Glide

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

@@ -47,10 +47,6 @@ class FastImageViewWithUrl extends AppCompatImageView {
         mDefaultSource = source;
     }
 
-    private boolean isNullOrEmpty(final String url) {
-        return url == null || url.trim().isEmpty();
-    }
-
     @SuppressLint("CheckResult")
     public void onAfterUpdate(
             @Nonnull FastImageViewManager manager,
@@ -59,10 +55,7 @@ class FastImageViewWithUrl extends AppCompatImageView {
         if (!mNeedsReload)
             return;
 
-        if ((mSource == null ||
-                !mSource.hasKey("uri") ||
-                isNullOrEmpty(mSource.getString("uri"))) &&
-                mDefaultSource == null) {
+        if (!FastImageViewConverter.hasUri(mSource) && mDefaultSource == null) {
 
             // Cancel existing requests.
             clearView(requestManager);

package/ios/FastImage/FFFastImageViewManager.m

@@ -27,10 +27,15 @@ RCT_EXPORT_METHOD(preload:(nonnull NSArray<FFFastImageSource *> *)sources)
     NSMutableArray *urls = [NSMutableArray arrayWithCapacity:sources.count];
 
     [sources enumerateObjectsUsingBlock:^(FFFastImageSource * _Nonnull source, NSUInteger idx, BOOL * _Nonnull stop) {
+        // Skip sources without a url (an empty, missing or null uri). NSArray can't
+        // hold nil, so adding one throws and crashes the app.
+        if (!source.url) {
+            return;
+        }
         [source.headers enumerateKeysAndObjectsUsingBlock:^(NSString *key, NSString* header, BOOL *stop) {
             [[SDWebImageDownloader sharedDownloader] setValue:header forHTTPHeaderField:key];
         }];
-        [urls setObject:source.url atIndexedSubscript:idx];
+        [urls addObject:source.url];
     }];
 
     [[SDWebImagePrefetcher sharedImagePrefetcher] prefetchURLs:urls];

package/ios/FastImage/RCTConvert+FFFastImage.m

@@ -16,7 +16,8 @@ RCT_ENUM_CONVERTER(FFFCacheControl, (@{
                                        }), FFFCacheControlImmutable, integerValue);
 
 + (FFFastImageSource *)FFFastImageSource:(id)json {
-    if (!json) {
+    // A null source (e.g. a null entry passed to preload).
+    if (!json || json == (id)kCFNull) {
         return nil;
     }
     

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "react-native-fast-image",
-    "version": "8.6.7",
+    "version": "8.6.8",
     "description": "🚩 FastImage, performant React Native image component.",
     "keywords": [
         "cache",
@@ -68,6 +68,7 @@
         "@types/react-test-renderer": "^17.0.1",
         "dv-scripts": "^1.6.0",
         "eslint-config-dv-scripts": "^1.1.1",
+        "maestro-runner": "1.1.27",
         "metro-react-native-babel-preset": "^0.66.1",
         "prettier": "^2.3.2",
         "react": "17.0.2",