Starting point for new iPhone and iPad sample app

@@ -23,7 +23,7 @@
 
 
 
 
 // Automatically set on build
 // Automatically set on build
-NSString *ASIHTTPRequestVersion = @"v1.6.2-16 2010-06-15";
+NSString *ASIHTTPRequestVersion = @"v1.6.2-17 2010-06-17";
 
 
 NSString* const NetworkRequestErrorDomain = @"ASIHTTPRequestErrorDomain";
 NSString* const NetworkRequestErrorDomain = @"ASIHTTPRequestErrorDomain";
 
 

 //
 //
 //  AuthenticationViewController.h
 //  AuthenticationViewController.h
-//  iPhone
+//  Part of the ASIHTTPRequest sample project - see http://allseeing-i.com/ASIHTTPRequest for details
 //
 //
 //  Created by Ben Copsey on 01/08/2009.
 //  Created by Ben Copsey on 01/08/2009.
 //  Copyright 2009 All-Seeing Interactive. All rights reserved.
 //  Copyright 2009 All-Seeing Interactive. All rights reserved.
 //
 //
 
 
 #import <UIKit/UIKit.h>
 #import <UIKit/UIKit.h>
+#import	"SampleViewController.h"
 @class ASIHTTPRequest;
 @class ASIHTTPRequest;
 
 
-@interface AuthenticationViewController : UIViewController {
-	IBOutlet UISwitch *useKeychain;
-	IBOutlet UISwitch *useBuiltInDialog;
-	IBOutlet UILabel *topSecretInfo;
-	ASIHTTPRequest *requestRequiringAuthentication;
-	ASIHTTPRequest *requestRequiringProxyAuthentication;
+@interface AuthenticationViewController : SampleViewController {
+	
+	ASIHTTPRequest *request;
+	
+	UISwitch *useKeychain;
+	UISwitch *useBuiltInDialog;
+	UITextView *responseField;
 }
 }
 - (IBAction)fetchTopSecretInformation:(id)sender;
 - (IBAction)fetchTopSecretInformation:(id)sender;
 
 
-@property (retain) ASIHTTPRequest *requestRequiringAuthentication;
-@property (retain) ASIHTTPRequest *requestRequiringProxyAuthentication;
+@property (retain, nonatomic) ASIHTTPRequest *request;
 @end
 @end

 //
 //
 //  AuthenticationViewController.m
 //  AuthenticationViewController.m
-//  iPhone
+//  Part of the ASIHTTPRequest sample project - see http://allseeing-i.com/ASIHTTPRequest for details
 //
 //
 //  Created by Ben Copsey on 01/08/2009.
 //  Created by Ben Copsey on 01/08/2009.
 //  Copyright 2009 All-Seeing Interactive. All rights reserved.
 //  Copyright 2009 All-Seeing Interactive. All rights reserved.
@@ -8,12 +8,15 @@
 
 
 #import "AuthenticationViewController.h"
 #import "AuthenticationViewController.h"
 #import "ASIHTTPRequest.h"
 #import "ASIHTTPRequest.h"
+#import "InfoCell.h"
+#import "DetailCell.h"
+#import "ToggleCell.h"
 
 
 @implementation AuthenticationViewController
 @implementation AuthenticationViewController
 
 
 - (IBAction)fetchTopSecretInformation:(id)sender
 - (IBAction)fetchTopSecretInformation:(id)sender
 {
 {
-	ASIHTTPRequest *request = [ASIHTTPRequest requestWithURL:[NSURL URLWithString:@"http://allseeing-i.com/top_secret/"]];
+	[self setRequest:[ASIHTTPRequest requestWithURL:[NSURL URLWithString:@"http://allseeing-i.com/top_secret/"]]];
 	[request setUseKeychainPersistence:[useKeychain isOn]];
 	[request setUseKeychainPersistence:[useKeychain isOn]];
 	[request setDelegate:self];
 	[request setDelegate:self];
 	[request setShouldPresentAuthenticationDialog:[useBuiltInDialog isOn]];
 	[request setShouldPresentAuthenticationDialog:[useBuiltInDialog isOn]];
@@ -23,25 +26,20 @@
 	
 	
 }
 }
 
 
-- (IBAction)topSecretFetchFailed:(ASIHTTPRequest *)request
+- (IBAction)topSecretFetchFailed:(ASIHTTPRequest *)theRequest
 {
 {
-	[topSecretInfo setText:[[request error] localizedDescription]];
-	[topSecretInfo setFont:[UIFont boldSystemFontOfSize:12]];
+	[responseField setText:[[request error] localizedDescription]];
+	[responseField setFont:[UIFont boldSystemFontOfSize:12]];
 }
 }
 
 
-- (IBAction)topSecretFetchComplete:(ASIHTTPRequest *)request
+- (IBAction)topSecretFetchComplete:(ASIHTTPRequest *)theRequest
 {
 {
-	[topSecretInfo setText:[request responseString]];
-	[topSecretInfo setFont:[UIFont boldSystemFontOfSize:12]];
+	[responseField setText:[request responseString]];
+	[responseField setFont:[UIFont boldSystemFontOfSize:12]];
 }
 }
 
 
-- (void)authenticationNeededForRequest:(ASIHTTPRequest *)request
+- (void)authenticationNeededForRequest:(ASIHTTPRequest *)theRequest
 {
 {
-	// Why oh why is there no contextInfo for alertView like on Mac OS ?!
-	[self setRequestRequiringProxyAuthentication:nil];
-	[self setRequestRequiringAuthentication:request];
-	
-	
 	UIAlertView *alertView = [[[UIAlertView alloc] initWithTitle:@"Please Login" message:[request authenticationRealm] delegate:self cancelButtonTitle:@"Cancel" otherButtonTitles:@"OK",nil] autorelease];
 	UIAlertView *alertView = [[[UIAlertView alloc] initWithTitle:@"Please Login" message:[request authenticationRealm] delegate:self cancelButtonTitle:@"Cancel" otherButtonTitles:@"OK",nil] autorelease];
 	// These are undocumented, use at your own risk!
 	// These are undocumented, use at your own risk!
 	// A better general approach would be to subclass UIAlertView, or just use ASIHTTPRequest's built-in dialog
 	// A better general approach would be to subclass UIAlertView, or just use ASIHTTPRequest's built-in dialog
@@ -51,10 +49,8 @@
 
 
 }
 }
 
 
-- (void)proxyAuthenticationNeededForRequest:(ASIHTTPRequest *)request
+- (void)proxyAuthenticationNeededForRequest:(ASIHTTPRequest *)theRequest
 {
 {
-	[self setRequestRequiringAuthentication:nil];
-	[self setRequestRequiringProxyAuthentication:request];
 	UIAlertView *alertView = [[[UIAlertView alloc] initWithTitle:@"Please Login to proxy" message:[request authenticationRealm] delegate:self cancelButtonTitle:@"Cancel" otherButtonTitles:@"OK",nil] autorelease];
 	UIAlertView *alertView = [[[UIAlertView alloc] initWithTitle:@"Please Login to proxy" message:[request authenticationRealm] delegate:self cancelButtonTitle:@"Cancel" otherButtonTitles:@"OK",nil] autorelease];
 	[alertView addTextFieldWithValue:@"" label:@"Username"];
 	[alertView addTextFieldWithValue:@"" label:@"Username"];
 	[alertView addTextFieldWithValue:@"" label:@"Password"];
 	[alertView addTextFieldWithValue:@"" label:@"Password"];
@@ -66,17 +62,17 @@
 - (void)alertView:(UIAlertView *)alertView clickedButtonAtIndex:(NSInteger)buttonIndex
 - (void)alertView:(UIAlertView *)alertView clickedButtonAtIndex:(NSInteger)buttonIndex
 {
 {
 	if (buttonIndex == 1) {
 	if (buttonIndex == 1) {
-		if ([self requestRequiringAuthentication]) {
-			[[self requestRequiringAuthentication] setUsername:[[alertView textFieldAtIndex:0] text]];
-			[[self requestRequiringAuthentication] setPassword:[[alertView textFieldAtIndex:1] text]];
-			[[self requestRequiringAuthentication] retryUsingSuppliedCredentials];
-		} else if ([self requestRequiringProxyAuthentication]) {
-			[[self requestRequiringProxyAuthentication] setProxyUsername:[[alertView textFieldAtIndex:0] text]];
-			[[self requestRequiringProxyAuthentication] setProxyPassword:[[alertView textFieldAtIndex:1] text]];
-			[[self requestRequiringProxyAuthentication] retryUsingSuppliedCredentials];
+		if ([[self request] authenticationNeeded] == ASIHTTPAuthenticationNeeded) {
+			[[self request] setUsername:[[alertView textFieldAtIndex:0] text]];
+			[[self request] setPassword:[[alertView textFieldAtIndex:1] text]];
+			[[self request] retryUsingSuppliedCredentials];
+		} else if ([[self request] authenticationNeeded] == ASIProxyAuthenticationNeeded) {
+			[[self request] setProxyUsername:[[alertView textFieldAtIndex:0] text]];
+			[[self request] setProxyPassword:[[alertView textFieldAtIndex:1] text]];
+			[[self request] retryUsingSuppliedCredentials];
 		}
 		}
 	} else {
 	} else {
-		[[self requestRequiringAuthentication] cancelAuthentication];
+		[[self request] cancelAuthentication];
 	}
 	}
 }
 }
 
 
@@ -99,11 +95,131 @@
 
 
 - (void)dealloc
 - (void)dealloc
 {
 {
-	[requestRequiringAuthentication release];
-	[requestRequiringProxyAuthentication release];
+	[request cancel];
+	[request release];
     [super dealloc];
     [super dealloc];
 }
 }
 
 
-@synthesize requestRequiringAuthentication;
-@synthesize requestRequiringProxyAuthentication;
+/*
+ Most of the code below here relates to the table view, and isn't that interesting
+ */
+
+- (void)viewDidLoad
+{
+	[[[self navigationBar] topItem] setTitle:@"HTTP Authentication"];
+}
+
+static NSString *intro = @"Demonstrates fetching content from an area that requires HTTP authentication. You will be prompted for a username and password, enter 'topsecret' for both.\nIf you turn on keychain support, successful authentication will result in the username and password you provided being stored in your keychain. The application will use these details rather than prompt you the next time.\nToggle 'Use built-in dialog' to switch between ASIHTTPRequest's built-in dialog, and one created by the delegate.";
+
+- (UIView *)tableView:(UITableView *)theTableView viewForHeaderInSection:(NSInteger)section
+{
+	if (section == 1) {
+		int tablePadding = 40;
+		int tableWidth = [tableView frame].size.width;
+		if (tableWidth > 480) { // iPad
+			tablePadding = 110;
+		}
+		
+		UIView *view = [[[UIView alloc] initWithFrame:CGRectMake(0,0,tableWidth-(tablePadding/2),30)] autorelease];
+		UIButton *goButton = [UIButton buttonWithType:UIButtonTypeRoundedRect];
+		[goButton setTitle:@"Go!" forState:UIControlStateNormal];
+		[goButton sizeToFit];
+		[goButton setFrame:CGRectMake([view frame].size.width-[goButton frame].size.width+10,7,[goButton frame].size.width,[goButton frame].size.height)];
+
+		[goButton addTarget:self action:@selector(fetchTopSecretInformation:) forControlEvents:UIControlEventTouchDown];
+		[view addSubview:goButton];
+		
+		return view;
+	}
+	return nil;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)theTableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+	UITableViewCell *cell;
+	if ([indexPath section] == 0) {
+		cell = [InfoCell cellWithDescription:intro];
+	} else if ([indexPath section] == 1) {
+		cell = [tableView dequeueReusableCellWithIdentifier:@"ToggleCell"];
+		if (!cell) {
+			cell = [ToggleCell cell];
+		}		
+	} else {
+		cell = [tableView dequeueReusableCellWithIdentifier:@"MyCell"];
+		if (!cell) {
+			cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:@"MyCell"] autorelease];
+		}	
+	}
+	[cell setSelectionStyle:UITableViewCellSelectionStyleNone];
+	
+	int tablePadding = 40;
+	int tableWidth = [tableView frame].size.width;
+	if (tableWidth > 480) { // iPad
+		tablePadding = 110;
+	}
+	
+	switch ([indexPath section]) {
+		case 1:
+			switch ([indexPath row]) {
+				case 0:
+					[[cell textLabel] setText:@"Use Keychain"];
+					useKeychain = [(ToggleCell *)cell toggle];
+					break;
+				case 1:
+					[[cell textLabel] setText:@"Use Built-In Dialog"];
+					useBuiltInDialog = [(ToggleCell *)cell toggle];
+					break;
+			}
+			break;
+		case 2:
+			responseField = [[[UITextView alloc] initWithFrame:CGRectMake(5,5,tableWidth-tablePadding,150)] autorelease];
+			[responseField setBackgroundColor:[UIColor clearColor]];
+			[responseField setText:@"Secret information will appear here if authentication succeeds"];
+			[[cell contentView] addSubview:responseField];
+			break;
+	}
+	return cell;
+}
+
+- (NSInteger)tableView:(UITableView *)theTableView numberOfRowsInSection:(NSInteger)section
+{
+	if (section == 1) {
+		return 2;
+	} else {
+		return 1;
+	}
+}
+
+- (CGFloat)tableView:(UITableView *)theTableView heightForHeaderInSection:(NSInteger)section
+{
+	if (section == 1) {
+		return 50;
+	}
+	return 34;
+}
+
+- (CGFloat)tableView:(UITableView *)theTableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+	if ([indexPath section] == 0) {
+		return [InfoCell neededHeightForDescription:intro withTableWidth:[tableView frame].size.width]+20;
+	} else if ([indexPath section] == 2) {
+		return 160;
+	} else {
+		return 42;
+	}
+}
+
+- (NSString *)tableView:(UITableView *)theTableView titleForHeaderInSection:(NSInteger)section
+{
+
+	return nil;
+}
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
+{
+	return 3;
+}
+
+
+@synthesize request;
 @end
 @end

+//
+//  DetailCell.h
+//  Part of the ASIHTTPRequest sample project - see http://allseeing-i.com/ASIHTTPRequest for details
+//
+//  Created by Ben Copsey on 16/06/2010.
+//  Copyright 2010 All-Seeing Interactive. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+
+@interface DetailCell : UITableViewCell {
+
+}
++ (id)cell;
+
+@end

+//
+//  DetailCell.m
+//  Part of the ASIHTTPRequest sample project - see http://allseeing-i.com/ASIHTTPRequest for details
+//
+//  Created by Ben Copsey on 16/06/2010.
+//  Copyright 2010 All-Seeing Interactive. All rights reserved.
+//
+
+#import "DetailCell.h"
+
+
+@implementation DetailCell
+
++ (id)cell
+{
+	DetailCell *cell = [[[DetailCell alloc] initWithStyle:UITableViewCellStyleValue2 reuseIdentifier:@"HeaderCell"] autorelease];
+	[[cell detailTextLabel] setTextAlignment:UITextAlignmentLeft];
+	[[cell detailTextLabel] setFont:[UIFont systemFontOfSize:14]];
+	return cell;
+}
+
+- (void)layoutSubviews
+{
+	[super layoutSubviews];
+	int tablePadding = 40;
+	int tableWidth = [[self superview] frame].size.width;
+	if (tableWidth > 480) { // iPad
+		tablePadding = 110;
+	}
+	[[self textLabel] setFrame:CGRectMake(5,5,120,20)];
+	[[self detailTextLabel] setFrame:CGRectMake(135,5,[self frame].size.width-145-tablePadding,20)];
+	
+}
+
+@end

+//
+//  InfoCell.h
+//  Part of the ASIHTTPRequest sample project - see http://allseeing-i.com/ASIHTTPRequest for details
+//
+//  Created by Ben Copsey on 17/06/2010.
+//  Copyright 2010 All-Seeing Interactive. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+
+@interface InfoCell : UITableViewCell {
+
+}
++ (id)cellWithDescription:(NSString *)description;
++ (NSUInteger)neededHeightForDescription:(NSString *)description withTableWidth:(NSUInteger)tableWidth;
+@end

+//
+//  InfoCell.m
+//  Part of the ASIHTTPRequest sample project - see http://allseeing-i.com/ASIHTTPRequest for details
+//
+//  Created by Ben Copsey on 17/06/2010.
+//  Copyright 2010 All-Seeing Interactive. All rights reserved.
+//
+
+#import "InfoCell.h"
+
+
+@implementation InfoCell
+
++ (id)cellWithDescription:(NSString *)description
+{
+	InfoCell *cell = [[[InfoCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:@"InfoCell"] autorelease];
+	if ([[UIScreen mainScreen] bounds].size.width > 480) { // iPad
+		[[cell textLabel] setFont:[UIFont systemFontOfSize:14]];
+	} else {
+		[[cell textLabel] setFont:[UIFont systemFontOfSize:13]];
+	}
+	[[cell textLabel] setLineBreakMode:UILineBreakModeWordWrap];
+	[[cell textLabel] setNumberOfLines:0];
+	[[cell textLabel] setText:description];
+	[[cell textLabel] sizeToFit];
+	
+	if ([[UIScreen mainScreen] bounds].size.width > 480) { // iPad
+		UIImageView *imageView = [[[UIImageView alloc] initWithFrame:CGRectMake(10,10,48,48)] autorelease];
+		[imageView setImage:[UIImage imageNamed:@"info.png"]];
+		[[cell contentView] addSubview:imageView];
+	}
+	return cell;	
+}
+
+- (void)layoutSubviews
+{
+	[super layoutSubviews];
+	int tablePadding = 40;
+	int tableWidth = [[self superview] frame].size.width;
+	if (tableWidth > 480) { // iPad
+		tablePadding = 110;
+		[[self textLabel] setFrame:CGRectMake(70,10,tableWidth-tablePadding-70,[[self class] neededHeightForDescription:[[self textLabel] text] withTableWidth:tableWidth])];	
+	} else {
+		[[self textLabel] setFrame:CGRectMake(10,10,tableWidth-tablePadding,[[self class] neededHeightForDescription:[[self textLabel] text] withTableWidth:tableWidth])];	
+	}
+
+}
+
++ (NSUInteger)neededHeightForDescription:(NSString *)description withTableWidth:(NSUInteger)tableWidth
+{
+	int tablePadding = 40;
+	int offset = 0;
+	int textSize = 13;
+	if (tableWidth > 480) { // iPad
+		tablePadding = 110;
+		offset = 70;
+		textSize = 14;
+	}
+	CGSize labelSize = [description sizeWithFont:[UIFont systemFontOfSize:textSize] constrainedToSize:CGSizeMake(tableWidth-tablePadding-offset,1000) lineBreakMode:UILineBreakModeWordWrap];
+	if (labelSize.height < 48) {
+		return 58;
+	}
+	return labelSize.height;
+}
+
+@end

 //
 //
 //  QueueViewController.h
 //  QueueViewController.h
-//  asi-http-request
+//  Part of the ASIHTTPRequest sample project - see http://allseeing-i.com/ASIHTTPRequest for details
 //
 //
 //  Created by Ben Copsey on 07/11/2008.
 //  Created by Ben Copsey on 07/11/2008.
 //  Copyright 2008 All-Seeing Interactive. All rights reserved.
 //  Copyright 2008 All-Seeing Interactive. All rights reserved.
 //
 //
 
 
 #import <UIKit/UIKit.h>
 #import <UIKit/UIKit.h>
+#import "SampleViewController.h"
 
 
 @class ASINetworkQueue;
 @class ASINetworkQueue;
 
 
-@interface QueueViewController : UIViewController {
+@interface QueueViewController : SampleViewController {
 	ASINetworkQueue *networkQueue;
 	ASINetworkQueue *networkQueue;
 	
 	
-	IBOutlet UIImageView *imageView1;
-	IBOutlet UIImageView *imageView2;
-	IBOutlet UIImageView *imageView3;
-	IBOutlet UIProgressView *progressIndicator;
-	IBOutlet UISwitch *accurateProgress;
+	UIImageView *imageView1;
+	UIImageView *imageView2;
+	UIImageView *imageView3;
+	UIProgressView *progressIndicator;
+	UISwitch *accurateProgress;
+	UIProgressView *imageProgressIndicator1;
+	UIProgressView *imageProgressIndicator2;
+	UIProgressView *imageProgressIndicator3;
+	BOOL failed;
 	
 	
 }
 }
 
 

 //
 //
 //  QueueViewController.m
 //  QueueViewController.m
-//  asi-http-request
+//  Part of the ASIHTTPRequest sample project - see http://allseeing-i.com/ASIHTTPRequest for details
 //
 //
 //  Created by Ben Copsey on 07/11/2008.
 //  Created by Ben Copsey on 07/11/2008.
 //  Copyright 2008 All-Seeing Interactive. All rights reserved.
 //  Copyright 2008 All-Seeing Interactive. All rights reserved.
@@ -9,38 +9,43 @@
 #import "QueueViewController.h"
 #import "QueueViewController.h"
 #import "ASIHTTPRequest.h"
 #import "ASIHTTPRequest.h"
 #import "ASINetworkQueue.h"
 #import "ASINetworkQueue.h"
+#import "InfoCell.h"
+#import "ToggleCell.h"
 
 
 @implementation QueueViewController
 @implementation QueueViewController
 
 
 
 
-- (void)awakeFromNib
-{
-	networkQueue = [[ASINetworkQueue alloc] init];
-}
-
 - (IBAction)fetchThreeImages:(id)sender
 - (IBAction)fetchThreeImages:(id)sender
 {
 {
 	[imageView1 setImage:nil];
 	[imageView1 setImage:nil];
 	[imageView2 setImage:nil];
 	[imageView2 setImage:nil];
 	[imageView3 setImage:nil];
 	[imageView3 setImage:nil];
 	
 	
-	[networkQueue cancelAllOperations];
+	if (!networkQueue) {
+		networkQueue = [[ASINetworkQueue alloc] init];	
+	}
+	failed = NO;
+	[networkQueue reset];
 	[networkQueue setDownloadProgressDelegate:progressIndicator];
 	[networkQueue setDownloadProgressDelegate:progressIndicator];
 	[networkQueue setRequestDidFinishSelector:@selector(imageFetchComplete:)];
 	[networkQueue setRequestDidFinishSelector:@selector(imageFetchComplete:)];
+	[networkQueue setRequestDidFailSelector:@selector(imageFetchFailed:)];
 	[networkQueue setShowAccurateProgress:[accurateProgress isOn]];
 	[networkQueue setShowAccurateProgress:[accurateProgress isOn]];
 	[networkQueue setDelegate:self];
 	[networkQueue setDelegate:self];
 	
 	
 	ASIHTTPRequest *request;
 	ASIHTTPRequest *request;
 	request = [ASIHTTPRequest requestWithURL:[NSURL URLWithString:@"http://allseeing-i.com/ASIHTTPRequest/tests/images/small-image.jpg"]];
 	request = [ASIHTTPRequest requestWithURL:[NSURL URLWithString:@"http://allseeing-i.com/ASIHTTPRequest/tests/images/small-image.jpg"]];
 	[request setDownloadDestinationPath:[[NSHomeDirectory() stringByAppendingPathComponent:@"Documents"] stringByAppendingPathComponent:@"1.png"]];
 	[request setDownloadDestinationPath:[[NSHomeDirectory() stringByAppendingPathComponent:@"Documents"] stringByAppendingPathComponent:@"1.png"]];
+	[request setDownloadProgressDelegate:imageProgressIndicator1];
 	[networkQueue addOperation:request];
 	[networkQueue addOperation:request];
 	
 	
 	request = [[[ASIHTTPRequest alloc] initWithURL:[NSURL URLWithString:@"http://allseeing-i.com/ASIHTTPRequest/tests/images/medium-image.jpg"]] autorelease];
 	request = [[[ASIHTTPRequest alloc] initWithURL:[NSURL URLWithString:@"http://allseeing-i.com/ASIHTTPRequest/tests/images/medium-image.jpg"]] autorelease];
 	[request setDownloadDestinationPath:[[NSHomeDirectory() stringByAppendingPathComponent:@"Documents"] stringByAppendingPathComponent:@"2.png"]];
 	[request setDownloadDestinationPath:[[NSHomeDirectory() stringByAppendingPathComponent:@"Documents"] stringByAppendingPathComponent:@"2.png"]];
+	[request setDownloadProgressDelegate:imageProgressIndicator2];
 	[networkQueue addOperation:request];
 	[networkQueue addOperation:request];
 	
 	
 	request = [[[ASIHTTPRequest alloc] initWithURL:[NSURL URLWithString:@"http://allseeing-i.com/ASIHTTPRequest/tests/images/large-image.jpg"]] autorelease];
 	request = [[[ASIHTTPRequest alloc] initWithURL:[NSURL URLWithString:@"http://allseeing-i.com/ASIHTTPRequest/tests/images/large-image.jpg"]] autorelease];
 	[request setDownloadDestinationPath:[[NSHomeDirectory() stringByAppendingPathComponent:@"Documents"] stringByAppendingPathComponent:@"3.png"]];
 	[request setDownloadDestinationPath:[[NSHomeDirectory() stringByAppendingPathComponent:@"Documents"] stringByAppendingPathComponent:@"3.png"]];
+	[request setDownloadProgressDelegate:imageProgressIndicator3];
 	[networkQueue addOperation:request];
 	[networkQueue addOperation:request];
 	
 	
 	[networkQueue go];
 	[networkQueue go];
@@ -63,10 +68,182 @@
 	}
 	}
 }
 }
 
 
+- (void)imageFetchFailed:(ASIHTTPRequest *)request
+{
+	if (!failed) {
+		if ([[request error] domain] != NetworkRequestErrorDomain || [[request error] code] != ASIRequestCancelledErrorType) {
+			UIAlertView *alertView = [[[UIAlertView alloc] initWithTitle:@"Download failed" message:@"Failed to download images" delegate:nil cancelButtonTitle:@"OK" otherButtonTitles:nil] autorelease];
+			[alertView show];
+		}
+		failed = YES;
+	}
+}
+
 - (void)dealloc {
 - (void)dealloc {
+	[networkQueue reset];
 	[networkQueue release];
 	[networkQueue release];
     [super dealloc];
     [super dealloc];
 }
 }
 
 
 
 
+/*
+ Most of the code below here relates to the table view, and isn't that interesting
+ */
+
+- (void)viewDidLoad
+{
+	[[[self navigationBar] topItem] setTitle:@"Using a Queue"];
+}
+
+static NSString *intro = @"Demonstrates a fetching 3 items at once, using an ASINetworkQueue to track progress.\r\nEach request has its own downloadProgressDelegate, and the queue has an additional downloadProgressDelegate to track overall progress.";
+
+- (UIView *)tableView:(UITableView *)theTableView viewForHeaderInSection:(NSInteger)section
+{
+	if (section == 1) {
+		int tablePadding = 40;
+		int tableWidth = [tableView frame].size.width;
+		if (tableWidth > 480) { // iPad
+			tablePadding = 110;
+		}
+		
+		UIView *view = [[[UIView alloc] initWithFrame:CGRectMake(0,0,tableWidth-(tablePadding/2),30)] autorelease];
+		UIButton *goButton = [UIButton buttonWithType:UIButtonTypeRoundedRect];
+		[goButton setTitle:@"Go!" forState:UIControlStateNormal];
+		[goButton sizeToFit];
+		[goButton setFrame:CGRectMake([view frame].size.width-[goButton frame].size.width+10,7,[goButton frame].size.width,[goButton frame].size.height)];
+		
+		[goButton addTarget:self action:@selector(fetchThreeImages:) forControlEvents:UIControlEventTouchUpInside];
+		[view addSubview:goButton];
+		
+		progressIndicator = [[[UIProgressView alloc] initWithFrame:CGRectMake((tablePadding/2)-10,20,200,10)] autorelease];
+		[view addSubview:progressIndicator];
+		
+		return view;
+	}
+	return nil;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)theTableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+	UITableViewCell *cell;
+	if ([indexPath section] == 0) {
+		cell = [InfoCell cellWithDescription:intro];
+	} else if ([indexPath section] == 1) {
+		cell = [tableView dequeueReusableCellWithIdentifier:@"ToggleCell"];
+		if (!cell) {
+			cell = [ToggleCell cell];
+		}	
+	} else {
+		cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:@"MyCell"] autorelease];
+	}
+	[cell setSelectionStyle:UITableViewCellSelectionStyleNone];
+	
+	int tablePadding = 40;
+	int tableWidth = [tableView frame].size.width;
+	if (tableWidth > 480) { // iPad
+		tablePadding = 110;
+	}
+	
+	if ([indexPath section] == 1) {
+		[[cell textLabel] setText:@"Show Accurate Progress"];
+		accurateProgress = [(ToggleCell *)cell toggle];
+	} else if ([indexPath section] == 2) {
+		
+		NSUInteger imageWidth = (tableWidth-tablePadding-20)/3;
+		NSUInteger imageHeight = imageWidth*0.66;
+		
+		imageView1 = [[[UIImageView alloc] initWithFrame:CGRectMake(tablePadding/2,10,imageWidth,imageHeight)] autorelease];
+		[imageView1 setBackgroundColor:[UIColor grayColor]];
+		[cell addSubview:imageView1];
+		
+		imageProgressIndicator1 = [[[UIProgressView alloc] initWithFrame:CGRectMake(tablePadding/2,15+imageHeight,imageWidth,20)] autorelease];
+		[cell addSubview:imageProgressIndicator1];
+		
+		UILabel *label = [[[UILabel alloc] initWithFrame:CGRectMake(tablePadding/2,25+imageHeight,imageWidth,20)] autorelease];
+		if (tableWidth > 480) {
+			[label setText:@"This image is 15KB in size"];
+		} else {
+			[label setText:@"Img size: 15KB"];
+		}
+		[label setTextAlignment:UITextAlignmentCenter];
+		[label setFont:[UIFont systemFontOfSize:11]];
+		[label setBackgroundColor:[UIColor clearColor]];
+		[cell addSubview:label];
+		
+		imageView2 = [[[UIImageView alloc] initWithFrame:CGRectMake((tablePadding/2)+imageWidth+10,10,imageWidth,imageHeight)] autorelease];
+		[imageView2 setBackgroundColor:[UIColor grayColor]];
+		[cell addSubview:imageView2];
+		
+		imageProgressIndicator2 = [[[UIProgressView alloc] initWithFrame:CGRectMake((tablePadding/2)+imageWidth+10,15+imageHeight,imageWidth,20)] autorelease];
+		[cell addSubview:imageProgressIndicator2];
+		
+		label = [[[UILabel alloc] initWithFrame:CGRectMake(tablePadding/2+imageWidth+10,25+imageHeight,imageWidth,20)] autorelease];
+		if (tableWidth > 480) {
+			[label setText:@"This image is 176KB in size"];
+		} else {
+			[label setText:@"Img size: 176KB"];
+		}
+		[label setTextAlignment:UITextAlignmentCenter];
+		[label setFont:[UIFont systemFontOfSize:11]];
+		[label setBackgroundColor:[UIColor clearColor]];
+		[cell addSubview:label];
+		
+		imageView3 = [[[UIImageView alloc] initWithFrame:CGRectMake((tablePadding/2)+(imageWidth*2)+20,10,imageWidth,imageHeight)] autorelease];
+		[imageView3 setBackgroundColor:[UIColor grayColor]];
+		[cell addSubview:imageView3];
+		
+		imageProgressIndicator3 = [[[UIProgressView alloc] initWithFrame:CGRectMake((tablePadding/2)+(imageWidth*2)+20,15+imageHeight,imageWidth,20)] autorelease];
+		[cell addSubview:imageProgressIndicator3];
+		
+		label = [[[UILabel alloc] initWithFrame:CGRectMake(tablePadding/2+(imageWidth*2)+20,25+imageHeight,imageWidth,20)] autorelease];
+		if (tableWidth > 480) {
+			[label setText:@"This image is 1.4MB in size"];
+		} else {
+			[label setText:@"Img size: 1.4MB"];
+		}
+		[label setTextAlignment:UITextAlignmentCenter];
+		[label setFont:[UIFont systemFontOfSize:11]];
+		[label setBackgroundColor:[UIColor clearColor]];
+		[cell addSubview:label];
+
+	}
+	return cell;
+}
+
+- (NSInteger)tableView:(UITableView *)theTableView numberOfRowsInSection:(NSInteger)section
+{
+	return 1;
+}
+
+- (CGFloat)tableView:(UITableView *)theTableView heightForHeaderInSection:(NSInteger)section
+{
+	if (section == 1) {
+		return 50;
+	}
+	return 34;
+}
+
+- (CGFloat)tableView:(UITableView *)theTableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+	if ([indexPath section] == 0) {
+		return [InfoCell neededHeightForDescription:intro withTableWidth:[tableView frame].size.width]+20;
+	} else if ([indexPath section] == 2) {
+		int tablePadding = 40;
+		int tableWidth = [tableView frame].size.width;
+		if (tableWidth > 480) { // iPad
+			tablePadding = 110;
+		}
+		NSUInteger imageWidth = (tableWidth-tablePadding-20)/3;
+		NSUInteger imageHeight = imageWidth*0.66;
+		return imageHeight+50;
+	} else {
+		return 42;
+	}
+}
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
+{
+	return 3;
+}
+
 @end
 @end

+//
+//  RootViewController.h
+//  Part of the ASIHTTPRequest sample project - see http://allseeing-i.com/ASIHTTPRequest for details
+//
+//  Created by Ben Copsey on 16/06/2010.
+//  Copyright 2010 All-Seeing Interactive. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface RootViewController : UITableViewController <UISplitViewControllerDelegate> {
+	UISplitViewController *splitViewController;
+    UIPopoverController *popoverController;    
+    UIBarButtonItem *rootPopoverButtonItem;
+}
+@property (nonatomic, assign) IBOutlet UISplitViewController *splitViewController;
+@property (nonatomic, retain) UIPopoverController *popoverController;
+@property (nonatomic, retain) UIBarButtonItem *rootPopoverButtonItem;
+@end

+//
+//  RootViewController.m
+//  Part of the ASIHTTPRequest sample project - see http://allseeing-i.com/ASIHTTPRequest for details
+//
+//  Created by Ben Copsey on 16/06/2010.
+//  Copyright 2010 All-Seeing Interactive. All rights reserved.
+//
+
+#import "RootViewController.h"
+#import "SynchronousViewController.h"
+#import "QueueViewController.h"
+#import "AuthenticationViewController.h"
+#import "UploadViewController.h"
+
+@implementation RootViewController
+
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+    self.contentSizeForViewInPopover = CGSizeMake(310.0, self.tableView.rowHeight*4.0);
+}
+
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
+    return YES;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+	UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"MyCell"];
+	if (!cell) {
+		cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:@"MyCell"] autorelease];
+	}
+	switch ([indexPath row]) {
+		case 0:
+			[[cell textLabel] setText:@"Synchronous"];
+			break;
+		case 1:
+			[[cell textLabel] setText:@"Queue"];
+			break;
+		case 2:
+			[[cell textLabel] setText:@"Authentication"];
+			break;
+		case 3:
+			[[cell textLabel] setText:@"Upload"];
+			break;
+	}
+	return cell;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+	return 4;
+}
+
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
+{
+	UIViewController *viewController = nil;
+	switch ([indexPath row]) {
+		case 0:
+			viewController = [[[SynchronousViewController alloc] initWithNibName:@"Sample" bundle:nil] autorelease];
+			break;
+		case 1:
+			viewController = [[[QueueViewController alloc] initWithNibName:@"Sample" bundle:nil] autorelease];
+			break;
+		case 2:
+			viewController = [[[AuthenticationViewController alloc] initWithNibName:@"Sample" bundle:nil] autorelease];
+			break;
+		case 3:
+			viewController = [[[UploadViewController alloc] initWithNibName:@"Sample" bundle:nil] autorelease];
+			break;
+	}	
+	[splitViewController setViewControllers:[NSArray arrayWithObjects:[self navigationController],viewController,nil]];
+	
+	// Dismiss the popover if it's present.
+    if ([self popoverController]) {
+        [[self popoverController] dismissPopoverAnimated:YES];
+    }
+	
+    // Configure the new view controller's popover button (after the view has been displayed and its toolbar/navigation bar has been created).
+    if ([self rootPopoverButtonItem]) {
+        [[[(id)viewController navigationBar] topItem] setLeftBarButtonItem:[self rootPopoverButtonItem] animated:NO];
+    }
+	
+}
+
+- (void)splitViewController:(UISplitViewController*)svc willHideViewController:(UIViewController *)aViewController withBarButtonItem:(UIBarButtonItem*)barButtonItem forPopoverController:(UIPopoverController*)pc
+{
+	[barButtonItem setTitle:@"More Examples"];
+	[self setPopoverController:pc];
+	[self setRootPopoverButtonItem:barButtonItem];
+	SampleViewController *detailViewController = [[splitViewController viewControllers] objectAtIndex:1];
+    [detailViewController showNavigationButton:barButtonItem];
+}
+
+- (void)splitViewController:(UISplitViewController*)svc willShowViewController:(UIViewController *)aViewController invalidatingBarButtonItem:(UIBarButtonItem *)barButtonItem
+{
+    [self setPopoverController:nil];
+	[self setRootPopoverButtonItem:nil];
+	SampleViewController *detailViewController = [[splitViewController viewControllers] objectAtIndex:1];
+    [detailViewController hideNavigationButton:barButtonItem];
+}
+
+- (void)splitViewController:(UISplitViewController *)svc popoverController: (UIPopoverController *)pc willPresentViewController: (UIViewController *)aViewController
+{
+    if (pc != nil) {
+        [pc dismissPopoverAnimated:YES];
+    }
+}
+
+
+@synthesize splitViewController;
+@synthesize popoverController;
+@synthesize rootPopoverButtonItem;
+@end

+//
+//  SampleViewController.h
+//  Part of the ASIHTTPRequest sample project - see http://allseeing-i.com/ASIHTTPRequest for details
+//
+//  Created by Ben Copsey on 17/06/2010.
+//  Copyright 2010 All-Seeing Interactive. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+
+@interface SampleViewController : UIViewController <UITableViewDelegate> {
+	UINavigationBar *navigationBar;
+	UITableView *tableView;
+}
+
+- (void)showNavigationButton:(UIBarButtonItem *)button;
+- (void)hideNavigationButton:(UIBarButtonItem *)button;
+
+@property (retain, nonatomic) IBOutlet UINavigationBar *navigationBar;
+@property (retain, nonatomic) IBOutlet UITableView *tableView;
+@end

+//
+//  SampleViewController.m
+//  Part of the ASIHTTPRequest sample project - see http://allseeing-i.com/ASIHTTPRequest for details
+//
+//  Created by Ben Copsey on 17/06/2010.
+//  Copyright 2010 All-Seeing Interactive. All rights reserved.
+//
+
+#import "SampleViewController.h"
+
+
+@implementation SampleViewController
+
+- (void)showNavigationButton:(UIBarButtonItem *)button
+{
+    [[[self navigationBar] topItem] setLeftBarButtonItem:button animated:NO];	
+}
+
+- (void)hideNavigationButton:(UIBarButtonItem *)button
+{
+    [[[self navigationBar] topItem] setLeftBarButtonItem:nil animated:NO];
+}
+
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation 
+{
+	return YES;
+}
+
+- (NSIndexPath *)tableView:(UITableView *)theTableView willSelectRowAtIndexPath:(NSIndexPath *)indexPath
+{
+	return nil;
+}
+
+- (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation
+{
+	[[self tableView] reloadData];
+}
+
+
+- (void)viewDidUnload {
+    [super viewDidUnload];
+    [self setNavigationBar:nil];
+	[self setTableView:nil];
+}
+
+
+- (void)dealloc {
+	[navigationBar release];
+	[tableView release];
+    [super dealloc];
+}
+
+@synthesize navigationBar;
+@synthesize tableView;
+@end

 //
 //
 //  SynchronousViewController.h
 //  SynchronousViewController.h
-//  asi-http-request
+//  Part of the ASIHTTPRequest sample project - see http://allseeing-i.com/ASIHTTPRequest for details
 //
 //
 //  Created by Ben Copsey on 07/11/2008.
 //  Created by Ben Copsey on 07/11/2008.
 //  Copyright 2008 All-Seeing Interactive. All rights reserved.
 //  Copyright 2008 All-Seeing Interactive. All rights reserved.
 //
 //
 
 
 #import <UIKit/UIKit.h>
 #import <UIKit/UIKit.h>
+#import "SampleViewController.h"
+@class ASIHTTPRequest;
 
 
+@interface SynchronousViewController : SampleViewController {
+	ASIHTTPRequest *request;
+	UITextField *urlField;
+	UITextView *responseField;
 
 
-@interface SynchronousViewController : UIViewController {
-	IBOutlet UITextView *htmlSource;
 }
 }
 - (IBAction)simpleURLFetch:(id)sender;
 - (IBAction)simpleURLFetch:(id)sender;
 
 
+@property (retain, nonatomic) ASIHTTPRequest *request;
+
 @end
 @end

 //
 //
 //  SynchronousViewController.m
 //  SynchronousViewController.m
-//  asi-http-request
+//  Part of the ASIHTTPRequest sample project - see http://allseeing-i.com/ASIHTTPRequest for details
 //
 //
 //  Created by Ben Copsey on 07/11/2008.
 //  Created by Ben Copsey on 07/11/2008.
 //  Copyright 2008 All-Seeing Interactive. All rights reserved.
 //  Copyright 2008 All-Seeing Interactive. All rights reserved.
@@ -8,23 +8,183 @@
 
 
 #import "SynchronousViewController.h"
 #import "SynchronousViewController.h"
 #import "ASIHTTPRequest.h"
 #import "ASIHTTPRequest.h"
+#import "DetailCell.h"
+#import "InfoCell.h"
 
 
 @implementation SynchronousViewController
 @implementation SynchronousViewController
 
 
+
+// Runs a request synchronously
 - (IBAction)simpleURLFetch:(id)sender
 - (IBAction)simpleURLFetch:(id)sender
 {
 {
-	ASIHTTPRequest *request = [[[ASIHTTPRequest alloc] initWithURL:[NSURL URLWithString:@"http://allseeing-i.com/"]] autorelease];
+	
+	NSURL *url = [NSURL URLWithString:[urlField text]];
+	// Create a request
+	// You don't normally need to retain a synchronous request, but we need to in this case because we'll need it later if we reload the table data
+	[self setRequest:[ASIHTTPRequest requestWithURL:url]];
 	
 	
 	//Customise our user agent, for no real reason
 	//Customise our user agent, for no real reason
 	[request addRequestHeader:@"User-Agent" value:@"ASIHTTPRequest"];
 	[request addRequestHeader:@"User-Agent" value:@"ASIHTTPRequest"];
 	
 	
+	// Start the request
 	[request startSynchronous];
 	[request startSynchronous];
-	if ([request error]) {
-		[htmlSource setText:[[request error] localizedDescription]];
-	} else if ([request responseString]) {
-		[htmlSource setText:[request responseString]];
+	
+	// Request has now finished
+	[[self tableView] reloadData];
+
+}
+
+/*
+Most of the code below here relates to the table view, and isn't that interesting
+*/
+
+- (void)viewDidLoad
+{
+	[[[self navigationBar] topItem] setTitle:@"Synchronous Requests"];
+	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillShow:) name:UIKeyboardWillShowNotification object:nil];
+	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillHide:) name:UIKeyboardWillHideNotification object:nil];
+
+}
+
+
+- (void)dealloc
+{
+	[request cancel];
+	[request release];
+	[[NSNotificationCenter defaultCenter] removeObserver:self name:UIKeyboardWillShowNotification object:nil];
+	[[NSNotificationCenter defaultCenter] removeObserver:self name:UIKeyboardWillHideNotification object:nil];
+	[super dealloc];
+}
+
+- (void)keyboardWillShow:(NSNotification *)notification
+{
+	NSValue *keyboardBoundsValue = [[notification userInfo] objectForKey:UIKeyboardBoundsUserInfoKey];
+	CGRect keyboardBounds;
+	[keyboardBoundsValue getValue:&keyboardBounds];
+	UIEdgeInsets e = UIEdgeInsetsMake(0, 0, keyboardBounds.size.height-42, 0);
+	[[self tableView] setScrollIndicatorInsets:e];
+	[[self tableView] setContentInset:e];
+}
+
+- (void)keyboardWillHide:(NSNotification *)notification
+{
+	UIEdgeInsets e = UIEdgeInsetsMake(0, 0, 0, 0);
+	[[self tableView] setScrollIndicatorInsets:e];
+	[[self tableView] setContentInset:e];	
+}
+
+static NSString *intro = @"Demonstrates fetching a web page synchronously, the HTML source will appear in the box below when the download is complete.  The interface will lock up when you press this button until the operation times out or succeeds. You should avoid using synchronous requests on the main thread, even for the simplest operations.";
+
+- (UITableViewCell *)tableView:(UITableView *)theTableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+	UITableViewCell *cell;
+	if ([indexPath section] == 0) {
+		cell = [InfoCell cellWithDescription:intro];
+	} else if ([indexPath section] == 3) {
+		cell = [tableView dequeueReusableCellWithIdentifier:@"HeaderCell"];
+		if (!cell) {
+			cell = [DetailCell cell];
+		}
+	} else {
+		cell = [tableView dequeueReusableCellWithIdentifier:@"MyCell"];
+		if (!cell) {
+			cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:@"MyCell"] autorelease];
+		}	
 	}
 	}
+	[cell setSelectionStyle:UITableViewCellSelectionStyleNone];
+	NSString *key;
+
+	int tablePadding = 40;
+	int tableWidth = [tableView frame].size.width;
+	if (tableWidth > 480) { // iPad
+		tablePadding = 110;
+	}
+	
+	switch ([indexPath section]) {
+		case 1:
+			urlField = [[[UITextField alloc] initWithFrame:CGRectMake(10,12,tableWidth-tablePadding-40,20)] autorelease];
+			if ([self request]) {
+				[urlField setText:[[[self request] url] absoluteString]];
+			} else {
+				[urlField setText:@"http://allseeing-i.com"];
+			}
+			UIButton *goButton = [UIButton buttonWithType:UIButtonTypeRoundedRect];
+			[goButton setFrame:CGRectMake(tableWidth-tablePadding-38,7,20,20)];
+			[goButton setTitle:@"Go!" forState:UIControlStateNormal];
+			[goButton sizeToFit];
+			[goButton addTarget:self action:@selector(simpleURLFetch:) forControlEvents:UIControlEventTouchUpInside];
+			[[cell contentView] addSubview:goButton];
+			[[cell contentView] addSubview:urlField];
+			break;
+		case 2:
+
+			responseField = [[[UITextView alloc] initWithFrame:CGRectMake(5,5,tableWidth-tablePadding,150)] autorelease];
+			[responseField setBackgroundColor:[UIColor clearColor]];
+			[[cell contentView] addSubview:responseField];
+			if (request) {
+				if ([request error]) {
+					[responseField setText:[[request error] localizedDescription]];
+				} else if ([request responseString]) {
+					[responseField setText:[request responseString]];
+				}
+			}
+			break;
+		case 3:
+			key = [[[request responseHeaders] allKeys] objectAtIndex:[indexPath row]];
+			[[cell textLabel] setText:key];
+			[[cell detailTextLabel] setText:[[request responseHeaders] objectForKey:key]];
+			break;
+	}
+	return cell;
+}
+
+- (NSInteger)tableView:(UITableView *)theTableView numberOfRowsInSection:(NSInteger)section
+{
+	if (section == 3) {
+		return [[request responseHeaders] count];
+	} else {
+		return 1;
+	}
+}
+
+- (CGFloat)tableView:(UITableView *)theTableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+	if ([indexPath section] == 0) {
+		return [InfoCell neededHeightForDescription:intro withTableWidth:[tableView frame].size.width]+20;
+	} else if ([indexPath section] == 1) {
+		return 48;
+	} else if ([indexPath section] == 2) {
+		return 160;
+	} else {
+		return 34;
+	}
+}
+
+- (NSString *)tableView:(UITableView *)theTableView titleForHeaderInSection:(NSInteger)section
+{
+	switch (section) {
+		case 0:
+			return nil;
+		case 1:
+			return @"Enter a URL";
+		case 2:
+			return @"Response";
+		case 3:
+			return @"Response Headers";
+	}
+	return nil;
 }
 }
 
 
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
+{
+	if ([self request]) {
+		return 4;
+	} else {
+		return 2;
+	}
+}
+
+
+@synthesize request;
 
 
 @end
 @end

+//
+//  ToggleCell.h
+//  Part of the ASIHTTPRequest sample project - see http://allseeing-i.com/ASIHTTPRequest for details
+//
+//  Created by Ben Copsey on 17/06/2010.
+//  Copyright 2010 All-Seeing Interactive. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+
+@interface ToggleCell : UITableViewCell {
+	UISwitch *toggle;
+}
++ (id)cell;
+
+@property (assign, nonatomic) UISwitch *toggle;
+@end

+//
+//  ToggleCell.m
+//  Part of the ASIHTTPRequest sample project - see http://allseeing-i.com/ASIHTTPRequest for details
+//
+//  Created by Ben Copsey on 17/06/2010.
+//  Copyright 2010 All-Seeing Interactive. All rights reserved.
+//
+
+#import "ToggleCell.h"
+
+
+@implementation ToggleCell
+
++ (id)cell
+{
+	ToggleCell *cell = [[[ToggleCell alloc] initWithStyle:UITableViewCellStyleValue1 reuseIdentifier:@"ToggleCell"] autorelease];
+	[[cell textLabel] setTextAlignment:UITextAlignmentLeft];
+	[cell setToggle:[[[UISwitch alloc] initWithFrame:CGRectMake(0,0,20,20)] autorelease]];
+	[cell setAccessoryView:[cell toggle]];
+	return cell;
+}
+
+@synthesize toggle;
+@end

 //
 //
 //  UploadViewController.h
 //  UploadViewController.h
-//  asi-http-request
+//  Part of the ASIHTTPRequest sample project - see http://allseeing-i.com/ASIHTTPRequest for details
 //
 //
 //  Created by Ben Copsey on 31/12/2008.
 //  Created by Ben Copsey on 31/12/2008.
 //  Copyright 2008 All-Seeing Interactive. All rights reserved.
 //  Copyright 2008 All-Seeing Interactive. All rights reserved.
 //
 //
 
 
 #import <UIKit/UIKit.h>
 #import <UIKit/UIKit.h>
+#import "SampleViewController.h"
+@class ASIFormDataRequest;
 
 
-@class ASINetworkQueue;
-
-@interface UploadViewController : UIViewController {
-	ASINetworkQueue *networkQueue;
+@interface UploadViewController : SampleViewController {
+	
+	ASIFormDataRequest *request;
+	
 	IBOutlet UIProgressView *progressIndicator;
 	IBOutlet UIProgressView *progressIndicator;
+	UITextView *resultView;
 }
 }
 
 
 - (IBAction)performLargeUpload:(id)sender;
 - (IBAction)performLargeUpload:(id)sender;
 - (IBAction)toggleThrottling:(id)sender;
 - (IBAction)toggleThrottling:(id)sender;
+
+@property (retain, nonatomic) ASIFormDataRequest *request;
 @end
 @end

 //
 //
 //  UploadViewController.m
 //  UploadViewController.m
-//  asi-http-request
+//  Part of the ASIHTTPRequest sample project - see http://allseeing-i.com/ASIHTTPRequest for details
 //
 //
 //  Created by Ben Copsey on 31/12/2008.
 //  Created by Ben Copsey on 31/12/2008.
 //  Copyright 2008 All-Seeing Interactive. All rights reserved.
 //  Copyright 2008 All-Seeing Interactive. All rights reserved.
@@ -8,28 +8,22 @@
 
 
 #import "UploadViewController.h"
 #import "UploadViewController.h"
 #import "ASIFormDataRequest.h"
 #import "ASIFormDataRequest.h"
-#import "ASINetworkQueue.h"
+#import "InfoCell.h"
 
 
 @implementation UploadViewController
 @implementation UploadViewController
 
 
-
-- (void)awakeFromNib
-{
-	networkQueue = [[ASINetworkQueue alloc] init];
-}
-
 - (IBAction)performLargeUpload:(id)sender
 - (IBAction)performLargeUpload:(id)sender
 {
 {
-	[networkQueue cancelAllOperations];
-	[networkQueue setShowAccurateProgress:YES];
-	[networkQueue setUploadProgressDelegate:progressIndicator];
-	[networkQueue setDelegate:self];
-	
-	ASIFormDataRequest *request = [[[ASIFormDataRequest alloc] initWithURL:[NSURL URLWithString:@"http://allseeing-i.com/ignore"]] autorelease];
+	[request cancel];
+	[self setRequest:[ASIFormDataRequest requestWithURL:[NSURL URLWithString:@"http://allseeing-i.com/ignore"]]];
 	[request setPostValue:@"test" forKey:@"value1"];
 	[request setPostValue:@"test" forKey:@"value1"];
 	[request setPostValue:@"test" forKey:@"value2"];
 	[request setPostValue:@"test" forKey:@"value2"];
 	[request setPostValue:@"test" forKey:@"value3"];
 	[request setPostValue:@"test" forKey:@"value3"];
 	[request setTimeOutSeconds:20];
 	[request setTimeOutSeconds:20];
+	[request setUploadProgressDelegate:progressIndicator];
+	[request setDelegate:self];
+	[request setDidFailSelector:@selector(uploadFailed:)];
+	[request setDidFinishSelector:@selector(uploadFinished:)];
 	
 	
 	//Create a 256KB file
 	//Create a 256KB file
 	NSData *data = [[[NSMutableData alloc] initWithLength:256*1024] autorelease];
 	NSData *data = [[[NSMutableData alloc] initWithLength:256*1024] autorelease];
@@ -42,8 +36,8 @@
 		[request setFile:path forKey:[NSString stringWithFormat:@"file-%hi",i]];
 		[request setFile:path forKey:[NSString stringWithFormat:@"file-%hi",i]];
 	}
 	}
 	
 	
-	[networkQueue addOperation:request];
-	[networkQueue go];
+	[request startAsynchronous];
+	[resultView setText:@"Uploading data..."];
 }
 }
 
 
 - (IBAction)toggleThrottling:(id)sender
 - (IBAction)toggleThrottling:(id)sender
@@ -51,9 +45,122 @@
 	[ASIHTTPRequest setShouldThrottleBandwidthForWWAN:[(UISwitch *)sender isOn]];
 	[ASIHTTPRequest setShouldThrottleBandwidthForWWAN:[(UISwitch *)sender isOn]];
 }
 }
 
 
-- (void)dealloc {
-	[networkQueue release];
+- (void)uploadFailed:(ASIHTTPRequest *)theRequest
+{
+	[resultView setText:[NSString stringWithFormat:@"Request failed:\r\n%@",[[theRequest error] localizedDescription]]];
+}
+
+- (void)uploadFinished:(ASIHTTPRequest *)theRequest
+{
+	[resultView setText:[NSString stringWithFormat:@"Finished uploading %llu bytes of data",[theRequest postLength]]];
+}
+
+- (void)dealloc
+{
+	[request cancel];
+	[request release];
     [super dealloc];
     [super dealloc];
 }
 }
 
 
+/*
+ Most of the code below here relates to the table view, and isn't that interesting
+ */
+
+- (void)viewDidLoad
+{
+	[[[self navigationBar] topItem] setTitle:@"Tracking Upload Progress"];
+}
+
+static NSString *intro = @"Demonstrates POSTing content to a URL, showing upload progress.\nYou'll only see accurate progress for uploads when the request body is larger than 128KB (in 2.2.1 SDK), or when the request body is larger than 32KB (in 3.0 SDK)";
+
+- (UIView *)tableView:(UITableView *)theTableView viewForHeaderInSection:(NSInteger)section
+{
+	if (section == 1) {
+		int tablePadding = 40;
+		int tableWidth = [tableView frame].size.width;
+		if (tableWidth > 480) { // iPad
+			tablePadding = 110;
+		}
+		
+		UIView *view = [[[UIView alloc] initWithFrame:CGRectMake(0,0,tableWidth-(tablePadding/2),30)] autorelease];
+		UIButton *goButton = [UIButton buttonWithType:UIButtonTypeRoundedRect];
+		[goButton setTitle:@"Go!" forState:UIControlStateNormal];
+		[goButton sizeToFit];
+		[goButton setFrame:CGRectMake([view frame].size.width-[goButton frame].size.width+10,7,[goButton frame].size.width,[goButton frame].size.height)];
+		
+		[goButton addTarget:self action:@selector(performLargeUpload:) forControlEvents:UIControlEventTouchUpInside];
+		[view addSubview:goButton];
+		
+		progressIndicator = [[[UIProgressView alloc] initWithFrame:CGRectMake((tablePadding/2)-10,20,200,10)] autorelease];
+		[view addSubview:progressIndicator];
+		
+		return view;
+	}
+	return nil;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)theTableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+	UITableViewCell *cell;
+	if ([indexPath section] == 0) {
+		cell = [InfoCell cellWithDescription:intro];
+	} else {
+		cell = [tableView dequeueReusableCellWithIdentifier:@"MyCell"];
+		if (!cell) {
+			cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:@"MyCell"] autorelease];
+		}	
+	}
+	[cell setSelectionStyle:UITableViewCellSelectionStyleNone];
+	
+	int tablePadding = 40;
+	int tableWidth = [tableView frame].size.width;
+	if (tableWidth > 480) { // iPad
+		tablePadding = 110;
+	}
+	
+	switch ([indexPath section]) {
+
+		case 2:
+			
+			resultView = [[[UITextView alloc] initWithFrame:CGRectMake(5,5,tableWidth-tablePadding,60)] autorelease];
+			[resultView setBackgroundColor:[UIColor clearColor]];
+			[[cell contentView] addSubview:resultView];
+			break;
+	}
+	return cell;
+}
+
+- (NSInteger)tableView:(UITableView *)theTableView numberOfRowsInSection:(NSInteger)section
+{
+	if (section == 1) {
+		return 0;
+	}
+	return 1;
+}
+
+- (CGFloat)tableView:(UITableView *)theTableView heightForHeaderInSection:(NSInteger)section
+{
+	if (section == 1) {
+		return 50;
+	}
+	return 34;
+}
+
+- (CGFloat)tableView:(UITableView *)theTableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+	if ([indexPath section] == 0) {
+		return [InfoCell neededHeightForDescription:intro withTableWidth:[tableView frame].size.width]+20;
+	} else if ([indexPath section] == 2) {
+		return 80;
+	} else {
+		return 42;
+	}
+}
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
+{
+	return 3;
+}
+
+@synthesize request;
 @end
 @end

@@ -4,12 +4,14 @@
 <dict>
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<string>English</string>
+	<key>CFBundleDisplayName</key>
+	<string>ASIHTTPRequest Demo</string>
 	<key>CFBundleExecutable</key>
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIconFile</key>
 	<key>CFBundleIconFile</key>
 	<string>iphone-icon.png</string>
 	<string>iphone-icon.png</string>
 	<key>CFBundleIdentifier</key>
 	<key>CFBundleIdentifier</key>
-	<string>com.allseeinginteractive.asihttprequest.sample</string>
+	<string>com.allseeinginteractive.asihttprequest.ipad.sample</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>
 	<key>CFBundlePackageType</key>
@@ -19,8 +21,6 @@
 	<key>CFBundleVersion</key>
 	<key>CFBundleVersion</key>
 	<string>1.0</string>
 	<string>1.0</string>
 	<key>NSMainNibFile</key>
 	<key>NSMainNibFile</key>
-	<string>MainWindow</string>
-	<key>CFBundleDisplayName</key>
-	<string>ASIHTTPRequest Demo</string>
+	<string>iPadMainWindow</string>
 </dict>
 </dict>
 </plist>
 </plist>

+//
+//  iPadSampleAppDelegate.h
+//  Part of the ASIHTTPRequest sample project - see http://allseeing-i.com/ASIHTTPRequest for details
+//
+//  Created by Ben Copsey on 15/06/2010.
+//  Copyright 2010 All-Seeing Interactive. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface iPadSampleAppDelegate : NSObject <UIApplicationDelegate> {
+    UIWindow *window;
+	UISplitViewController *splitViewController;
+}
+
+@property (nonatomic, retain) IBOutlet UIWindow *window;
+@property (nonatomic, retain) IBOutlet UISplitViewController *splitViewController;
+
+@end

+//
+//  iPadSampleAppDelegate.m
+//  Part of the ASIHTTPRequest sample project - see http://allseeing-i.com/ASIHTTPRequest for details
+//
+//  Created by Ben Copsey on 15/06/2010.
+//  Copyright 2010 All-Seeing Interactive. All rights reserved.
+//
+
+#import "iPadSampleAppDelegate.h"
+
+@implementation iPadSampleAppDelegate
+
+- (void)applicationDidFinishLaunching:(UIApplication *)application
+{
+	[window addSubview:[splitViewController view]];
+	[window makeKeyAndVisible];
+}
+
+- (void)dealloc {
+    [splitViewController release];
+    [window release];
+    [super dealloc];
+}
+
+
+@synthesize window;
+@synthesize splitViewController;
+@end

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleDisplayName</key>
+	<string>ASIHTTPRequest Demo</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIconFile</key>
+	<string>iphone-icon.png</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.allseeinginteractive.asihttprequest.iphone.sample</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>NSMainNibFile</key>
+	<string>iPhoneMainWindow</string>
+</dict>
+</plist>

 //
 //
 //  iPhoneSampleAppDelegate.h
 //  iPhoneSampleAppDelegate.h
-//  asi-http-request
+//  Part of the ASIHTTPRequest sample project - see http://allseeing-i.com/ASIHTTPRequest for details
 //
 //
 //  Created by Ben Copsey on 07/11/2008.
 //  Created by Ben Copsey on 07/11/2008.
 //  Copyright All-Seeing Interactive 2008. All rights reserved.
 //  Copyright All-Seeing Interactive 2008. All rights reserved.
@@ -15,7 +15,6 @@
 
 
 }
 }
 
 
-
 @property (nonatomic, retain) IBOutlet UIWindow *window;
 @property (nonatomic, retain) IBOutlet UIWindow *window;
 @property (nonatomic, retain) IBOutlet UITabBarController *tabBarController;
 @property (nonatomic, retain) IBOutlet UITabBarController *tabBarController;
 
 

 //
 //
 //  iPhoneSampleAppDelegate.m
 //  iPhoneSampleAppDelegate.m
-//  asi-http-request
+//  Part of the ASIHTTPRequest sample project - see http://allseeing-i.com/ASIHTTPRequest for details
 //
 //
 //  Created by Ben Copsey on 07/11/2008.
 //  Created by Ben Copsey on 07/11/2008.
 //  Copyright All-Seeing Interactive 2008. All rights reserved.
 //  Copyright All-Seeing Interactive 2008. All rights reserved.
@@ -12,12 +12,8 @@
 
 
 @implementation iPhoneSampleAppDelegate
 @implementation iPhoneSampleAppDelegate
 
 
-@synthesize window;
-@synthesize tabBarController;
-
-
-
-- (void)dealloc {
+- (void)dealloc
+{
     [tabBarController release];
     [tabBarController release];
     [window release];
     [window release];
     [super dealloc];
     [super dealloc];
@@ -26,7 +22,7 @@
 - (void)applicationDidFinishLaunching:(UIApplication *)application {
 - (void)applicationDidFinishLaunching:(UIApplication *)application {
     // Add the tab bar controller's current view as a subview of the window
     // Add the tab bar controller's current view as a subview of the window
     [window addSubview:[tabBarController view]];
     [window addSubview:[tabBarController view]];
-	[[tabBarController view] setFrame:CGRectMake(0,47,320,433)];
+	[[tabBarController view] setFrame:CGRectMake(0,42,320,438)];
 	[NSTimer scheduledTimerWithTimeInterval:1.0 target:self selector:@selector(updateStatus:) userInfo:nil repeats:YES];
 	[NSTimer scheduledTimerWithTimeInterval:1.0 target:self selector:@selector(updateStatus:) userInfo:nil repeats:YES];
 }
 }
 
 
@@ -47,5 +43,8 @@
 }
 }
 
 
 
 
+@synthesize window;
+@synthesize tabBarController;
+
 @end
 @end
 
 

 //
 //
 //  main.m
 //  main.m
-//  iPhone
+//  Part of the ASIHTTPRequest sample project - see http://allseeing-i.com/ASIHTTPRequest for details
 //
 //
 //  Created by Ben Copsey on 22/03/2009.
 //  Created by Ben Copsey on 22/03/2009.
 //  Copyright All-Seeing Interactive 2009. All rights reserved.
 //  Copyright All-Seeing Interactive 2009. All rights reserved.