keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'mkirk/fix-group-avatar-update' into release/2.29.3

Browse Source
pull/1/head
Michael Kirk 7 years ago
parent 99b2564994 08c0b248ed
commit 2c4cd11509
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File

8
SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m
Unescape Escape View File

@ -695,9 +695,9 @@ typedef void (^OWSLoadedThumbnailSuccess)(OWSLoadedThumbnail *loadedThumbnail);
{ {
OWSLoadedThumbnail *_Nullable loadedThumbnail; OWSLoadedThumbnail *_Nullable loadedThumbnail;
loadedThumbnail = [self loadedThumbnailWithThumbnailDimensionPoints:thumbnailDimensionPoints loadedThumbnail = [self loadedThumbnailWithThumbnailDimensionPoints:thumbnailDimensionPoints
success:^(OWSLoadedThumbnail *loadedThumbnail) { success:^(OWSLoadedThumbnail *thumbnail) {
DispatchMainThreadSafe(^{ DispatchMainThreadSafe(^{
success(loadedThumbnail.image); success(thumbnail.image);
}); });
} }
failure:^{ failure:^{
@ -749,9 +749,9 @@ typedef void (^OWSLoadedThumbnailSuccess)(OWSLoadedThumbnail *loadedThumbnail);
__block OWSLoadedThumbnail *_Nullable asyncLoadedThumbnail = nil; __block OWSLoadedThumbnail *_Nullable asyncLoadedThumbnail = nil;
OWSLoadedThumbnail *_Nullable syncLoadedThumbnail = nil; OWSLoadedThumbnail *_Nullable syncLoadedThumbnail = nil;
syncLoadedThumbnail = [self loadedThumbnailWithThumbnailDimensionPoints:kThumbnailDimensionPointsSmall syncLoadedThumbnail = [self loadedThumbnailWithThumbnailDimensionPoints:kThumbnailDimensionPointsSmall
success:^(OWSLoadedThumbnail *asyncLoadedThumbnail) { success:^(OWSLoadedThumbnail *thumbnail) {
@synchronized(self) { @synchronized(self) {
asyncLoadedThumbnail = asyncLoadedThumbnail; asyncLoadedThumbnail = thumbnail;
} }
dispatch_semaphore_signal(semaphore); dispatch_semaphore_signal(semaphore);
} }

Write Preview
Loading…
Cancel
Save