From ffa8be9508f80a29de4b50ed631f97ef151ecb9f Mon Sep 17 00:00:00 2001
From: Yann Diorcet <yann.diorcet@belledonne-communications.com>
Date: Tue, 12 Feb 2013 16:03:17 +0100
Subject: [PATCH] Improve UIRemoteImageView

---
 Classes/LinphoneUI/UIRemoteImageView.h |  4 ++-
 Classes/LinphoneUI/UIRemoteImageView.m | 38 ++++++++++++++++----------
 2 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/Classes/LinphoneUI/UIRemoteImageView.h b/Classes/LinphoneUI/UIRemoteImageView.h
index a2190af67..a67bc09ff 100644
--- a/Classes/LinphoneUI/UIRemoteImageView.h
+++ b/Classes/LinphoneUI/UIRemoteImageView.h
@@ -20,7 +20,9 @@
 
 #import <UIKit/UIKit.h>
 
-@interface UIRemoteImageView : UIImageView <NSURLConnectionDelegate>
+@interface UIRemoteImageView : UIImageView <NSURLConnectionDelegate> {
+    NSOperationQueue *queue;
+}
 
 @property (retain) UIActivityIndicatorView *waitIndicatorView;
 
diff --git a/Classes/LinphoneUI/UIRemoteImageView.m b/Classes/LinphoneUI/UIRemoteImageView.m
index 568cd52dd..97a6fe916 100644
--- a/Classes/LinphoneUI/UIRemoteImageView.m
+++ b/Classes/LinphoneUI/UIRemoteImageView.m
@@ -34,6 +34,11 @@
     waitIndicatorView.hidesWhenStopped = TRUE;
     waitIndicatorView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
     [self addSubview:waitIndicatorView];
+    
+    // Create Queue
+    queue = [[NSOperationQueue alloc] init];
+    queue.name = @"RemoteImage";
+    queue.maxConcurrentOperationCount = 1;
 }
 
 - (id)init {
@@ -78,6 +83,7 @@
 
 - (void)dealloc {
     [waitIndicatorView release];
+    [queue release];
     
     [super dealloc];
 }
@@ -87,28 +93,32 @@
 
 - (void)loadImage:(NSString*)url {
     [waitIndicatorView startAnimating];
-    NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:url] cachePolicy:NSURLRequestReturnCacheDataElseLoad timeoutInterval:5];
+    NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:url] cachePolicy:NSURLRequestReturnCacheDataElseLoad timeoutInterval:30];
     if(request != nil) {
-        dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, (unsigned long)NULL), ^(void) {
+        [queue cancelAllOperations];
+        NSBlockOperation *operation = [[[NSBlockOperation alloc] init] autorelease];
+        [operation addExecutionBlock:^(void) {
             NSURLResponse *response = nil;
             NSError *error = nil;
             NSData *data  = nil;
           
             
             data = [NSURLConnection sendSynchronousRequest:request returningResponse:&response error:&error delegate:self];
-            if(data != nil) {
-                UIImage *image = [UIImage imageWithData:data];
-                dispatch_async(dispatch_get_main_queue(), ^{
-                    [waitIndicatorView stopAnimating];
-                    [self setImage:image];
-                });
-            } else {
-                dispatch_async(dispatch_get_main_queue(), ^{
-                    [waitIndicatorView stopAnimating];
-                });
+            if(![operation isCancelled]) {
+                if(data != nil) {
+                    UIImage *image = [UIImage imageWithData:data];
+                    dispatch_async(dispatch_get_main_queue(), ^{
+                        [waitIndicatorView stopAnimating];
+                        [self setImage:image];
+                    });
+                } else {
+                    dispatch_async(dispatch_get_main_queue(), ^{
+                        [waitIndicatorView stopAnimating];
+                    });
+                }
             }
-        });
-        
+        }];
+        [queue addOperation:operation];
     }
 }
 - (BOOL)connection:(NSURLConnection *)connection canAuthenticateAgainstProtectionSpace:(NSURLProtectionSpace *)protectionSpace