Fixing image loading for the Mac OS X example app

tomasikp · May 11, 2014 · 154fee8 · 154fee8
1 parent f62359b
commit 154fee8
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 41 deletions.
diff --git a/Example/Classes/Models/User.h b/Example/Classes/Models/User.h
@@ -30,10 +30,10 @@ extern NSString * const kUserProfileImageDidLoadNotification;
 @property (readonly, nonatomic, copy) NSString *username;
 @property (readonly, nonatomic, unsafe_unretained) NSURL *avatarImageURL;
 
-- (instancetype)initWithAttributes:(NSDictionary *)attributes;
-
 #ifdef __MAC_OS_X_VERSION_MIN_REQUIRED
 @property (nonatomic, strong) NSImage *profileImage;
 #endif
 
+- (instancetype)initWithAttributes:(NSDictionary *)attributes;
+
 @end
diff --git a/Example/Classes/Models/User.m b/Example/Classes/Models/User.m
@@ -28,11 +28,10 @@
 @interface User ()
 @property (readwrite, nonatomic, assign) NSUInteger userID;
 @property (readwrite, nonatomic, copy) NSString *username;
-@property (readwrite, nonatomic, copy) NSString *avatarImageURLString;
-@property (readwrite, nonatomic, strong) AFHTTPRequestOperation *avatarImageRequestOperation;
 
 #ifdef __MAC_OS_X_VERSION_MIN_REQUIRED
-+ (NSOperationQueue *)sharedProfileImageRequestOperationQueue;
+@property (readwrite, nonatomic, copy) NSString *avatarImageURLString;
+@property (readwrite, nonatomic, strong) AFHTTPRequestOperation *avatarImageRequestOperation;
 #endif
 @end
 
@@ -55,41 +54,47 @@ - (NSURL *)avatarImageURL {
     return [NSURL URLWithString:self.avatarImageURLString];
 }
 
-//#ifdef __MAC_OS_X_VERSION_MIN_REQUIRED
-//
-//@synthesize profileImage = _profileImage;
-//
-//+ (NSOperationQueue *)sharedProfileImageRequestOperationQueue {
-//    static NSOperationQueue *_sharedProfileImageRequestOperationQueue = nil;
-//    static dispatch_once_t onceToken;
-//    dispatch_once(&onceToken, ^{
-//        _sharedProfileImageRequestOperationQueue = [[NSOperationQueue alloc] init];
-//        [_sharedProfileImageRequestOperationQueue setMaxConcurrentOperationCount:8];
-//    });
-//    
-//    return _sharedProfileImageRequestOperationQueue;
-//}
-//
-//- (NSImage *)profileImage {
-//	if (!_profileImage && !_avatarImageRequestOperation) {
-//		_avatarImageRequestOperation = [AFImageRequestOperation imageRequestOperationWithRequest:[NSURLRequest requestWithURL:self.avatarImageURL] success:^(NSImage *image) {
-//			self.profileImage = image;
-//            
-//			_avatarImageRequestOperation = nil;
-//            
-//            [[NSNotificationCenter defaultCenter] postNotificationName:kUserProfileImageDidLoadNotification object:self userInfo:nil];
-//		}];
-//        
-//		[_avatarImageRequestOperation setCacheResponseBlock:^NSCachedURLResponse *(NSURLConnection *connection, NSCachedURLResponse *cachedResponse) {
-//			return [[NSCachedURLResponse alloc] initWithResponse:cachedResponse.response data:cachedResponse.data userInfo:cachedResponse.userInfo storagePolicy:NSURLCacheStorageAllowed];
-//		}];
-//		
-//        [[[self class] sharedProfileImageRequestOperationQueue] addOperation:_avatarImageRequestOperation];
-//	}
-//	
-//	return _profileImage;
-//}
-//
-//#endif
+#pragma mark -
+
+#ifdef __MAC_OS_X_VERSION_MIN_REQUIRED
+
++ (NSOperationQueue *)sharedProfileImageRequestOperationQueue {
+    static NSOperationQueue *_sharedProfileImageRequestOperationQueue = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        _sharedProfileImageRequestOperationQueue = [[NSOperationQueue alloc] init];
+        [_sharedProfileImageRequestOperationQueue setMaxConcurrentOperationCount:8];
+    });
+
+    return _sharedProfileImageRequestOperationQueue;
+}
+
+- (NSImage *)profileImage {
+	if (!_profileImage && !_avatarImageRequestOperation) {
+        NSMutableURLRequest *mutableRequest = [NSMutableURLRequest requestWithURL:self.avatarImageURL];
+        [mutableRequest setValue:@"image/*" forHTTPHeaderField:@"Accept"];
+        AFHTTPRequestOperation *imageRequestOperation = [[AFHTTPRequestOperation alloc] initWithRequest:mutableRequest];
+        imageRequestOperation.responseSerializer = [AFImageResponseSerializer serializer];
+        [imageRequestOperation setCompletionBlockWithSuccess:^(AFHTTPRequestOperation *operation, NSImage *responseImage) {
+            self.profileImage = responseImage;
+
+			_avatarImageRequestOperation = nil;
+
+            [[NSNotificationCenter defaultCenter] postNotificationName:kUserProfileImageDidLoadNotification object:self userInfo:nil];
+        } failure:nil];
+
+		[imageRequestOperation setCacheResponseBlock:^NSCachedURLResponse *(NSURLConnection *connection, NSCachedURLResponse *cachedResponse) {
+			return [[NSCachedURLResponse alloc] initWithResponse:cachedResponse.response data:cachedResponse.data userInfo:cachedResponse.userInfo storagePolicy:NSURLCacheStorageAllowed];
+		}];
+
+		_avatarImageRequestOperation = imageRequestOperation;
+
+        [[[self class] sharedProfileImageRequestOperationQueue] addOperation:_avatarImageRequestOperation];
+	}
+
+	return _profileImage;
+}
+
+#endif
 
 @end