Merge pull request #1452 from sean9keenan/fixedOutOfOrderImages

Fixed issue where animated image arrays could be populated out of order

@@ -75,7 +75,7 @@
 
 
     NSMutableArray<id<SDWebImageOperation>> *operationsArray = [[NSMutableArray alloc] init];
     NSMutableArray<id<SDWebImageOperation>> *operationsArray = [[NSMutableArray alloc] init];
 
 
-    for (NSURL *logoImageURL in arrayOfURLs) {
+    [arrayOfURLs enumerateObjectsUsingBlock:^(NSURL *logoImageURL, NSUInteger idx, BOOL * _Nonnull stop) {
         id <SDWebImageOperation> operation = [SDWebImageManager.sharedManager loadImageWithURL:logoImageURL options:0 progress:nil completed:^(UIImage *image, NSData *data, NSError *error, SDImageCacheType cacheType, BOOL finished, NSURL *imageURL) {
         id <SDWebImageOperation> operation = [SDWebImageManager.sharedManager loadImageWithURL:logoImageURL options:0 progress:nil completed:^(UIImage *image, NSData *data, NSError *error, SDImageCacheType cacheType, BOOL finished, NSURL *imageURL) {
             if (!wself) return;
             if (!wself) return;
             dispatch_main_async_safe(^{
             dispatch_main_async_safe(^{
@@ -86,7 +86,16 @@
                     if (!currentImages) {
                     if (!currentImages) {
                         currentImages = [[NSMutableArray alloc] init];
                         currentImages = [[NSMutableArray alloc] init];
                     }
                     }
-                    [currentImages addObject:image];
+                    
+                    // We know what index objects should be at when they are returned so
+                    // we will put the object at the index, filling any empty indexes
+                    // with the image that was returned too "early". These images will
+                    // be overwritten. (does not require additional sorting datastructure)
+                    while ([currentImages count] < idx) {
+                        [currentImages addObject:image];
+                    }
+                    
+                    currentImages[idx] = image;
 
 
                     sself.animationImages = currentImages;
                     sself.animationImages = currentImages;
                     [sself setNeedsLayout];
                     [sself setNeedsLayout];
@@ -95,7 +104,7 @@
             });
             });
         }];
         }];
         [operationsArray addObject:operation];
         [operationsArray addObject:operation];
-    }
+    }];
 
 
     [self sd_setImageLoadOperation:[operationsArray copy] forKey:@"UIImageViewAnimationImages"];
     [self sd_setImageLoadOperation:[operationsArray copy] forKey:@"UIImageViewAnimationImages"];
 }
 }