From 08c0b248edb3874ba45ff200ed43487e2eaa8275 Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael@signal.org>
Date: Wed, 12 Sep 2018 15:01:57 -0500
Subject: [PATCH] fix group avatar updates and quote generation

don't shadow same-named variable
---
 .../src/Messages/Attachments/TSAttachmentStream.m         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m b/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m
index e6d7f301b..179480874 100644
--- a/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m
+++ b/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m
@@ -695,9 +695,9 @@ typedef void (^OWSLoadedThumbnailSuccess)(OWSLoadedThumbnail *loadedThumbnail);
 {
     OWSLoadedThumbnail *_Nullable loadedThumbnail;
     loadedThumbnail = [self loadedThumbnailWithThumbnailDimensionPoints:thumbnailDimensionPoints
-        success:^(OWSLoadedThumbnail *loadedThumbnail) {
+        success:^(OWSLoadedThumbnail *thumbnail) {
             DispatchMainThreadSafe(^{
-                success(loadedThumbnail.image);
+                success(thumbnail.image);
             });
         }
         failure:^{
@@ -749,9 +749,9 @@ typedef void (^OWSLoadedThumbnailSuccess)(OWSLoadedThumbnail *loadedThumbnail);
     __block OWSLoadedThumbnail *_Nullable asyncLoadedThumbnail = nil;
     OWSLoadedThumbnail *_Nullable syncLoadedThumbnail = nil;
     syncLoadedThumbnail = [self loadedThumbnailWithThumbnailDimensionPoints:kThumbnailDimensionPointsSmall
-        success:^(OWSLoadedThumbnail *asyncLoadedThumbnail) {
+        success:^(OWSLoadedThumbnail *thumbnail) {
             @synchronized(self) {
-                asyncLoadedThumbnail = asyncLoadedThumbnail;
+                asyncLoadedThumbnail = thumbnail;
             }
             dispatch_semaphore_signal(semaphore);
         }