Merge lp:~urbanape/ubuntuone-ios-client/2.0-14-prerelease into lp:ubuntuone-ios-client

[Zachery Bir]

This branch keeps the alerts coming (dismissed once with "Remind Me", dismissed permanently with "Dismiss").

[Jason Foreman (threeve)]

Looks good

review: Approve

=== modified file 'musicstreaming/iSub-Info.plist'
--- musicstreaming/iSub-Info.plist	2011-06-21 18:51:39 +0000
+++ musicstreaming/iSub-Info.plist	2011-06-22 19:26:01 +0000
@@ -41,7 +41,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>11</string>
+	<string>14</string>
 	<key>LSRequiresIPhoneOS</key>
 	<false/>
 	<key>NSMainNibFile</key>

=== modified file 'musicstreaming/iSub.xcodeproj/project.pbxproj'
--- musicstreaming/iSub.xcodeproj/project.pbxproj	2011-06-21 17:04:19 +0000
+++ musicstreaming/iSub.xcodeproj/project.pbxproj	2011-06-22 19:26:01 +0000
@@ -59,6 +59,8 @@
 		91BE4018138E8D2300D44D68 /* UIActionSheet+Blocks.m in Sources */ = {isa = PBXBuildFile; fileRef = 91BE4015138E8D2300D44D68 /* UIActionSheet+Blocks.m */; };
 		91BE4019138E8D2300D44D68 /* UIAlertView+Blocks.m in Sources */ = {isa = PBXBuildFile; fileRef = 91BE4017138E8D2300D44D68 /* UIAlertView+Blocks.m */; };
 		91BE401C138E8D3A00D44D68 /* RIButtonItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 91BE401B138E8D3A00D44D68 /* RIButtonItem.m */; };
+		91D18DAB13B228D3001BEB42 /* uncached-disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = 91D18DA913B228D3001BEB42 /* uncached-disabled.png */; };
+		91D18DAC13B228D3001BEB42 /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 91D18DAA13B228D3001BEB42 /* [e-mail] */; };
 		91E0778913ABAD6200AA7CB2 /* PlaylistSongIndex.m in Sources */ = {isa = PBXBuildFile; fileRef = 91E0778813ABAD6200AA7CB2 /* PlaylistSongIndex.m */; };
 		91E88609132DA82000618994 /* PlaylistParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 91E88608132DA82000618994 /* PlaylistParser.m */; };
 		9316628812264A74003B0EB7 /* NSDate+Extras.m in Sources */ = {isa = PBXBuildFile; fileRef = 9316628712264A74003B0EB7 /* NSDate+Extras.m */; };
@@ -221,6 +223,8 @@
 		91BE4017138E8D2300D44D68 /* UIAlertView+Blocks.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIAlertView+Blocks.m"; sourceTree = "<group>"; };
 		91BE401A138E8D3A00D44D68 /* RIButtonItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RIButtonItem.h; sourceTree = "<group>"; };
 		91BE401B138E8D3A00D44D68 /* RIButtonItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RIButtonItem.m; sourceTree = "<group>"; };
+		91D18DA913B228D3001BEB42 /* uncached-disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "uncached-disabled.png"; sourceTree = "<group>"; };
+		91D18DAA13B228D3001BEB42 /* [e-mail] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[e-mail]"; sourceTree = "<group>"; };
 		91E0778713ABAD6100AA7CB2 /* PlaylistSongIndex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlaylistSongIndex.h; sourceTree = "<group>"; };
 		91E0778813ABAD6200AA7CB2 /* PlaylistSongIndex.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PlaylistSongIndex.m; sourceTree = "<group>"; };
 		91E88607132DA82000618994 /* PlaylistParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlaylistParser.h; sourceTree = "<group>"; };
@@ -420,6 +424,8 @@
 				91406E9113849F2400A7DA67 /* [e-mail] */,
 				91406E9213849F2400A7DA67 /* uncached.png */,
 				91406E9313849F2400A7DA67 /* [e-mail] */,
+				91D18DA913B228D3001BEB42 /* uncached-disabled.png */,
+				91D18DAA13B228D3001BEB42 /* [e-mail] */,
 				5305C2051157F4F800BC78F0 /* Default.png */,
 				932E7A6D1254747E00E7C8FF /* [e-mail] */,
 				93D6B50B1252CA71007880B0 /* music_57.png */,
@@ -833,6 +839,8 @@
 				91406E9713849F2400A7DA67 /* [e-mail] in Resources */,
 				91406E9813849F2400A7DA67 /* uncached.png in Resources */,
 				91406E9913849F2400A7DA67 /* [e-mail] in Resources */,
+				91D18DAB13B228D3001BEB42 /* uncached-disabled.png in Resources */,
+				91D18DAC13B228D3001BEB42 /* [e-mail] in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

=== added file 'musicstreaming/uncached-disabled.png'
Binary files musicstreaming/uncached-disabled.png	1970-01-01 00:00:00 +0000 and musicstreaming/uncached-disabled.png	2011-06-22 19:26:01 +0000 differ
=== added file 'musicstreaming/[e-mail]'
Binary files musicstreaming/[e-mail]	1970-01-01 00:00:00 +0000 and musicstreaming/[e-mail]	2011-06-22 19:26:01 +0000 differ
=== modified file 'musicstreaming/view_controllers/AlbumViewController.m'
--- musicstreaming/view_controllers/AlbumViewController.m	2011-06-16 19:12:54 +0000
+++ musicstreaming/view_controllers/AlbumViewController.m	2011-06-22 19:26:01 +0000
@@ -27,6 +27,8 @@
 #import "NSDate+Extras.h"
 #import "StreamingPlayer.h"
 #import "Downloader.h"
+#import "UIAlertView+Blocks.h"
+#import "RIButtonItem.h"
 
 @interface AlbumViewController (Private)
 - (void)setupHeaderAndFooter;
@@ -141,7 +143,7 @@
 	Song *song = [self.songs objectAtIndex:indexPath.row];
 	
     // explicitly re-set the default state of the button/spinner
-    [cell.cacheButton setImage:[UIImage imageNamed:@"uncached"] forState:UIControlStateNormal];
+    [cell.cacheButton setImage:(canCache ? [UIImage imageNamed:@"uncached"] : [UIImage imageNamed:@"uncached-disabled"]) forState:UIControlStateNormal];
     [cell.spinner stopAnimating];
     
     cell.cacheButton.tag = indexPath.row;
@@ -179,7 +181,6 @@
 	}
 	
 	cell.evenRow = (0 == indexPath.row % 2);
-	[cell.cacheButton setEnabled:canCache];
 	if (song.cachedSongPath == nil && !canStream)
 	{
 		cell.songNameLabel.textColor = [UIColor lightGrayColor];
@@ -270,7 +271,6 @@
 - (void)toggleCacheForSong:(id)sender
 {
     // This is a binary toggle, and right now, we don't bother trying to cancel a download in progress.
-    
     int row = [(UIButton *)sender tag];
 
 	NSIndexPath *songPath = [NSIndexPath indexPathForRow:row inSection:0];
@@ -292,16 +292,42 @@
         }
         else
         {
-            [cell.spinner startAnimating];
-            [[Downloader sharedDownloader] downloadFile:[[Subsonic sharedSubsonic] getStreamingURLForSongId:song.songId] withName:song.songId completionBlock:^(NSString *path) {
-				dispatch_async(dispatch_get_main_queue(), ^(void) {
-					song.cachedSongPath = path;
-					SaveContext();
-					SongUITableViewCell *cell = (SongUITableViewCell *)[self.tableView cellForRowAtIndexPath:songPath];
-					[cell.spinner stopAnimating];
-					[cell.cacheButton setImage:[UIImage imageNamed:@"cached"] forState:UIControlStateNormal];
-				});
-			}];
+			if (canCache)
+			{
+				[cell.spinner startAnimating];
+				[[Downloader sharedDownloader] downloadFile:[[Subsonic sharedSubsonic] getStreamingURLForSongId:song.songId] withName:song.songId completionBlock:^(NSString *path) {
+					dispatch_async(dispatch_get_main_queue(), ^(void) {
+						song.cachedSongPath = path;
+						SaveContext();
+						SongUITableViewCell *cell = (SongUITableViewCell *)[self.tableView cellForRowAtIndexPath:songPath];
+						[cell.spinner stopAnimating];
+						[cell.cacheButton setImage:[UIImage imageNamed:@"cached"] forState:UIControlStateNormal];
+					});
+				}];
+			}
+			else
+			{
+				NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+				if (![defaults boolForKey:@"acknowledged-no-cache-on-3g"])
+				{
+					RIButtonItem *cancelButton = [RIButtonItem item];
+					cancelButton.label = NSLocalizedString(@"Remind Me", @"");
+
+					RIButtonItem *dismissButton = [RIButtonItem item];
+					dismissButton.label = NSLocalizedString(@"Dismiss", @"");
+					dismissButton.action = ^
+					{
+						[defaults setBool:YES forKey:@"acknowledged-no-cache-on-3g"];
+					};
+
+					UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Caching Disabled", @"")
+																		message:NSLocalizedString(@"Caching songs can only be done on WiFi networks.", @"")
+															   cancelButtonItem:cancelButton otherButtonItems:dismissButton, nil];
+					[alertView show];
+					[alertView release];
+
+				}
+			}
         }
     }
 }
@@ -377,4 +403,4 @@
 	[bigFooterView release];
 }
 
-@end
\ No newline at end of file
+@end

=== modified file 'musicstreaming/view_controllers/PlaylistEditAlbumViewController.m'
--- musicstreaming/view_controllers/PlaylistEditAlbumViewController.m	2011-06-21 17:04:19 +0000
+++ musicstreaming/view_controllers/PlaylistEditAlbumViewController.m	2011-06-22 19:26:01 +0000
@@ -49,7 +49,10 @@
 	{
 		cell = [[[PlaylistEditSongUITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:SongCellIdentifier] autorelease];
 	}
-	
+
+	// explicitly re-set the default state of the checkmark
+	cell.accessoryType = UITableViewCellAccessoryNone;
+
 	Song *song = [self.songs objectAtIndex:indexPath.row];
 	
 	cell.songNameLabel.text = song.title;

=== modified file 'musicstreaming/view_controllers/PlaylistEditSongListViewController.m'
--- musicstreaming/view_controllers/PlaylistEditSongListViewController.m	2011-06-18 02:04:11 +0000
+++ musicstreaming/view_controllers/PlaylistEditSongListViewController.m	2011-06-22 19:26:01 +0000
@@ -51,6 +51,9 @@
 		cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleSubtitle reuseIdentifier:CellIdentifier] autorelease];
 	}
 	
+	// explicitly re-set the default state of the checkmark
+	cell.accessoryType = UITableViewCellAccessoryNone;
+	
     Song *s = nil;
     
 	if (self.searchDisplayController.searchResultsTableView == tableView)

=== modified file 'musicstreaming/view_controllers/SubsonicIndexedTableViewController.m'
--- musicstreaming/view_controllers/SubsonicIndexedTableViewController.m	2011-05-27 18:31:56 +0000
+++ musicstreaming/view_controllers/SubsonicIndexedTableViewController.m	2011-06-22 19:26:01 +0000
@@ -34,14 +34,6 @@
     return self;
 }
 
-- (void)didReceiveMemoryWarning
-{
-    [super didReceiveMemoryWarning];
-	
-	self.indexes = NULL;
-	self.groupedTableData = NULL;
-}
-
 - (void)dealloc
 {
 	self.indexes = NULL;
@@ -51,6 +43,14 @@
 	[super dealloc];
 }
 
+- (void)viewDidUnload
+{
+	self.indexes = nil;
+	self.groupedTableData = [NSMutableDictionary dictionary];
+
+	[super viewDidUnload];
+}
+
 #pragma mark -
 #pragma mark Notifications