From 30812cb955f1facb558c40f95541790aff144a3c Mon Sep 17 00:00:00 2001 From: giomfo Date: Thu, 9 Apr 2015 17:43:26 +0200 Subject: [PATCH] Report Matrix SDK api changes (urlOfContentThumbnail) --- matrixConsole/API/MatrixSDKHandler.h | 4 ---- matrixConsole/API/MatrixSDKHandler.m | 17 ----------------- matrixConsole/Model/MXCContactField.m | 4 ++-- matrixConsole/View/RoomMemberTableCell.m | 2 +- .../ViewController/MemberViewController.m | 2 +- .../ViewController/SettingsViewController.m | 2 +- 6 files changed, 5 insertions(+), 26 deletions(-) diff --git a/matrixConsole/API/MatrixSDKHandler.h b/matrixConsole/API/MatrixSDKHandler.h index 59fb83009..fc2da9a78 100644 --- a/matrixConsole/API/MatrixSDKHandler.h +++ b/matrixConsole/API/MatrixSDKHandler.h @@ -106,8 +106,4 @@ typedef enum : NSUInteger { // return YES if the text contains a bing word - (BOOL)containsBingWord:(NSString*)text; -// Return the suitable url to display the content thumbnail into the provided view size -// Note: the provided view size is supposed in points, this method will convert this size in pixels by considering screen scale -- (NSString*)thumbnailURLForContent:(NSString*)contentURI inViewSize:(CGSize)viewSize withMethod:(MXThumbnailingMethod)thumbnailingMethod; - @end diff --git a/matrixConsole/API/MatrixSDKHandler.m b/matrixConsole/API/MatrixSDKHandler.m index 6f62a964b..084049d9a 100644 --- a/matrixConsole/API/MatrixSDKHandler.m +++ b/matrixConsole/API/MatrixSDKHandler.m @@ -1285,21 +1285,4 @@ static MatrixSDKHandler *sharedHandler = nil; return NO; } -#pragma mark - Thumbnail - -// Return the suitable url to display the content thumbnail into the provided view size -// Note: the provided view size is supposed in points, this method will convert this size in pixels by considering screen scale -- (NSString*)thumbnailURLForContent:(NSString*)contentURI inViewSize:(CGSize)viewSize withMethod:(MXThumbnailingMethod)thumbnailingMethod { - // Suppose this url is a matrix content uri, we use SDK to get the well adapted thumbnail from server - // Convert first the provided size in pixels - CGFloat scale = [[UIScreen mainScreen] scale]; - CGSize sizeInPixels = CGSizeMake(viewSize.width * scale, viewSize.height * scale); - NSString *thumbnailURL = [self.mxRestClient urlOfContentThumbnail:contentURI withSize:sizeInPixels andMethod:thumbnailingMethod]; - if (nil == thumbnailURL) { - // Manage backward compatibility. The content URL used to be an absolute HTTP URL - thumbnailURL = contentURI; - } - return thumbnailURL; -} - @end diff --git a/matrixConsole/Model/MXCContactField.m b/matrixConsole/Model/MXCContactField.m index 37c675977..a0ccbd678 100644 --- a/matrixConsole/Model/MXCContactField.m +++ b/matrixConsole/Model/MXCContactField.m @@ -91,7 +91,7 @@ MXUser* user = [mxHandler.mxSession userWithUserId:_matrixID]; if (user) { - avatarURL = [mxHandler thumbnailURLForContent:user.avatarUrl inViewSize:avatarSize withMethod:MXThumbnailingMethodCrop]; + avatarURL = [mxHandler.mxSession.matrixRestClient urlOfContentThumbnail:user.avatarUrl toFitViewSize:avatarSize withMethod:MXThumbnailingMethodCrop]; [self downloadAvatarImage]; } else { @@ -99,7 +99,7 @@ if (mxHandler.mxRestClient) { [mxHandler.mxRestClient avatarUrlForUser:_matrixID success:^(NSString *avatarUrl) { - avatarURL = [mxHandler thumbnailURLForContent:avatarUrl inViewSize:avatarSize withMethod:MXThumbnailingMethodCrop]; + avatarURL = [mxHandler.mxSession.matrixRestClient urlOfContentThumbnail:avatarUrl toFitViewSize:avatarSize withMethod:MXThumbnailingMethodCrop]; [self downloadAvatarImage]; } failure:^(NSError *error) { diff --git a/matrixConsole/View/RoomMemberTableCell.m b/matrixConsole/View/RoomMemberTableCell.m index 12fa16d70..82cd45c9e 100644 --- a/matrixConsole/View/RoomMemberTableCell.m +++ b/matrixConsole/View/RoomMemberTableCell.m @@ -115,7 +115,7 @@ if (roomMember.avatarUrl) { // Suppose this url is a matrix content uri, we use SDK to get the well adapted thumbnail from server MatrixSDKHandler *mxHandler = [MatrixSDKHandler sharedHandler]; - thumbnailURL = [mxHandler thumbnailURLForContent:roomMember.avatarUrl inViewSize:self.pictureView.frame.size withMethod:MXThumbnailingMethodCrop]; + thumbnailURL = [mxHandler.mxSession.matrixRestClient urlOfContentThumbnail:roomMember.avatarUrl toFitViewSize:self.pictureView.frame.size withMethod:MXThumbnailingMethodCrop]; } self.pictureView.mediaFolder = kMXKMediaManagerAvatarThumbnailFolder; [self.pictureView setImageURL:thumbnailURL withImageOrientation:UIImageOrientationUp andPreviewImage:[UIImage imageNamed:@"default-profile"]]; diff --git a/matrixConsole/ViewController/MemberViewController.m b/matrixConsole/ViewController/MemberViewController.m index 01d277f43..a2b256fc7 100644 --- a/matrixConsole/ViewController/MemberViewController.m +++ b/matrixConsole/ViewController/MemberViewController.m @@ -166,7 +166,7 @@ if (_mxRoomMember.avatarUrl) { // Suppose this url is a matrix content uri, we use SDK to get the well adapted thumbnail from server MatrixSDKHandler *mxHandler = [MatrixSDKHandler sharedHandler]; - thumbnailURL = [mxHandler thumbnailURLForContent:_mxRoomMember.avatarUrl inViewSize:self.memberThumbnailButton.frame.size withMethod:MXThumbnailingMethodCrop]; + thumbnailURL = [mxHandler.mxSession.matrixRestClient urlOfContentThumbnail:_mxRoomMember.avatarUrl toFitViewSize:self.memberThumbnailButton.frame.size withMethod:MXThumbnailingMethodCrop]; NSString *cacheFilePath = [MXKMediaManager cachePathForMediaWithURL:thumbnailURL inFolder:kMXKMediaManagerAvatarThumbnailFolder]; // Check whether the image download is in progress diff --git a/matrixConsole/ViewController/SettingsViewController.m b/matrixConsole/ViewController/SettingsViewController.m index c5c554f7b..f1ee292d4 100644 --- a/matrixConsole/ViewController/SettingsViewController.m +++ b/matrixConsole/ViewController/SettingsViewController.m @@ -509,7 +509,7 @@ NSString* const kCommandsDescriptionText = @"The following commands are availabl if (currentPictureURL) { // Suppose this url is a matrix content uri, we use SDK to get the well adapted thumbnail from server MatrixSDKHandler *mxHandler = [MatrixSDKHandler sharedHandler]; - currentPictureThumbURL = [mxHandler thumbnailURLForContent:currentPictureURL inViewSize:self.userPictureButton.frame.size withMethod:MXThumbnailingMethodCrop]; + currentPictureThumbURL = [mxHandler.mxSession.matrixRestClient urlOfContentThumbnail:currentPictureURL toFitViewSize:self.userPictureButton.frame.size withMethod:MXThumbnailingMethodCrop]; NSString *cacheFilePath = [MXKMediaManager cachePathForMediaWithURL:currentPictureThumbURL inFolder:kMXKMediaManagerAvatarThumbnailFolder]; // Check whether the image download is in progress