Merge commit 'f3ed634ee50ff602cf1bca0e8117393cb073fa77' into HEAD

selvamsankaran · May 16, 2017 · 175c1fa · 175c1fa
2 parents a63ef90 + f3ed634
commit 175c1fa
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/ios/objc/FriendlyChatObjC/FCViewController.m b/ios/objc/FriendlyChatObjC/FCViewController.m
@@ -210,8 +210,10 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(n
           NSLog(@"Error downloading: %@", error);
           return;
         }
-        cell.imageView.image = [UIImage imageWithData:data];
-        [tableView reloadData];
+        dispatch_async(dispatch_get_main_queue(), ^{
+          cell.imageView.image = [UIImage imageWithData:data];
+          [cell setNeedsLayout];
+        });
       }];
     } else {
       cell.imageView.image = [UIImage imageWithData:[NSData dataWithContentsOfURL:[NSURL URLWithString:imageURL]]];

diff --git a/ios/swift/FriendlyChatSwift/FCViewController.swift b/ios/swift/FriendlyChatSwift/FCViewController.swift
@@ -196,8 +196,10 @@ class FCViewController: UIViewController, UITableViewDataSource, UITableViewDele
             print("Error downloading: \(error)")
             return
           }
-          cell.imageView?.image = UIImage.init(data: data!)
-          tableView.reloadData()
+          DispatchQueue.main.async {
+            cell.imageView?.image = UIImage.init(data: data!)
+            cell.setNeedsLayout()
+          }
         }
       } else if let URL = URL(string: imageURL), let data = try? Data(contentsOf: URL) {
         cell.imageView?.image = UIImage.init(data: data)