Merge lp:~rockstar/ubuntuone-ios-music/dial-down into lp:~ubuntuone-ios-client-team/ubuntuone-ios-music/moriarty

[Paul Hummer]

This branch adds the core data support to the ancilliary views that are dialed
down to through selection. It also warranted an upgrade to Core Data so that
we could only fetch when absolutely necessary. I *think* this is likely to be
the last big branch. Sorry it's so big.

[Michał Karnicki (karni)]

if ([error code] == 2) { // Network is down.
-- just nitpicking: a constant instead of comment would be better

int interval = -(60*60*24*5); // 5 days ago
-- this update interval feels arbitrary to me. How do we know that I haven't purchased a music album today?

Couple of lines moved in PlaylistsViewController.m
-- there was no change intentionally, right? I understand you just found a better place for that snippet.

Would it be difficult to add at least some basic tests exercising the updated Core Data model?

I noticed you've set 'Ubuntu One iOS Client Team' as the reviewer. I think you could go with Ubuntu One Client Engineering, I've already dumped the Android equivalent, as we basically became two one-manned sub-teams of Client Engineering after the re-org :)

review: Approve

=== modified file 'Music/AppDelegate.m'
--- Music/AppDelegate.m	2013-01-02 23:49:22 +0000
+++ Music/AppDelegate.m	2013-01-02 23:49:23 +0000
@@ -37,7 +37,6 @@
 @synthesize storyboard = _storyboard;
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
-    [self initRestKit];
 
     self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
     
@@ -164,6 +163,12 @@
     return _persistentStoreCoordinator;
 }
 
+#pragma mark - Convenience methods
+
++ (AppDelegate *)delegate {
+    return (AppDelegate *)[UIApplication sharedApplication].delegate;
+}
+
 #pragma mark - Application's Documents directory
 
 // Returns the URL to the application's Documents directory.
@@ -180,34 +185,4 @@
     [self.window makeKeyAndVisible];
 }
 
-#pragma mark - Convenience methods
-
-+ (AppDelegate *)delegate {
-    return (AppDelegate *)[UIApplication sharedApplication].delegate;
-}
-
-#pragma mark - Private methods
-
-- (void)initRestKit {
-    NSDictionary *credentials = [[UOAuthManager sharedAuthManager] oauthCredentials];
-    RKURL *baseURL = [RKURL URLWithBaseURLString:@"https://one.ubuntu.com/api/music/v2"];
-    
-    RKObjectManager *objectManager = [RKObjectManager objectManagerWithBaseURL:baseURL];
-    objectManager.client.baseURL = baseURL;
-    objectManager.client.OAuth1ConsumerKey = [credentials objectForKey:UOOAuthConsumerKey];
-    objectManager.client.OAuth1ConsumerSecret = [credentials objectForKey:UOOAuthConsumerSecret];
-    objectManager.client.OAuth1AccessToken = [credentials objectForKey:UOOAuthToken];
-    objectManager.client.OAuth1AccessTokenSecret = [credentials objectForKey:UOOAuthTokenSecret];
-    objectManager.client.authenticationType = RKRequestAuthenticationTypeOAuth1;
-    static NSString *DatabaseName = @"UOMusic.sql";
-    
-    RKManagedObjectStore *objectStore = [RKManagedObjectStore objectStoreWithStoreFilename:DatabaseName];
-    objectManager.objectStore = objectStore;
-    
-    [Album registerMapping];
-    [Artist registerMapping];
-    [Playlist registerMapping];
-    [Song registerMapping];
-}
-
 @end

=== removed file 'Music/Categories/RKRequest+Plaintext.h'
--- Music/Categories/RKRequest+Plaintext.h	2012-12-07 22:39:22 +0000
+++ Music/Categories/RKRequest+Plaintext.h	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-//
-//  RKRequest+Plaintext.h
-//  U1Music
-//
-//  Created by Paul Hummer on 10/5/12.
-//  Copyright (c) 2012 Canonical. All rights reserved.
-//
-
-#import <RestKit/RestKit.h>
-
-@interface RKRequest (Plaintext)
-
-@end

=== removed file 'Music/Categories/RKRequest+Plaintext.m'
--- Music/Categories/RKRequest+Plaintext.m	2012-12-07 22:39:22 +0000
+++ Music/Categories/RKRequest+Plaintext.m	1970-01-01 00:00:00 +0000
@@ -1,55 +0,0 @@
-//
-//  RKRequest+Plaintext.m
-//  U1Music
-//
-//  Created by Paul Hummer on 10/5/12.
-//  Copyright (c) 2012 Canonical. All rights reserved.
-//
-
-#import <RestKit/RestKit.h>
-#import "RKRequest+Plaintext.h"
-#import "UOAuthManager.h"
-
-@implementation RKRequest (Plaintext)
-
-/* rockstar: 5 Oct 2012 - This is as copy/pasted as I could possibly get.  It's a hack, and
-   I'm so very very sorry. The fact remains that Ubuntu One doesn't currently support the
-   HMAC-SHA1 signature method, and RestKit's oauth library doesn't support Plaintext. I'm going
-   to work towards getting Plaintext support into RestKit.
- */
-- (void)addHeadersToRequest
-{
-    NSString *header = nil;
-    for (header in self.additionalHTTPHeaders) {
-        [self.URLRequest setValue:[self.additionalHTTPHeaders valueForKey:header] forHTTPHeaderField:header];
-    }
-    
-    [self.URLRequest setValue:nil forHTTPHeaderField:@"Content-Length"];
-    
-    /* This is the specific part that needs to be overridden. The OAuth2 stuff has been removed,
-       and since we know that we're using OAuth, we don't check against it.
-     */
-    NSURLRequest *echo = nil;
-    
-    // use the suitable parameters dict
-    NSDictionary *parameters = nil;
-    if ([self.params isKindOfClass:[RKParams class]])
-        parameters = [(RKParams *)self.params dictionaryOfPlainTextParams];
-    else
-        parameters = [self.URL queryParameters];
-    
-    echo = [UOAuthManager oauthRequestForPath:[self.URL path]];
-    [self.URLRequest setValue:[echo valueForHTTPHeaderField:@"Authorization"] forHTTPHeaderField:@"Authorization"];
-    [self.URLRequest setValue:[echo valueForHTTPHeaderField:@"Accept-Encoding"] forHTTPHeaderField:@"Accept-Encoding"];
-    [self.URLRequest setValue:[echo valueForHTTPHeaderField:@"User-Agent"] forHTTPHeaderField:@"User-Agent"];
-    
-    if (self.cachePolicy & RKRequestCachePolicyEtag) {
-        NSString *etag = [self.cache etagForRequest:self];
-        if (etag) {
-            RKLogTrace(@"Setting If-None-Match header to '%@'", etag);
-            [self.URLRequest setValue:etag forHTTPHeaderField:@"If-None-Match"];
-        }
-    }
-}
-
-@end

=== modified file 'Music/Models/Album.h'
--- Music/Models/Album.h	2013-01-02 23:49:22 +0000
+++ Music/Models/Album.h	2013-01-02 23:49:23 +0000
@@ -24,4 +24,6 @@
 
 @property (nonatomic, retain) NSString *artistId;
 @property (nonatomic, retain, readonly) Artist *artist;
+
+@property (nonatomic, retain) NSSet *songs;
 @end

=== modified file 'Music/Models/Album.m'
--- Music/Models/Album.m	2013-01-02 23:49:22 +0000
+++ Music/Models/Album.m	2013-01-02 23:49:23 +0000
@@ -8,6 +8,7 @@
 
 #import "Album.h"
 #import <RestKit/RestKit.h>
+#import <RestKit/CoreData.h>
 #import "Artist.h"
 #import "NSString+Extras.h"
 
@@ -24,18 +25,21 @@
 @synthesize artistId;
 @dynamic artist;
 
-+ (RKManagedObjectMapping *)objectMapping {
+@dynamic songs;
+
++ (RKEntityMapping *)objectMapping {
     RKObjectManager *manager = [RKObjectManager sharedManager];
     
-    RKManagedObjectMapping *mapping = [RKManagedObjectMapping mappingForClass:[self class] inManagedObjectStore:manager.objectStore];
-    [mapping mapKeyPath:@"id" toAttribute:@"albumId"];
-    [mapping mapKeyPath:@"album_url" toAttribute:@"url"];
-    [mapping mapKeyPath:@"cover_art" toAttribute:@"art"];
-    [mapping mapKeyPath:@"album_art_url" toAttribute:@"artUrl"];
-    [mapping mapKeyPath:@"title" toAttribute:@"title"];
-    [mapping mapKeyPath:@"artist_id" toAttribute:@"artistId"];
-    
-    mapping.primaryKeyAttribute = @"albumId";
+    RKEntityMapping *mapping = [RKEntityMapping mappingForEntityForName:@"Album" inManagedObjectStore:manager.managedObjectStore];
+    [mapping setIdentificationAttributes:@[@"albumId"]];
+    [mapping addAttributeMappingsFromDictionary:@{
+     @"id": @"albumId",
+     @"album_url": @"url",
+     @"cover_art": @"art",
+     @"album_art_url": @"artUrl",
+     @"title": @"title",
+     @"artist_id": @"artistId"
+     }];
     
     return mapping;
 }
@@ -50,7 +54,20 @@
 }
 
 - (void)setArtistId:(NSString *)_artistId {
-    Artist *_artist = [Artist findByPrimaryKey:_artistId inContext:self.managedObjectContext];
+    NSFetchRequest *fetchRequest = [[NSFetchRequest alloc] init];
+    NSEntityDescription *entity = [NSEntityDescription entityForName:@"Artist" inManagedObjectContext:self.managedObjectContext];
+    [fetchRequest setEntity:entity];
+    
+    NSPredicate *predicate = [NSPredicate predicateWithFormat:@"(artistId = %@)", _artistId];
+    [fetchRequest setPredicate:predicate];
+    
+    NSError *error;
+    NSArray *results = [self.managedObjectContext executeFetchRequest:fetchRequest error:&error];
+    if (error || [results count] != 1) {
+        abort();
+    }
+    
+    Artist *_artist = [results objectAtIndex:0];
     [self setPrimitiveValue:_artist forKey:@"artist"];
 }
 

=== modified file 'Music/Models/Artist.m'
--- Music/Models/Artist.m	2013-01-02 23:49:22 +0000
+++ Music/Models/Artist.m	2013-01-02 23:49:23 +0000
@@ -20,16 +20,17 @@
 
 @synthesize index;
 
-+ (RKManagedObjectMapping *)objectMapping {
++ (RKEntityMapping *)objectMapping {
     RKObjectManager *manager = [RKObjectManager sharedManager];
     
-    RKManagedObjectMapping *mapping = [RKManagedObjectMapping mappingForClass:[self class] inManagedObjectStore:manager.objectStore];
-    [mapping mapKeyPath:@"id" toAttribute:@"artistId"];
-    [mapping mapKeyPath:@"artist" toAttribute:@"name"];
-    [mapping mapKeyPath:@"artist_url" toAttribute:@"url"];
-    [mapping mapKeyPath:@"artist_art_url" toAttribute:@"artUrl"];
-    
-    mapping.primaryKeyAttribute = @"artistId";
+    RKEntityMapping *mapping = [RKEntityMapping mappingForEntityForName:@"Artist" inManagedObjectStore:manager.managedObjectStore];
+    [mapping setIdentificationAttributes:@[@"artistId"]];
+    [mapping addAttributeMappingsFromDictionary:@{
+     @"id" : @"artistId",
+     @"artist": @"name",
+     @"artist_url": @"url",
+     @"artist_art_url": @"artUrl",
+     }];
     return mapping;
 }
 

=== modified file 'Music/Models/Playlist.m'
--- Music/Models/Playlist.m	2013-01-02 23:49:22 +0000
+++ Music/Models/Playlist.m	2013-01-02 23:49:23 +0000
@@ -19,16 +19,17 @@
 
 @synthesize index;
 
-+ (RKManagedObjectMapping *)objectMapping {
++ (RKEntityMapping *)objectMapping {
     RKObjectManager *manager = [RKObjectManager sharedManager];
     
-    RKManagedObjectMapping *mapping = [RKManagedObjectMapping mappingForClass:[self class] inManagedObjectStore:manager.objectStore];
-    [mapping mapKeyPath:@"id" toAttribute:@"playlistId"];
-    [mapping mapKeyPath:@"playlist_url" toAttribute:@"url"];
-    [mapping mapKeyPath:@"name" toAttribute:@"title"];
-    [mapping mapKeyPath:@"song_count" toAttribute:@"songCount"];
-    
-    mapping.primaryKeyAttribute = @"playlistId";
+    RKEntityMapping *mapping = [RKEntityMapping mappingForEntityForName:@"Playlist" inManagedObjectStore:manager.managedObjectStore];
+    [mapping setIdentificationAttributes:@[@"playlistId"]];
+    [mapping addAttributeMappingsFromDictionary:@{
+     @"id": @"playlistId",
+     @"playlist_url": @"url",
+     @"name": @"title",
+     @"song_count": @"songCount",
+     }];
     return mapping;
 }
 

=== modified file 'Music/Models/Song.m'
--- Music/Models/Song.m	2013-01-02 23:49:22 +0000
+++ Music/Models/Song.m	2013-01-02 23:49:23 +0000
@@ -33,35 +33,35 @@
 
 @synthesize index;
 
-@synthesize album = _album;
-@synthesize artist = _artist;
-@synthesize albumArtist = _albumArtist;
+@dynamic album;
+@dynamic artist;
+@dynamic albumArtist;
 
-+ (RKManagedObjectMapping *)objectMapping {
++ (RKEntityMapping *)objectMapping {
     RKObjectManager *manager = [RKObjectManager sharedManager];
     
-    RKManagedObjectMapping *mapping = [RKManagedObjectMapping mappingForClass:[self class] inManagedObjectStore:manager.objectStore];
-    
-    [mapping mapKeyPath:@"song_url" toAttribute:@"url"];
-    [mapping mapKeyPath:@"song_art_url" toAttribute:@"artUrl"];
-    [mapping mapKeyPath:@"suffix" toAttribute:@"suffix"];
-    [mapping mapKeyPath:@"track" toAttribute:@"track"];
-    [mapping mapKeyPath:@"title" toAttribute:@"title"];
-    [mapping mapKeyPath:@"album_artist_id" toAttribute:@"albumArtistId"];
-    [mapping mapKeyPath:@"bit_rate" toAttribute:@"bitRate"];
-    [mapping mapKeyPath:@"id" toAttribute:@"songId"];
-    [mapping mapKeyPath:@"duration" toAttribute:@"duration"];
-    [mapping mapKeyPath:@"disc_number" toAttribute:@"discNumber"];
-    [mapping mapKeyPath:@"song_stream_url" toAttribute:@"streamUrl"];
-    [mapping mapKeyPath:@"content_type" toAttribute:@"contentType"];
-    [mapping mapKeyPath:@"year" toAttribute:@"year"];
-    [mapping mapKeyPath:@"genre" toAttribute:@"genre"];
-    [mapping mapKeyPath:@"path" toAttribute:@"path"];
-    [mapping mapKeyPath:@"artist_id" toAttribute:@"artistId"];
-    [mapping mapKeyPath:@"album_id" toAttribute:@"albumId"];
-    [mapping mapKeyPath:@"size" toAttribute:@"size"];
-    
-    mapping.primaryKeyAttribute = @"songId";
+    RKEntityMapping *mapping = [RKEntityMapping mappingForEntityForName:@"Song" inManagedObjectStore:manager.managedObjectStore];
+    [mapping setIdentificationAttributes:@[@"songId"]];
+    [mapping addAttributeMappingsFromDictionary:@{
+     @"song_url": @"url",
+     @"song_art_url": @"artUrl",
+     @"suffix": @"suffix",
+     @"track": @"track",
+     @"title": @"title",
+     @"album_artist_id": @"albumArtistId",
+     @"bit_rate": @"bitRate",
+     @"id": @"songId",
+     @"duration": @"duration",
+     @"disc_number": @"discNumber",
+     @"song_stream_url": @"streamUrl",
+     @"content_type": @"contentType",
+     @"year": @"year",
+     @"genre": @"genre",
+     @"path": @"path",
+     @"artist_id": @"artistId",
+     @"album_id": @"albumId",
+     @"size": @"size"
+     }];
     return mapping;
 }
 
@@ -81,24 +81,66 @@
     return _index;
 }
 
-- (void)setArtistId:(NSString *)artistId {
-    _artist = [Artist findByPrimaryKey:artistId inContext:self.managedObjectContext];
+- (void)setArtistId:(NSString *)_artistId {
+    NSFetchRequest *fetchRequest = [[NSFetchRequest alloc] init];
+    NSEntityDescription *entity = [NSEntityDescription entityForName:@"Artist" inManagedObjectContext:self.managedObjectContext];
+    [fetchRequest setEntity:entity];
+    
+    NSPredicate *predicate = [NSPredicate predicateWithFormat:@"(artistId = %@)", _artistId];
+    [fetchRequest setPredicate:predicate];
+    
+    NSError *error;
+    NSArray *results = [self.managedObjectContext executeFetchRequest:fetchRequest error:&error];
+    if (error || [results count] != 1) {
+        abort();
+    }
+    
+    Artist *_artist = [results objectAtIndex:0];
+    [self setPrimitiveValue:_artist forKey:@"artist"];
 }
 
 - (NSString *)artistId {
     return self.artist.artistId;
 }
 
-- (void)setAlbumId:(NSString *)albumId {
-    _album = [Album findByPrimaryKey:albumId inContext:self.managedObjectContext];
+- (void)setAlbumId:(NSString *)_albumId {
+    NSFetchRequest *fetchRequest = [[NSFetchRequest alloc] init];
+    NSEntityDescription *entity = [NSEntityDescription entityForName:@"Album" inManagedObjectContext:self.managedObjectContext];
+    [fetchRequest setEntity:entity];
+    
+    NSPredicate *predicate = [NSPredicate predicateWithFormat:@"(albumId = %@)", _albumId];
+    [fetchRequest setPredicate:predicate];
+    
+    NSError *error;
+    NSArray *results = [self.managedObjectContext executeFetchRequest:fetchRequest error:&error];
+    if (error || [results count] != 1) {
+        abort();
+    }
+    
+    Artist *_artist = [results objectAtIndex:0];
+    [self setPrimitiveValue:_artist forKey:@"album"];
 }
 
 - (NSString *)albumId {
     return self.album.albumId;
 }
 
-- (void)setAlbumArtistId:(NSString *)albumArtistId {
-    _albumArtist = [Artist findByPrimaryKey:albumArtistId inContext:self.managedObjectContext];
+- (void)setAlbumArtistId:(NSString *)_albumArtistId {
+    NSFetchRequest *fetchRequest = [[NSFetchRequest alloc] init];
+    NSEntityDescription *entity = [NSEntityDescription entityForName:@"Artist" inManagedObjectContext:self.managedObjectContext];
+    [fetchRequest setEntity:entity];
+    
+    NSPredicate *predicate = [NSPredicate predicateWithFormat:@"(artistId = %@)", _albumArtistId];
+    [fetchRequest setPredicate:predicate];
+    
+    NSError *error;
+    NSArray *results = [self.managedObjectContext executeFetchRequest:fetchRequest error:&error];
+    if (error || [results count] != 1) {
+        abort();
+    }
+    
+    Artist *_artist = [results objectAtIndex:0];
+    [self setPrimitiveValue:_artist forKey:@"albumArtist"];
 }
 
 - (NSString *)albumArtistId {

=== modified file 'Music/Models/UOModel.h'
--- Music/Models/UOModel.h	2013-01-02 23:49:22 +0000
+++ Music/Models/UOModel.h	2013-01-02 23:49:23 +0000
@@ -8,10 +8,10 @@
 
 #import <CoreData/CoreData.h>
 
-@class RKManagedObjectMapping;
+@class RKEntityMapping;
 
 @interface UOModel : NSManagedObject
 + (void)registerMapping;
-+ (RKManagedObjectMapping *)objectMapping;
++ (RKEntityMapping *)objectMapping;
 + (NSString *)keyPath;
 @end

=== modified file 'Music/Models/UOModel.m'
--- Music/Models/UOModel.m	2013-01-02 23:49:22 +0000
+++ Music/Models/UOModel.m	2013-01-02 23:49:23 +0000
@@ -13,13 +13,18 @@
 
 + (void)registerMapping {
     RKObjectManager *manager = [RKObjectManager sharedManager];
-    [manager.mappingProvider setMapping:[self objectMapping] forKeyPath:[self keyPath]];
+    
+    RKResponseDescriptor *responseDescriptor = [RKResponseDescriptor responseDescriptorWithMapping:[self objectMapping]
+                                                                                       pathPattern:nil
+                                                                                           keyPath:[self keyPath]
+                                                                                       statusCodes:RKStatusCodeIndexSetForClass(RKStatusCodeClassSuccessful)];
+    [manager addResponseDescriptor:responseDescriptor];
 }
 
-+ (RKManagedObjectMapping *)objectMapping {
++ (RKEntityMapping *)objectMapping {
     RKObjectManager *manager = [RKObjectManager sharedManager];
     
-    RKManagedObjectMapping *mapping = [RKManagedObjectMapping mappingForClass:[self class] inManagedObjectStore:manager.objectStore];
+    RKEntityMapping *mapping = [RKEntityMapping mappingForEntityForName:@"" inManagedObjectStore:manager.managedObjectStore];
     return mapping;
 }
 

=== added file 'Music/Utilities/UOWebServiceController.h'
--- Music/Utilities/UOWebServiceController.h	1970-01-01 00:00:00 +0000
+++ Music/Utilities/UOWebServiceController.h	2013-01-02 23:49:23 +0000
@@ -0,0 +1,39 @@
+//
+//  UOWebServiceController.h
+//  U1Music
+//
+//  Created by Paul Hummer on 12/12/12.
+//  Copyright (c) 2012 Canonical. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <RestKit/RestKit.h>
+
+#define ALBUMS_LAST_UPDATED @"albumsLastUpdated"
+#define ARTISTS_LAST_UPDATED @"artistsLastUpdated"
+#define PLAYLISTS_LAST_UPDATED @"playlistsLastUpdated"
+#define SONGS_LAST_UPDATED @"songsLastUpdated"
+
+@protocol UOWebServiceDelegate <NSObject>
+
+- (void)webserviceUpdateComplete;
+- (void)webserviceUpdateError:(NSError *)error;
+
+@end
+
+@interface UOWebServiceController : NSObject
++ (UOWebServiceController *)controller;
+
+- (void)updateAlbums:(id<UOWebServiceDelegate>)delegate;
+- (void)updateAlbums:(id<UOWebServiceDelegate>)delegate clearCache:(BOOL)clearCache;
+
+- (void)updateArtists:(id<UOWebServiceDelegate>)delegate;
+- (void)updateArtists:(id<UOWebServiceDelegate>)delegate clearCache:(BOOL)clearCache;
+
+- (void)updatePlaylists:(id<UOWebServiceDelegate>)delegate;
+- (void)updatePlaylists:(id<UOWebServiceDelegate>)delegate clearCache:(BOOL)clearCache;
+
+- (void)updateSongs:(id<UOWebServiceDelegate>)delegate;
+- (void)updateSongs:(id<UOWebServiceDelegate>)delegate clearCache:(BOOL)clearCache;
+
+@end

=== added file 'Music/Utilities/UOWebServiceController.m'
--- Music/Utilities/UOWebServiceController.m	1970-01-01 00:00:00 +0000
+++ Music/Utilities/UOWebServiceController.m	2013-01-02 23:49:23 +0000
@@ -0,0 +1,204 @@
+//
+//  UOWebServiceController.m
+//  U1Music
+//
+//  Created by Paul Hummer on 12/12/12.
+//  Copyright (c) 2012 Canonical. All rights reserved.
+//
+
+#import "UOWebServiceController.h"
+#import <RestKit/RestKit.h>
+#import <RestKit/CoreData.h>
+#import "UONetworkStatusCoordinator.h"
+#import "UOAuthManager.h"
+#import "AppDelegate.h"
+
+#import "Album.h"
+#import "Artist.h"
+#import "Playlist.h"
+#import "Song.h"
+
+@interface UOWebServiceController ()
+- (void)updateAlbumsWithBlock:(void(^)(void))completionBlock;
+- (void)updateArtistsWithBlock:(void(^)(void))completionBlock;
+- (void)updateSongsWithBlock:(void(^)(void))completionBlock;
+@end
+
+@implementation UOWebServiceController
+
+- (id)init {
+    self = [super init];
+    [self initRestKit];
+    return self;
+}
+
+#pragma mark - Static methods
+
++ (UOWebServiceController *)controller {
+    static UOWebServiceController *instance = nil;
+    static dispatch_once_t once;
+    dispatch_once(&once, ^{
+        instance = [[UOWebServiceController alloc] init];
+    });
+    return instance;
+}
+
+#pragma mark - Network operations
+
+- (void)updateAlbums:(id<UOWebServiceDelegate>)delegate clearCache:(BOOL)clearCache {
+    if (clearCache || [self needsUpdating:ALBUMS_LAST_UPDATED]) {
+        [self updateArtistsWithBlock:^(void) {
+            [[RKObjectManager sharedManager] getObjectsAtPath:@"albums/" parameters:nil success:^(RKObjectRequestOperation *operation, RKMappingResult *mappingResult) {
+                [delegate webserviceUpdateComplete];
+            } failure:^(RKObjectRequestOperation *operation, NSError *error) {
+                [[NSUserDefaults standardUserDefaults] setObject:nil forKey:ALBUMS_LAST_UPDATED];
+                [delegate webserviceUpdateError:error];
+            }];
+        }];
+    }
+}
+
+- (void)updateAlbums:(id<UOWebServiceDelegate>)delegate {
+    [self updateAlbums:delegate clearCache:NO];
+}
+
+- (void)updateAlbumsWithBlock:(void (^)(void))completionBlock {
+    if ([self needsUpdating:ALBUMS_LAST_UPDATED]) {
+        [self updateArtistsWithBlock:^(void) {
+            [[RKObjectManager sharedManager] getObjectsAtPath:@"albums/" parameters:nil success:^(RKObjectRequestOperation *operation, RKMappingResult *mappingResult) {
+                [[NSUserDefaults standardUserDefaults] setObject:[NSDate date] forKey:ALBUMS_LAST_UPDATED];
+                completionBlock();
+            } failure:^(RKObjectRequestOperation *operation, NSError *error) {
+                [[NSUserDefaults standardUserDefaults] setObject:nil forKey:ALBUMS_LAST_UPDATED];
+            }];
+        }];
+    } else {
+        completionBlock();
+    }
+}
+
+- (void)updateArtists:(id<UOWebServiceDelegate>)delegate clearCache:(BOOL)clearCache {
+    if (clearCache || [self needsUpdating:ARTISTS_LAST_UPDATED]) {
+        [[RKObjectManager sharedManager] getObjectsAtPath:@"artists/" parameters:nil success:^(RKObjectRequestOperation *operation, RKMappingResult *mappingResult) {
+            [delegate webserviceUpdateComplete];
+        } failure:^(RKObjectRequestOperation *operation, NSError *error) {
+            [[NSUserDefaults standardUserDefaults] setObject:nil forKey:ARTISTS_LAST_UPDATED];
+            [delegate webserviceUpdateError:error];
+        }];
+    }
+}
+
+- (void)updateArtists:(id<UOWebServiceDelegate>)delegate {
+    [self updateArtists:delegate clearCache:NO];
+}
+
+- (void)updateArtistsWithBlock:(void(^)(void))completionBlock {
+    if ([self needsUpdating:ARTISTS_LAST_UPDATED]) {
+        [[RKObjectManager sharedManager] getObjectsAtPath:@"artists/" parameters:nil success:^(RKObjectRequestOperation *operation, RKMappingResult *mappingResult) {
+            [[NSUserDefaults standardUserDefaults] setObject:[NSDate date] forKey:ARTISTS_LAST_UPDATED];
+            completionBlock();
+        } failure:^(RKObjectRequestOperation *operation, NSError *error) {
+            [[NSUserDefaults standardUserDefaults] setObject:nil forKey:ARTISTS_LAST_UPDATED];
+        }];
+    } else {
+        completionBlock();
+    }
+}
+
+- (void)updatePlaylists:(id<UOWebServiceDelegate>)delegate clearCache:(BOOL)clearCache {
+    if (clearCache || [self needsUpdating:PLAYLISTS_LAST_UPDATED]) {
+        [self updateSongsWithBlock:^(void) {
+            [[RKObjectManager sharedManager] getObjectsAtPath:@"playlists/" parameters:nil success:^(RKObjectRequestOperation *operation, RKMappingResult *mappingResult) {
+                [delegate webserviceUpdateComplete];
+            } failure:^(RKObjectRequestOperation *operation, NSError *error) {
+                [[NSUserDefaults standardUserDefaults] setObject:nil forKey:PLAYLISTS_LAST_UPDATED];
+                [delegate webserviceUpdateError:error];
+            }];
+        }];
+    }
+}
+
+- (void)updatePlaylists:(id<UOWebServiceDelegate>)delegate {
+    [self updatePlaylists:delegate clearCache:NO];
+}
+
+- (void)updateSongs:(id<UOWebServiceDelegate>)delegate clearCache:(BOOL)clearCache {
+    if (clearCache || [self needsUpdating:SONGS_LAST_UPDATED]) {
+        [self updateAlbumsWithBlock:^(void) {
+            [[RKObjectManager sharedManager] getObjectsAtPath:@"songs/" parameters:nil success:^(RKObjectRequestOperation *operation, RKMappingResult *mappingResult) {
+                [delegate webserviceUpdateComplete];
+            } failure:^(RKObjectRequestOperation *operation, NSError *error) {
+                [[NSUserDefaults standardUserDefaults] setObject:nil forKey:SONGS_LAST_UPDATED];
+                [delegate webserviceUpdateError:error];
+            }];
+        }];
+    }
+}
+
+- (void)updateSongs:(id<UOWebServiceDelegate>)delegate {
+    [self updateSongs:delegate clearCache:NO];
+}
+
+- (void)updateSongsWithBlock:(void (^)(void))completionBlock {
+    if ([self needsUpdating:SONGS_LAST_UPDATED]) {
+        [self updateAlbumsWithBlock:^(void) {
+            [[RKObjectManager sharedManager] getObjectsAtPath:@"songs/" parameters:nil success:^(RKObjectRequestOperation *operation, RKMappingResult *mappingResult) {
+                [[NSUserDefaults standardUserDefaults] setObject:[NSDate date] forKey:SONGS_LAST_UPDATED];
+                completionBlock();
+            } failure:^(RKObjectRequestOperation *operation, NSError *error) {
+                [[NSUserDefaults standardUserDefaults] setObject:nil forKey:SONGS_LAST_UPDATED];
+            }];
+        }];
+    } else {
+        completionBlock();
+    }
+}
+
+#pragma mark - Private methods
+
+- (BOOL)needsUpdating:(NSString *)key {
+    int interval = -(60*60*24*5); // 5 days ago
+    NSDate *freshInterval = [NSDate dateWithTimeIntervalSinceNow:interval];
+    NSDate *lastUpdatedAt = [[NSUserDefaults standardUserDefaults] objectForKey:key];
+        
+    BOOL updateNeeded = (lastUpdatedAt == nil || [freshInterval compare:lastUpdatedAt] == NSOrderedDescending);
+    if (updateNeeded) {
+        [[NSUserDefaults standardUserDefaults] setObject:[NSDate date] forKey:key];
+    }
+    return updateNeeded;
+}
+
+- (void)initRestKit {
+    
+    NSURL *baseUrl = [NSURL URLWithString:@"https://one.ubuntu.com/api/music/v2/"];
+    RKObjectManager *objectManager = [RKObjectManager managerWithBaseURL:baseUrl];
+    
+    /* Handle Plaintext auth */
+    NSURLRequest *echo = [UOAuthManager oauthRequestForPath:[baseUrl path]];
+    [objectManager.HTTPClient setDefaultHeader:@"Authorization" value:[echo valueForHTTPHeaderField:@"Authorization"]];
+    [objectManager.HTTPClient setDefaultHeader:@"Accept-Encoding" value:[echo valueForHTTPHeaderField:@"Accept-Encoding"]];
+    [objectManager.HTTPClient setDefaultHeader:@"User-Agent" value:[echo valueForHTTPHeaderField:@"User-Agent"]];
+    
+    /* Show animated network I/O indicator when doing network I/O */
+    [[AFNetworkActivityIndicatorManager sharedManager] setEnabled:YES];
+    
+    /* Set up managed object store */
+    NSManagedObjectModel *managedObjectModel = [[AppDelegate delegate] managedObjectModel];
+    RKManagedObjectStore *managedObjectStore = [[RKManagedObjectStore alloc] initWithManagedObjectModel:managedObjectModel];
+    
+    /* Why the hell is RestKit not smart enough to do this automatically? Annoy. */
+    NSError *error;
+    [managedObjectStore addSQLitePersistentStoreAtPath:[RKApplicationDataDirectory() stringByAppendingPathComponent:@"UOMusic.sqlite"] fromSeedDatabaseAtPath:nil withConfiguration:nil options:nil error:&error];
+    if (error) {
+        abort();
+    }
+    [objectManager setManagedObjectStore:managedObjectStore];
+    [managedObjectStore createManagedObjectContexts];
+
+    [Album registerMapping];
+    [Artist registerMapping];
+    [Playlist registerMapping];
+    [Song registerMapping];
+}
+
+@end

=== modified file 'Music/View Controllers/AlbumViewController.h'
--- Music/View Controllers/AlbumViewController.h	2012-11-18 16:01:56 +0000
+++ Music/View Controllers/AlbumViewController.h	2013-01-02 23:49:23 +0000
@@ -11,5 +11,5 @@
 @class Album;
 
 @interface AlbumViewController : UIViewController
-@property (nonatomic, retain) Album *album;
+@property (nonatomic, retain) NSString *albumId;
 @end

=== modified file 'Music/View Controllers/AlbumViewController.m'
--- Music/View Controllers/AlbumViewController.m	2013-01-02 23:49:22 +0000
+++ Music/View Controllers/AlbumViewController.m	2013-01-02 23:49:23 +0000
@@ -11,10 +11,12 @@
 #import <RestKit/RestKit.h>
 #import "SongCell.h"
 #import "Song.h"
-#import "UONetworkStatusCoordinator.h"
+#import "UOWebServiceController.h"
 
-@interface AlbumViewController () <RKObjectLoaderDelegate, UITableViewDataSource> {
+@interface AlbumViewController () <UITableViewDataSource, UOWebServiceDelegate> {
     NSArray *tableData;
+    
+    Album *album;
 }
 @property (weak, nonatomic) IBOutlet UIImageView *albumArt;
 @property (weak, nonatomic) IBOutlet UILabel *albumTitle;
@@ -24,18 +26,26 @@
 @end
 
 @implementation AlbumViewController
+@synthesize albumId = _albumId;
 
 - (void)viewDidLoad {
     [self.tableView setDataSource:self];
 }
 
 - (void)viewWillAppear:(BOOL)animated {
-    [_albumTitle setText:_album.title];
-    //[_albumDescription setText:_album.artist];
-    tableData = [NSArray array];
-    [self.tableView reloadData];
-    
-    [self update];
+    [self fetchAlbum];
+    
+    
+    [_albumTitle setText:album.title];
+    [_albumDescription setText:album.artist.name];
+    
+    if ([album.songs count]) {
+        NSArray *sortDescriptors = [NSArray arrayWithObjects:[[NSSortDescriptor alloc] initWithKey:@"track" ascending:NO], nil];
+        tableData = [album.songs sortedArrayUsingDescriptors:sortDescriptors];
+        [self.tableView reloadData];
+    } else {
+        [[UOWebServiceController controller] updateSongs:self];
+    }
 }
 
 - (void)viewDidUnload {
@@ -62,24 +72,41 @@
 
 #pragma mark - Private methods
 
-- (void)update {
-    [UONetworkStatusCoordinator addNetworkActivity];
-    
-    NSString *endpoint = [NSString stringWithFormat:@"/albums/%@/", _album.albumId];
-    [[RKObjectManager sharedManager] loadObjectsAtResourcePath:endpoint delegate:self];
-}
-
-#pragma mark - RKObjectLoaderDelegate methods
-
-- (void)objectLoader:(RKObjectLoader *)objectLoader didFailWithError:(NSError *)error {
-    [UONetworkStatusCoordinator removeNetworkActivity];
+- (void)fetchAlbum {
+    NSManagedObjectContext *managedObjectContext = [[[RKObjectManager sharedManager] managedObjectStore] persistentStoreManagedObjectContext];
+    
+    NSFetchRequest *fetchRequest = [[NSFetchRequest alloc] init];
+    NSEntityDescription *entity = [NSEntityDescription entityForName:@"Album" inManagedObjectContext:managedObjectContext];
+    [fetchRequest setEntity:entity];
+    
+    NSPredicate *predicate = [NSPredicate predicateWithFormat:@"(albumId = %@)", _albumId];
+    [fetchRequest setPredicate:predicate];
+    
+    NSError *error;
+    NSArray *results = [managedObjectContext executeFetchRequest:fetchRequest error:&error];
+    if (error || [results count] != 1) {
+        abort();
+    }
+    album = [results objectAtIndex:0];
+}
+
+#pragma mark - UOWebServiceDelegate methods
+
+- (void)webserviceUpdateComplete {
+    NSManagedObjectContext *managedObjectContext = [[[RKObjectManager sharedManager] managedObjectStore] persistentStoreManagedObjectContext];
+    [managedObjectContext refreshObject:album mergeChanges:NO];
+    
+    NSArray *sortDescriptors = [NSArray arrayWithObjects:[[NSSortDescriptor alloc] initWithKey:@"dearticlizedTitle" ascending:YES], nil];
+    tableData = [album.songs sortedArrayUsingDescriptors:sortDescriptors];
+    
+    [self.tableView reloadData];
+}
+
+- (void)webserviceUpdateError:(NSError *)error {
+    if ([error code] == 2) { // Network is down.
+        return;
+    }
     NSLog(@"Error: %@", [error localizedDescription]);
 }
 
-- (void)objectLoader:(RKObjectLoader *)objectLoader didLoadObjects:(NSArray *)objects {
-    [UONetworkStatusCoordinator removeNetworkActivity];
-    tableData = [objects copy];
-    [self.tableView reloadData];
-}
-
 @end

=== modified file 'Music/View Controllers/AlbumsViewController.m'
--- Music/View Controllers/AlbumsViewController.m	2013-01-02 23:49:22 +0000
+++ Music/View Controllers/AlbumsViewController.m	2013-01-02 23:49:23 +0000
@@ -12,6 +12,7 @@
 #import "Album.h"
 #import "AlbumCell.h"
 #import "AlbumViewController.h"
+#import "UOWebServiceController.h"
 
 @interface AlbumsViewController ()
 
@@ -21,8 +22,10 @@
 
 #pragma mark - UOIndexedViewControllers methods
 
-- (NSString *)endpoint {
-    return @"/albums/";
+- (void)configureCell:(UITableViewCell *)cell forIndexPath:(NSIndexPath *)indexPath {
+    Album *album = [self.fetchedResultsController objectAtIndexPath:indexPath];
+    AlbumCell *albumCell = (AlbumCell *)cell;
+    [albumCell setAlbum:album];
 }
 
 - (NSString *)entityName {
@@ -30,7 +33,7 @@
 }
 
 - (NSString *)lastUpdatedKey {
-    return @"albumsLastUpdated";
+    return ALBUMS_LAST_UPDATED;
 }
 
 - (NSArray *)sortDescriptors {
@@ -39,10 +42,8 @@
             nil];
 }
 
-- (void)configureCell:(UITableViewCell *)cell forIndexPath:(NSIndexPath *)indexPath {
-    Album *album = [self.fetchedResultsController objectAtIndexPath:indexPath];
-    AlbumCell *albumCell = (AlbumCell *)cell; 
-    [albumCell setAlbum:album];
+- (void)update {
+    [[UOWebServiceController controller] updateAlbums:self];
 }
 
 #pragma mark - Storyboard methods
@@ -53,7 +54,7 @@
     NSIndexPath *indexPath = [self.tableView indexPathForSelectedRow];
     Album *album = [self.fetchedResultsController objectAtIndexPath:indexPath];
     
-    albumViewController.album = album;
+    albumViewController.albumId = album.albumId;
 }
 
 @end

=== modified file 'Music/View Controllers/ArtistViewController.h'
--- Music/View Controllers/ArtistViewController.h	2012-11-18 15:47:37 +0000
+++ Music/View Controllers/ArtistViewController.h	2013-01-02 23:49:23 +0000
@@ -11,5 +11,5 @@
 @class Artist;
 
 @interface ArtistViewController : UIViewController
-@property (nonatomic, retain) Artist *artist;
+@property (nonatomic, retain) NSString *artistId;
 @end

=== modified file 'Music/View Controllers/ArtistViewController.m'
--- Music/View Controllers/ArtistViewController.m	2013-01-02 23:49:22 +0000
+++ Music/View Controllers/ArtistViewController.m	2013-01-02 23:49:23 +0000
@@ -14,9 +14,13 @@
 #import "Album.h"
 #import "AlbumCell.h"
 #import "AlbumViewController.h"
+#import "UOWebServiceController.h"
+#import "AppDelegate.h"
 
-@interface ArtistViewController () <RKObjectLoaderDelegate,UITableViewDataSource> {
+@interface ArtistViewController () <UITableViewDataSource, UOWebServiceDelegate> {
     NSArray *tableData;
+    
+    Artist *artist;
 }
 @property (weak, nonatomic) IBOutlet UIImageView *albumArt;
 @property (weak, nonatomic) IBOutlet UILabel *artistName;
@@ -26,20 +30,26 @@
 @end
 
 @implementation ArtistViewController
-@synthesize artist = _artist;
+@synthesize artistId = _artistId;
 
 - (void)viewDidLoad {
     [self.tableView setDataSource:self];
 }
 
 - (void)viewWillAppear:(BOOL)animated {
-    [_artistName setText:_artist.name];
-    // TODO: rockstar - fix this once we have that data again.
-    [_artistDescription setText:@"5 songs"];
-    tableData = [NSArray array];
+    [[UOWebServiceController controller] updateAlbums:self];
+    [self fetchArtist];
+    
+    [_artistName setText:artist.name];
+    
+    NSString *pluralizedNoun = @"albums";
+    if ([artist.albums count] == 1) {
+        pluralizedNoun = @"album";
+    }
+    [_artistDescription setText:[NSString stringWithFormat:@"%d %@", [artist.albums count], pluralizedNoun]];
+    NSArray *sortDescriptors = [NSArray arrayWithObjects:[[NSSortDescriptor alloc] initWithKey:@"dearticlizedTitle" ascending:YES], nil];
+    tableData = [artist.albums sortedArrayUsingDescriptors:sortDescriptors];
     [self.tableView reloadData];
-    
-    [self update];
 }
 
 - (void)viewDidUnload {
@@ -64,33 +74,50 @@
     return cell;
 }
 
-#pragma mark - Private methods
-
-- (void)update {
-    [UONetworkStatusCoordinator addNetworkActivity];
-    
-    NSString *endpoint = [NSString stringWithFormat:@"/artists/%@/", _artist.artistId];
-    [[RKObjectManager sharedManager] loadObjectsAtResourcePath:endpoint delegate:self];
-}
-
-#pragma mark - RKObjectLoaderDelegate methods
-
-- (void)objectLoader:(RKObjectLoader *)objectLoader didFailWithError:(NSError *)error {
-    [UONetworkStatusCoordinator removeNetworkActivity];
-    NSLog(@"Error: %@", [error localizedDescription]);
-}
-
-- (void)objectLoader:(RKObjectLoader *)objectLoader didLoadObjects:(NSArray *)objects {
-    [UONetworkStatusCoordinator removeNetworkActivity];
-    tableData = [objects copy];
-    [self.tableView reloadData];
-}
-
 - (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
     AlbumViewController *albumViewController = [segue destinationViewController];
     NSIndexPath *indexPath = [self.tableView indexPathForSelectedRow];
     Album *album = [tableData objectAtIndex:indexPath.row];
-    albumViewController.album = album;
+    albumViewController.albumId = album.albumId;
+}
+
+#pragma mark - UOWebServiceDelegate methods
+
+- (void)webserviceUpdateComplete {
+    NSManagedObjectContext *managedObjectContext = [[[RKObjectManager sharedManager] managedObjectStore] persistentStoreManagedObjectContext];
+    [managedObjectContext refreshObject:artist mergeChanges:NO];
+
+    NSArray *sortDescriptors = [NSArray arrayWithObjects:[[NSSortDescriptor alloc] initWithKey:@"dearticlizedTitle" ascending:YES], nil];
+    tableData = [artist.albums sortedArrayUsingDescriptors:sortDescriptors];
+    
+    [self.tableView reloadData];
+}
+
+- (void)webserviceUpdateError:(NSError *)error {
+    if ([error code] == 2) { // Network is down.
+        return;
+    }
+    NSLog(@"Error: %@", [error localizedDescription]);
+}
+
+#pragma mark - Private methods
+
+- (void)fetchArtist {
+    NSManagedObjectContext *managedObjectContext = [[[RKObjectManager sharedManager] managedObjectStore] persistentStoreManagedObjectContext];
+    
+    NSFetchRequest *fetchRequest = [[NSFetchRequest alloc] init];
+    NSEntityDescription *entity = [NSEntityDescription entityForName:@"Artist" inManagedObjectContext:managedObjectContext];
+    [fetchRequest setEntity:entity];
+    
+    NSPredicate *predicate = [NSPredicate predicateWithFormat:@"(artistId = %@)", _artistId];
+    [fetchRequest setPredicate:predicate];
+    
+    NSError *error;
+    NSArray *results = [managedObjectContext executeFetchRequest:fetchRequest error:&error];
+    if (error || [results count] != 1) {
+        abort();
+    }
+    artist = [results objectAtIndex:0];
 }
 
 @end

=== modified file 'Music/View Controllers/ArtistsViewController.m'
--- Music/View Controllers/ArtistsViewController.m	2013-01-02 23:49:22 +0000
+++ Music/View Controllers/ArtistsViewController.m	2013-01-02 23:49:23 +0000
@@ -15,6 +15,7 @@
 
 #import "UONetworkStatusCoordinator.h"
 #import "ArtistViewController.h"
+#import "UOWebServiceController.h"
 
 @interface ArtistsViewController ()
 @end
@@ -23,8 +24,11 @@
 
 #pragma mark - UOIndexedViewController methods
 
-- (NSString *)endpoint {
-    return @"/artists/";
+- (void)configureCell:(UITableViewCell *)cell forIndexPath:(NSIndexPath *)indexPath {
+    Artist *artist = [self.fetchedResultsController objectAtIndexPath:indexPath];
+    ArtistCell *artistCell = (ArtistCell *)cell;
+    
+    [artistCell setArtist:artist];
 }
 
 - (NSString *)entityName {
@@ -32,8 +36,7 @@
 }
 
 - (NSString *)lastUpdatedKey {
-    
-    return @"artistsLastUpdated";
+return ARTISTS_LAST_UPDATED;
 }
 
 - (NSArray *)sortDescriptors {
@@ -42,11 +45,8 @@
             nil];
 }
 
-- (void)configureCell:(UITableViewCell *)cell forIndexPath:(NSIndexPath *)indexPath {
-    Artist *artist = [self.fetchedResultsController objectAtIndexPath:indexPath];
-    ArtistCell *artistCell = (ArtistCell *)cell;
-    
-    [artistCell setArtist:artist];
+- (void)update {
+    [[UOWebServiceController controller] updateArtists:self];
 }
 
 #pragma mark - Storyboard methods
@@ -56,7 +56,7 @@
     NSIndexPath *indexPath = [self.tableView indexPathForSelectedRow];
     Artist *artist = [self.fetchedResultsController objectAtIndexPath:indexPath];
     
-    artistViewController.artist = artist;
+    artistViewController.artistId = artist.artistId;
 }
 
 @end

=== modified file 'Music/View Controllers/PlaylistsViewController.m'
--- Music/View Controllers/PlaylistsViewController.m	2013-01-02 23:49:22 +0000
+++ Music/View Controllers/PlaylistsViewController.m	2013-01-02 23:49:23 +0000
@@ -11,6 +11,7 @@
 #import "Playlist.h"
 #import "PlaylistCell.h"
 #import "NSString+Extras.h"
+#import "UOWebServiceController.h"
 
 @interface PlaylistsViewController ()
 
@@ -20,8 +21,10 @@
 
 #pragma mark - UOIndexedViewController methods
 
-- (NSString *)endpoint {
-    return @"/playlists/";
+- (void)configureCell:(UITableViewCell *)cell forIndexPath:(NSIndexPath *)indexPath {
+    PlaylistCell *playlistCell = (PlaylistCell *)cell;
+    Playlist *playlist = [self.fetchedResultsController objectAtIndexPath:indexPath];
+    [playlistCell setPlaylist:playlist];
 }
 
 - (NSString *)entityName {
@@ -29,7 +32,7 @@
 }
 
 - (NSString *)lastUpdatedKey {
-    return @"playlistsLastUpdated";
+    return PLAYLISTS_LAST_UPDATED;
 }
 
 - (NSArray *)sortDescriptors {
@@ -38,10 +41,8 @@
             nil];
 }
 
-- (void)configureCell:(UITableViewCell *)cell forIndexPath:(NSIndexPath *)indexPath {
-    PlaylistCell *playlistCell = (PlaylistCell *)cell;
-    Playlist *playlist = [self.fetchedResultsController objectAtIndexPath:indexPath];
-    [playlistCell setPlaylist:playlist];
+- (void)update {
+    [[UOWebServiceController controller] updatePlaylists:self];
 }
 
 @end

=== modified file 'Music/View Controllers/SongsViewController.m'
--- Music/View Controllers/SongsViewController.m	2013-01-02 23:49:22 +0000
+++ Music/View Controllers/SongsViewController.m	2013-01-02 23:49:23 +0000
@@ -11,6 +11,7 @@
 #import "Song.h"
 #import "SongCell.h"
 #import "NSString+Extras.h"
+#import "UOWebServiceController.h"
 
 @interface SongsViewController ()
 
@@ -20,16 +21,12 @@
 
 #pragma mark - UOIndexedViewControllers methods
 
-- (NSString *)endpoint {
-    return @"/songs/";
-}
-
 - (NSString *)entityName {
     return @"Song";
 }
 
 - (NSString *)lastUpdatedKey {
-    return @"songsLastUpdated";
+    return SONGS_LAST_UPDATED;
 }
 
 - (NSArray *)sortDescriptors {
@@ -44,4 +41,8 @@
     [songCell setSong:song];
 }
 
+- (void)viewWillAppear:(BOOL)animated {
+    [[UOWebServiceController controller] updateSongs:self];
+}
+
 @end

=== modified file 'Music/View Controllers/UOIndexedViewController.h'
--- Music/View Controllers/UOIndexedViewController.h	2013-01-02 23:49:22 +0000
+++ Music/View Controllers/UOIndexedViewController.h	2013-01-02 23:49:23 +0000
@@ -8,8 +8,9 @@
 
 #import <UIKit/UIKit.h>
 #import <RestKit/RestKit.h>
+#import "UOWebServiceController.h"
 
-@interface UOIndexedViewController : UITableViewController <NSFetchedResultsControllerDelegate, RKObjectLoaderDelegate> {
+@interface UOIndexedViewController : UITableViewController <NSFetchedResultsControllerDelegate,UOWebServiceDelegate> {
     NSMutableDictionary *groupedTableData;
     NSArray *indexes;
     BOOL indexed;
@@ -26,5 +27,4 @@
 
 - (NSFetchedResultsController *)fetchedResultsController;
 
-- (void)objectLoader:(RKObjectLoader *)objectLoader didFailWithError:(NSError *)error;
 @end

=== modified file 'Music/View Controllers/UOIndexedViewController.m'
--- Music/View Controllers/UOIndexedViewController.m	2013-01-02 23:49:22 +0000
+++ Music/View Controllers/UOIndexedViewController.m	2013-01-02 23:49:23 +0000
@@ -8,11 +8,8 @@
 
 #import "UOIndexedViewController.h"
 #import <RestKit/RestKit.h>
-#import "UONetworkStatusCoordinator.h"
 #import "AppDelegate.h"
 
-#define ARTISTS_LAST_UPDATED @"artistsLastUpdateAt"
-
 @interface UOIndexedViewController () {
     NSFetchedResultsController *_fetchedResultsController;
 }
@@ -21,15 +18,6 @@
 
 @implementation UOIndexedViewController
 
-- (id)initWithStyle:(UITableViewStyle)style
-{
-    self = [super initWithStyle:style];
-    if (self) {
-        // Custom initialization
-    }
-    return self;
-}
-
 #pragma mark - Abstract methods
 
 - (NSString *)endpoint {
@@ -56,11 +44,7 @@
     return;
 }
 
-#pragma mark - Data retrieval methods
-
 - (void)update {
-    [UONetworkStatusCoordinator addNetworkActivity];
-    [[RKObjectManager sharedManager] loadObjectsAtResourcePath:self.endpoint delegate:self];
 }
 
 #pragma mark - UIViewController lifecycle
@@ -71,16 +55,7 @@
 }
 
 - (void)viewWillAppear:(BOOL)animated {
-    NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
-    /* In general, using static time difference intervals is bad. However, a precision of "7 days ago"
-       is probably good enough for our needs.
-     */
-    NSDate *oneWeekAgo = [NSDate dateWithTimeIntervalSinceNow:-604800];
-    NSDate *lastUpdatedAt = [userDefaults objectForKey:[self lastUpdatedKey]];
-    if (lastUpdatedAt == nil || [oneWeekAgo compare:lastUpdatedAt] == NSOrderedDescending ) {
-        NSLog(@"Data is stale. Calling update");
-        [self update];
-    }
+    [self update];
 }
 
 - (void)didReceiveMemoryWarning
@@ -117,8 +92,22 @@
     return [self.fetchedResultsController sectionIndexTitles];
 }
 
+#pragma mark - UOWebServiceDelegate methods
+
+- (void)webserviceUpdateComplete {
+    _fetchedResultsController = nil;
+    [self.tableView reloadData];
+}
+
+- (void)webserviceUpdateError:(NSError *)error {
+    if ([error code] == 2) { // Network is down.
+        return;
+    }
+    NSLog(@"Error: %@", [error localizedDescription]);
+}
+
 #pragma mark - RKObjectLoaderDelegate methods
-
+/*
 - (void)objectLoader:(RKObjectLoader *)objectLoader didFailWithError:(NSError *)error {
     [UONetworkStatusCoordinator removeNetworkActivity];
     if ([error code] == 2) { // Network is down.
@@ -134,6 +123,7 @@
     [[NSUserDefaults standardUserDefaults] setObject:[NSDate date] forKey:[self lastUpdatedKey]];
     [self.tableView reloadData];
 }
+ */
 
 #pragma mark - Fetched results controller
 
@@ -142,18 +132,12 @@
         return _fetchedResultsController;
     }
     
-    NSManagedObjectContext *managedObjectContext = [AppDelegate delegate].managedObjectContext;
-    
-    NSFetchRequest *fetchRequest = [[NSFetchRequest alloc] init];
-    NSEntityDescription *entityDescription = [NSEntityDescription entityForName:[self entityName] inManagedObjectContext:managedObjectContext];
-    [fetchRequest setEntity:entityDescription];
-    
+    NSFetchRequest *fetchRequest = [NSFetchRequest fetchRequestWithEntityName:[self entityName]];
     [fetchRequest setFetchBatchSize:20];
-
     [fetchRequest setSortDescriptors:[self sortDescriptors]];
-    
-    _fetchedResultsController = [[NSFetchedResultsController alloc] initWithFetchRequest:fetchRequest
-                                                                    managedObjectContext:[RKManagedObjectStore defaultObjectStore].managedObjectContextForCurrentThread
+      
+    _fetchedResultsController = [[NSFetchedResultsController alloc] initWithFetchRequest:fetchRequest 
+                                                                    managedObjectContext:[[AppDelegate delegate] managedObjectContext]
                                                                       sectionNameKeyPath:[self sectionNameKeyPath]
                                                                                cacheName:nil];
     _fetchedResultsController.delegate = self;

=== modified file 'U1Music.xcodeproj/project.pbxproj'
--- U1Music.xcodeproj/project.pbxproj	2013-01-02 23:49:22 +0000
+++ U1Music.xcodeproj/project.pbxproj	2013-01-02 23:49:23 +0000
@@ -32,7 +32,6 @@
 		52206BD01655355000A3A0A8 /* SettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 52206BCF1655354F00A3A0A8 /* SettingsViewController.m */; };
 		52206BE61655BE8700A3A0A8 /* SettingsAuthenticationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 52206BE51655BE8700A3A0A8 /* SettingsAuthenticationViewController.m */; };
 		52206BE91655BF4900A3A0A8 /* SettingsAboutViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 52206BE81655BF4900A3A0A8 /* SettingsAboutViewController.m */; };
-		52220B9E1672A75F0078D5DC /* RKRequest+Plaintext.m in Sources */ = {isa = PBXBuildFile; fileRef = 52220B9D1672A75F0078D5DC /* RKRequest+Plaintext.m */; };
 		523B3CE215B5D64F004394F4 /* grabber.png in Resources */ = {isa = PBXBuildFile; fileRef = 523B3CE015B5D64F004394F4 /* grabber.png */; };
 		523B3CE315B5D64F004394F4 /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 523B3CE115B5D64F004394F4 /* [e-mail] */; };
 		523B3CF915B73BA0004394F4 /* download-grey.png in Resources */ = {isa = PBXBuildFile; fileRef = 523B3CF515B73BA0004394F4 /* download-grey.png */; };
@@ -83,6 +82,7 @@
 		52AC3D811604513E00B4785D /* uncached.png in Resources */ = {isa = PBXBuildFile; fileRef = 52AC3D651604513E00B4785D /* uncached.png */; };
 		52AC3D821604513E00B4785D /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 52AC3D661604513E00B4785D /* [e-mail] */; };
 		52AC3D841604539000B4785D /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 52AC3D831604539000B4785D /* [e-mail] */; };
+		52B7A030167986BC00243D7D /* UOWebServiceController.m in Sources */ = {isa = PBXBuildFile; fileRef = 52B7A02F167986BC00243D7D /* UOWebServiceController.m */; };
 		536D620B1144495400DFCE56 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 536D620A1144495400DFCE56 /* SystemConfiguration.framework */; };
 		537DE2D9113F008C00875852 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 537DE2D8113F008C00875852 /* CoreFoundation.framework */; };
 		53F675D8113B092C00822059 /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 53F675D7113B092C00822059 /* MediaPlayer.framework */; };
@@ -152,13 +152,6 @@
 			remoteGlobalIDString = 25160E78145651060060A5C5;
 			remoteInfo = RestKitFrameworkTests;
 		};
-		52206B9D16550AEE00A3A0A8 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 52206B8A16550AED00A3A0A8 /* RestKit.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 259C301615128079003066A2;
-			remoteInfo = RestKitResources;
-		};
 		528515931604F16D004A1F7C /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 5285158E1604F16B004A1F7C /* UbuntuOneAuthKit.xcodeproj */;
@@ -219,8 +212,6 @@
 		52206BE51655BE8700A3A0A8 /* SettingsAuthenticationViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SettingsAuthenticationViewController.m; path = "Music/View Controllers/SettingsAuthenticationViewController.m"; sourceTree = SOURCE_ROOT; };
 		52206BE71655BF4900A3A0A8 /* SettingsAboutViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SettingsAboutViewController.h; path = "Music/View Controllers/SettingsAboutViewController.h"; sourceTree = SOURCE_ROOT; };
 		52206BE81655BF4900A3A0A8 /* SettingsAboutViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SettingsAboutViewController.m; path = "Music/View Controllers/SettingsAboutViewController.m"; sourceTree = SOURCE_ROOT; };
-		52220B9C1672A75F0078D5DC /* RKRequest+Plaintext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "RKRequest+Plaintext.h"; path = "Music/Categories/RKRequest+Plaintext.h"; sourceTree = SOURCE_ROOT; };
-		52220B9D1672A75F0078D5DC /* RKRequest+Plaintext.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "RKRequest+Plaintext.m"; path = "Music/Categories/RKRequest+Plaintext.m"; sourceTree = SOURCE_ROOT; };
 		523B3CDC15B4C42F004394F4 /* SongUITableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SongUITableView.h; sourceTree = "<group>"; };
 		523B3CDD15B4C42F004394F4 /* SongUITableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SongUITableView.m; sourceTree = "<group>"; };
 		523B3CE015B5D64F004394F4 /* grabber.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = grabber.png; sourceTree = "<group>"; };
@@ -327,6 +318,8 @@
 		52AC3D651604513E00B4785D /* uncached.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = uncached.png; sourceTree = "<group>"; };
 		52AC3D661604513E00B4785D /* [e-mail] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[e-mail]"; sourceTree = "<group>"; };
 		52AC3D831604539000B4785D /* [e-mail] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[e-mail]"; sourceTree = "<group>"; };
+		52B7A02E167986BC00243D7D /* UOWebServiceController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UOWebServiceController.h; path = Music/Utilities/UOWebServiceController.h; sourceTree = SOURCE_ROOT; };
+		52B7A02F167986BC00243D7D /* UOWebServiceController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = UOWebServiceController.m; path = Music/Utilities/UOWebServiceController.m; sourceTree = SOURCE_ROOT; };
 		536D620A1144495400DFCE56 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
 		537DE2D8113F008C00875852 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
 		53F675D7113B092C00822059 /* MediaPlayer.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MediaPlayer.framework; path = System/Library/Frameworks/MediaPlayer.framework; sourceTree = SDKROOT; };
@@ -666,7 +659,6 @@
 				52206B9816550AEE00A3A0A8 /* RestKitTests.octest */,
 				52206B9A16550AEE00A3A0A8 /* RestKit.framework */,
 				52206B9C16550AEE00A3A0A8 /* RestKitFrameworkTests.octest */,
-				52206B9E16550AEE00A3A0A8 /* RestKitResources.bundle */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -736,6 +728,8 @@
 			children = (
 				5244A7FE1656A10200882601 /* UONetworkStatusCoordinator.h */,
 				5244A7FF1656A10200882601 /* UONetworkStatusCoordinator.m */,
+				52B7A02E167986BC00243D7D /* UOWebServiceController.h */,
+				52B7A02F167986BC00243D7D /* UOWebServiceController.m */,
 			);
 			name = Utilities;
 			sourceTree = "<group>";
@@ -745,8 +739,6 @@
 			children = (
 				5244A8031657245A00882601 /* NSString+Extras.h */,
 				5244A8041657245A00882601 /* NSString+Extras.m */,
-				52220B9C1672A75F0078D5DC /* RKRequest+Plaintext.h */,
-				52220B9D1672A75F0078D5DC /* RKRequest+Plaintext.m */,
 			);
 			name = Categories;
 			sourceTree = "<group>";
@@ -1378,13 +1370,6 @@
 			remoteRef = 52206B9B16550AEE00A3A0A8 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		52206B9E16550AEE00A3A0A8 /* RestKitResources.bundle */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.cfbundle;
-			path = RestKitResources.bundle;
-			remoteRef = 52206B9D16550AEE00A3A0A8 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
 		528515941604F16D004A1F7C /* UbuntuOneAuthKit.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
@@ -1531,7 +1516,7 @@
 				5244A81A1657C63700882601 /* PlaylistCell.m in Sources */,
 				5244A83A165B528800882601 /* UOMusic.xcdatamodeld in Sources */,
 				5244A83D165C627900882601 /* UOModel.m in Sources */,
-				52220B9E1672A75F0078D5DC /* RKRequest+Plaintext.m in Sources */,
+				52B7A030167986BC00243D7D /* UOWebServiceController.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

=== modified file 'U1Music_Prefix.pch'
--- U1Music_Prefix.pch	2012-09-25 21:28:26 +0000
+++ U1Music_Prefix.pch	2013-01-02 23:49:23 +0000
@@ -10,15 +10,9 @@
 
 #ifdef __OBJC__
     #import <Foundation/Foundation.h>
+    #import <MobileCoreServices/MobileCoreServices.h>
+    #import <SystemConfiguration/SystemConfiguration.h>
     #import <UIKit/UIKit.h>
-	#import <CoreData/CoreData.h>
-	#import "Globals.h"
-	#import "MOC.h"
-	#import "NSManagedObjectContext+Additions.h"
-	#import "NSString+Extras.h"
+
     #import "TestFlight.h"
- 	#define RELEASE_SAFELY(__obj) [__obj release], __obj = nil;
-
-	#define UBUNTU_ONE_SERVICE_NAME @"com.ubuntu.one"
-	#define UBUNTU_ONE_DUMMY_USER_NAME @"_UBUNTU_ONE_USER_NAME"
 #endif