Fixing change in RCTImageFromLocalAssetURL behavior. facebook/react-n…

…ative#16800
douglasjunior · Nov 12, 2017 · e91d6d0 · e91d6d0
1 parent beaecb4
commit e91d6d0
Showing 1 changed file with 16 additions and 4 deletions.
diff --git a/ios/RNPhotoView.m b/ios/RNPhotoView.m
@@ -295,10 +295,22 @@ - (void)setSource:(NSDictionary *)source {
         }
         _source = source;
         NSURL *imageURL = [NSURL URLWithString:uri];
-        UIImage *image = RCTImageFromLocalAssetURL(imageURL);
-        if (image) { // if local image
-            [self setImage:image];
-            return;
+
+        @try {
+            UIImage *image = RCTImageFromLocalAssetURL(imageURL);
+            if (image) { // if local image
+                [self setImage:image];
+                if (_onPhotoViewerLoad) {
+                    _onPhotoViewerLoad(nil);
+                }
+                if (_onPhotoViewerLoadEnd) {
+                    _onPhotoViewerLoadEnd(nil);
+                }
+                return;
+            }
+        }
+        @catch (NSException *exception) {
+            NSLog(@"%@", exception.reason);
         }
 
         NSURLRequest *request = [[NSURLRequest alloc] initWithURL:imageURL];