ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-24 07:05:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Further logic and documentation improvements

Browse Source
This commit is contained in:
Michael Schneider
2016-12-06 14:06:56 -08:00
parent cacc366706
commit ee0cc9b103
2 changed files with 40 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
AsyncDisplayKit/ASNetworkImageNode.mm
View File

@@ -73,6 +73,8 @@ static const CGSize kMinReleaseImageOnBackgroundSize = {20.0, 20.0};
@implementation ASNetworkImageNode
@dynamic image;
- (instancetype)initWithCache:(id<ASImageCacheProtocol>)cache downloader:(id<ASImageDownloaderProtocol>)downloader
{
if (!(self = [super init]))
@@ -121,20 +123,13 @@ static const CGSize kMinReleaseImageOnBackgroundSize = {20.0, 20.0};
/// Setter for public image property. It has the side effect to set an internal _imageWasSetExternally that prevents setting an image internally. Setting an image internally should happen with the _setImage: method
- (void)setImage:(UIImage *)image
{
__instanceLock__.lock();
#ifdef DEBUG
if (_URL != nil) {
NSLog(@"Setting the image directly on an %@ and setting and setting an URL is not supported. If you want to use a placeholder image please use defaultImage .", NSStringFromClass([self class]));
}
#endif
ASDN::MutexLocker l(__instanceLock__);
_imageWasSetExternally = (image != nil);
if (_imageWasSetExternally) {
[self __cancelDownloadAndClearImage];
[self _cancelDownloadAndClearImage];
_URL = nil;
}
__instanceLock__.unlock();
[self _setImage:image];
}
@@ -153,11 +148,6 @@ static const CGSize kMinReleaseImageOnBackgroundSize = {20.0, 20.0};
{
ASDN::MutexLocker l(__instanceLock__);
#ifdef DEBUG
if (_imageWasSetExternally) {
NSLog(@"Setting the image directly on an %@ and setting and setting an URL is not supported. If you want to use a placeholder image please use defaultImage .", NSStringFromClass([self class]));
}
#endif
_imageWasSetExternally = NO;
if (ASObjectIsEqual(URL, _URL)) {
@@ -352,7 +342,7 @@ static const CGSize kMinReleaseImageOnBackgroundSize = {20.0, 20.0};
return;
}
[self __cancelDownloadAndClearImage];
[self _cancelDownloadAndClearImage];
}
}
@@ -419,7 +409,7 @@ static const CGSize kMinReleaseImageOnBackgroundSize = {20.0, 20.0};
_downloadIdentifierForProgressBlock = newDownloadIDForProgressBlock;
}
- (void)__cancelDownloadAndClearImage
- (void)_cancelDownloadAndClearImage
{
[self _cancelImageDownload];
[self _clearImage];
@@ -428,6 +418,20 @@ static const CGSize kMinReleaseImageOnBackgroundSize = {20.0, 20.0};
}
}
- (void)_cancelImageDownload
{
if (!_downloadIdentifier) {
return;
}
if (_downloadIdentifier) {
[_downloader cancelImageDownloadForIdentifier:_downloadIdentifier];
}
_downloadIdentifier = nil;
_cacheUUID = nil;
}
- (void)_clearImage
{
// Destruction of bigger images on the main thread can be expensive
@@ -449,20 +453,6 @@ static const CGSize kMinReleaseImageOnBackgroundSize = {20.0, 20.0};
});
}
- (void)_cancelImageDownload
{
if (!_downloadIdentifier) {
return;
}
if (_downloadIdentifier) {
[_downloader cancelImageDownloadForIdentifier:_downloadIdentifier];
}
_downloadIdentifier = nil;
_cacheUUID = nil;
}
- (void)_downloadImageWithCompletion:(void (^)(id <ASImageContainerProtocol> imageContainer, NSError*, id downloadIdentifier))finished
{
ASPerformBlockOnBackgroundThread(^{