felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-05-04 06:58:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Media Manager: refactoring (download video/image with a unique API)

Browse Source
This commit is contained in:
giomfo
2015-01-12 11:00:53 +01:00
parent 7c7d023efa
commit ae8f610c76
10 changed files with 132 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files
matrixConsole/ViewController/SettingsViewController.m
+4 -4
View File
@@ -455,14 +455,14 @@ NSString* const kCommandsDescriptionText = @"The following commands are availabl
currentPictureURL = [avatar_url isEqual:[NSNull null]] ? nil : avatar_url;
if (currentPictureURL) {
// Check whether the image download is in progress
id loader = [MediaManager mediaLoaderForURL:currentPictureURL];
id loader = [MediaManager existingDownloaderForURL:currentPictureURL];
if (loader) {
// Add observers
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onMediaDownloadEnd:) name:kMediaDownloadDidFinishNotification object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onMediaDownloadEnd:) name:kMediaDownloadDidFailNotification object:nil];
} else {
// Retrieve the image from cache
UIImage* image = [MediaManager loadCachePicture:currentPictureURL];
UIImage* image = [MediaManager loadCachePictureForURL:currentPictureURL];
if (image) {
[self updateAvatarImage:image];
} else {
@@ -473,7 +473,7 @@ NSString* const kCommandsDescriptionText = @"The following commands are availabl
// Add observers
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onMediaDownloadEnd:) name:kMediaDownloadDidFinishNotification object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onMediaDownloadEnd:) name:kMediaDownloadDidFailNotification object:nil];
imageLoader = [MediaManager downloadPicture:currentPictureURL];
imageLoader = [MediaManager downloadMedia:currentPictureURL mimeType:@"image/jpeg"];
}
}
} else {
@@ -490,7 +490,7 @@ NSString* const kCommandsDescriptionText = @"The following commands are availabl
if ([url isEqualToString:currentPictureURL]) {
// update the image
UIImage* image = [MediaManager loadCachePicture:currentPictureURL];
UIImage* image = [MediaManager loadCachePictureForURL:currentPictureURL];
if (image == nil) {
image = [UIImage imageNamed:@"default-profile"];
}