Merge pull request #260 from matrix-org/riot_1121

Bug Fix - Chat screen: image thumbnails management is broken
matrix-org · Mar 22, 2017 · 71b9fa8 · 71b9fa8
2 parents 4f2306b + 120e1e4
commit 71b9fa8
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/MatrixKit/Models/Room/MXKAttachment.m b/MatrixKit/Models/Room/MXKAttachment.m
@@ -118,9 +118,6 @@ - (instancetype)initWithEvent:(MXEvent *)mxEvent andMatrixSession:(MXSession*)mx
 
         thumbnailFile = _contentInfo[@"thumbnail_file"];
 
-        _thumbnailURL = [self getThumbnailUrlForSize:CGSizeMake(kThumbnailWidth, kThumbnailHeight)];
-        _thumbnailMimeType = [self getThumbnailMimeType];
-
         contentFile = eventContent[@"file"];
 
         // Retrieve the content url by taking into account the potential encryption.
@@ -155,6 +152,10 @@ - (instancetype)initWithEvent:(MXEvent *)mxEvent andMatrixSession:(MXSession*)mx
         }
 
         _cacheFilePath = [MXMediaManager cachePathForMediaWithURL:_actualURL andType:mimetype inFolder:_eventRoomId];
+
+        // Deduce the thumbnail information from the retrieved data.
+        _thumbnailURL = [self getThumbnailUrlForSize:CGSizeMake(kThumbnailWidth, kThumbnailHeight)];
+        _thumbnailMimeType = [self getThumbnailMimeType];
     }
     return self;
 }