Bumping app version for 1.0.3

Limelight/Crypto/IdManager.m

@@ -13,15 +13,14 @@
 
 + (NSString*) getUniqueId {
     DataManager* dataMan = [[DataManager alloc] init];
-    Settings* prefs = [dataMan retrieveSettings];
-    
-    NSString* uniqueId = prefs.uniqueId;
+
+    NSString* uniqueId = [dataMan getUniqueId];
     if (uniqueId == nil) {
         uniqueId = [IdManager generateUniqueId];
-        prefs.uniqueId = uniqueId;
-        [dataMan saveData];
+        [dataMan updateUniqueId:uniqueId];
         Log(LOG_I, @"No UUID found. Generated new UUID: %@", uniqueId);
     }
+    
     return uniqueId;
 }
 

Limelight/Database/App.h

@@ -11,16 +11,8 @@
 
 @class Host;
 
-NS_ASSUME_NONNULL_BEGIN
-
 @interface App : NSManagedObject
 
-@property BOOL isRunning;
-
-- (NSComparisonResult)compareName:(App *)other;
-
 @end
 
-NS_ASSUME_NONNULL_END
-
 #import "App+CoreDataProperties.h"

Limelight/Database/App.m

@@ -7,14 +7,7 @@
 //
 
 #import "App.h"
-#import "Host.h"
 
 @implementation App
 
-@synthesize isRunning;
-
-- (NSComparisonResult)compareName:(App *)other {
-    return [self.name caseInsensitiveCompare:other.name];
-}
-
 @end

Limelight/Database/DataManager.h

@@ -7,23 +7,25 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "Settings.h"
 #import "AppDelegate.h"
-#import "Host.h"
-#import "App.h"
+#import "TemporaryHost.h"
 #import "TemporaryApp.h"
+#import "TemporarySettings.h"
 
 @interface DataManager : NSObject
 
-@property (strong, nonatomic) AppDelegate* appDelegate;
-
 - (void) saveSettingsWithBitrate:(NSInteger)bitrate framerate:(NSInteger)framerate height:(NSInteger)height width:(NSInteger)width onscreenControls:(NSInteger)onscreenControls;
-- (Settings*) retrieveSettings;
-- (NSArray*) retrieveHosts;
-- (void) saveData;
-- (Host*) createHost;
-- (void) removeHost:(Host*)host;
-- (App*) addAppFromTemporaryApp:(TemporaryApp*)tempApp;
-- (void) removeAppFromHost:(App*)app;
+
+- (NSArray*) getHosts;
+- (void) updateHost:(TemporaryHost*)host;
+- (void) updateAppsForExistingHost:(TemporaryHost *)host;
+- (void) updateIconForExistingApp:(TemporaryApp*)app;
+- (void) removeHost:(TemporaryHost*)host;
+- (void) removeApp:(TemporaryApp*)app;
+
+- (TemporarySettings*) getSettings;
+
+- (void) updateUniqueId:(NSString*)uniqueId;
+- (NSString*) getUniqueId;
 
 @end

Limelight/Database/DataManager.m

@@ -8,45 +8,131 @@
 
 #import "DataManager.h"
 #import "TemporaryApp.h"
+#import "TemporarySettings.h"
+#import "Settings.h"
 
-@implementation DataManager
-
-+ (NSObject *)databaseLock {
-    static NSObject *lock = nil;
-    if (lock == nil) {
-        lock = [[NSObject alloc] init];
-    }
-    return lock;
+@implementation DataManager {
+    NSManagedObjectContext *_managedObjectContext;
+    AppDelegate *_appDelegate;
 }
 
 - (id) init {
     self = [super init];
-    self.appDelegate = [[UIApplication sharedApplication] delegate];
+    
+    _appDelegate = [[UIApplication sharedApplication] delegate];
+    _managedObjectContext = [[NSManagedObjectContext alloc] initWithConcurrencyType:NSMainQueueConcurrencyType];
+    [_managedObjectContext setPersistentStoreCoordinator:_appDelegate.persistentStoreCoordinator];
+    
     return self;
 }
 
-- (void) saveSettingsWithBitrate:(NSInteger)bitrate framerate:(NSInteger)framerate height:(NSInteger)height width:(NSInteger)width onscreenControls:(NSInteger)onscreenControls {
-    Settings* settingsToSave = [self retrieveSettings];
-    settingsToSave.framerate = [NSNumber numberWithInteger:framerate];
-    // Bitrate is persisted in kbps
-    settingsToSave.bitrate = [NSNumber numberWithInteger:bitrate];
-    settingsToSave.height = [NSNumber numberWithInteger:height];
-    settingsToSave.width = [NSNumber numberWithInteger:width];
-    settingsToSave.onscreenControls = [NSNumber numberWithInteger:onscreenControls];
+- (void) updateUniqueId:(NSString*)uniqueId {
+    [_managedObjectContext performBlockAndWait:^{
+        [self retrieveSettings].uniqueId = uniqueId;
+        [self saveData];
+    }];
+}
 
-    NSError* error;
-    if (![[self.appDelegate managedObjectContext] save:&error]) {
-        Log(LOG_E, @"Unable to save settings to database: %@", error);
-    }
-    [self.appDelegate saveContext];
+- (NSString*) getUniqueId {
+    __block NSString *uid;
+    
+    [_managedObjectContext performBlockAndWait:^{
+        uid = [self retrieveSettings].uniqueId;
+    }];
+
+    return uid;
+}
+
+- (void) saveSettingsWithBitrate:(NSInteger)bitrate framerate:(NSInteger)framerate height:(NSInteger)height width:(NSInteger)width onscreenControls:(NSInteger)onscreenControls {
+    
+    [_managedObjectContext performBlockAndWait:^{
+        Settings* settingsToSave = [self retrieveSettings];
+        settingsToSave.framerate = [NSNumber numberWithInteger:framerate];
+        // Bitrate is persisted in kbps
+        settingsToSave.bitrate = [NSNumber numberWithInteger:bitrate];
+        settingsToSave.height = [NSNumber numberWithInteger:height];
+        settingsToSave.width = [NSNumber numberWithInteger:width];
+        settingsToSave.onscreenControls = [NSNumber numberWithInteger:onscreenControls];
+        
+        [self saveData];
+    }];
+}
+
+- (void) updateHost:(TemporaryHost *)host {
+    [_managedObjectContext performBlockAndWait:^{
+        // Add a new persistent managed object if one doesn't exist
+        Host* parent = [self getHostForTemporaryHost:host withHostRecords:[self fetchRecords:@"Host"]];
+        if (parent == nil) {
+            NSEntityDescription* entity = [NSEntityDescription entityForName:@"Host" inManagedObjectContext:_managedObjectContext];
+            parent = [[Host alloc] initWithEntity:entity insertIntoManagedObjectContext:_managedObjectContext];
+        }
+        
+        // Push changes from the temp host to the persistent one
+        [host propagateChangesToParent:parent];
+        
+        [self saveData];
+    }];
+}
+
+- (void) updateAppsForExistingHost:(TemporaryHost *)host {
+    [_managedObjectContext performBlockAndWait:^{
+        Host* parent = [self getHostForTemporaryHost:host withHostRecords:[self fetchRecords:@"Host"]];
+        if (parent == nil) {
+            // The host must exist to be updated
+            return;
+        }
+        
+        NSMutableSet *applist = [[NSMutableSet alloc] init];
+        NSArray *appRecords = [self fetchRecords:@"App"];
+        for (TemporaryApp* app in host.appList) {
+            // Add a new persistent managed object if one doesn't exist
+            App* parentApp = [self getAppForTemporaryApp:app withAppRecords:appRecords];
+            if (parentApp == nil) {
+                NSEntityDescription* entity = [NSEntityDescription entityForName:@"App" inManagedObjectContext:_managedObjectContext];
+                parentApp = [[App alloc] initWithEntity:entity insertIntoManagedObjectContext:_managedObjectContext];
+            }
+            
+            [app propagateChangesToParent:parentApp withHost:parent];
+            
+            [applist addObject:parentApp];
+        }
+        
+        parent.appList = applist;
+        
+        [self saveData];
+    }];
+}
+
+- (void) updateIconForExistingApp:(TemporaryApp*)app {
+    [_managedObjectContext performBlockAndWait:^{
+        App* parentApp = [self getAppForTemporaryApp:app withAppRecords:[self fetchRecords:@"App"]];
+        if (parentApp == nil) {
+            // The app must exist to be updated
+            return;
+        }
+        
+        parentApp.image = app.image;
+        
+        [self saveData];
+    }];
+}
+
+- (TemporarySettings*) getSettings {
+    __block TemporarySettings *tempSettings;
+    
+    [_managedObjectContext performBlockAndWait:^{
+        tempSettings = [[TemporarySettings alloc] initFromSettings:[self retrieveSettings]];
+    }];
+    
+    return tempSettings;
 }
 
 - (Settings*) retrieveSettings {
     NSArray* fetchedRecords = [self fetchRecords:@"Settings"];
     if (fetchedRecords.count == 0) {
         // create a new settings object with the default values
-        NSEntityDescription* entity = [NSEntityDescription entityForName:@"Settings" inManagedObjectContext:[self.appDelegate managedObjectContext]];
-        Settings* settings = [[Settings alloc] initWithEntity:entity insertIntoManagedObjectContext:[self.appDelegate managedObjectContext]];
+        NSEntityDescription* entity = [NSEntityDescription entityForName:@"Settings" inManagedObjectContext:_managedObjectContext];
+        Settings* settings = [[Settings alloc] initWithEntity:entity insertIntoManagedObjectContext:_managedObjectContext];
         
         return settings;
     } else {
@@ -55,74 +141,82 @@
     }
 }
 
-- (Host*) createHost {
-    NSEntityDescription* entity = [NSEntityDescription entityForName:@"Host" inManagedObjectContext:[self.appDelegate managedObjectContext]];
-    return [[Host alloc] initWithEntity:entity insertIntoManagedObjectContext:[self.appDelegate managedObjectContext]];
+- (void) removeApp:(TemporaryApp*)app {
+    [_managedObjectContext performBlockAndWait:^{
+        App* managedApp = [self getAppForTemporaryApp:app withAppRecords:[self fetchRecords:@"App"]];
+        if (managedApp != nil) {
+            [_managedObjectContext deleteObject:managedApp];
+            [self saveData];
+        }
+    }];
 }
 
-- (void) removeHost:(Host*)host {
-    [[self.appDelegate managedObjectContext] deleteObject:host];
-    [self saveData];
+- (void) removeHost:(TemporaryHost*)host {
+    [_managedObjectContext performBlockAndWait:^{
+        Host* managedHost = [self getHostForTemporaryHost:host withHostRecords:[self fetchRecords:@"Host"]];
+        if (managedHost != nil) {
+            [_managedObjectContext deleteObject:managedHost];
+            [self saveData];
+        }
+    }];
 }
 
 - (void) saveData {
-    @synchronized([DataManager databaseLock]) {
-        NSError* error;
-        if (![[self.appDelegate managedObjectContext] save:&error]) {
-            Log(LOG_E, @"Unable to save hosts to database: %@", error);
+    NSError* error;
+    if (![_managedObjectContext save:&error]) {
+        Log(LOG_E, @"Unable to save hosts to database: %@", error);
+    }
+
+    [_appDelegate saveContext];
+}
+
+- (NSArray*) getHosts {
+    __block NSMutableArray *tempHosts = [[NSMutableArray alloc] init];
+    
+    [_managedObjectContext performBlockAndWait:^{
+        NSArray *hosts = [self fetchRecords:@"Host"];
+        
+        for (Host* host in hosts) {
+            [tempHosts addObject:[[TemporaryHost alloc] initFromHost:host]];
         }
-        [self.appDelegate saveContext];
-    }
+    }];
+    
+    return tempHosts;
 }
 
-- (NSArray*) retrieveHosts {
-    return [self fetchRecords:@"Host"];
-}
-
-- (App*) addAppFromTemporaryApp:(TemporaryApp*)tempApp {
-    
-    App* managedApp;
-    
-    @synchronized([DataManager databaseLock]) {
-        NSEntityDescription* entity = [NSEntityDescription entityForName:@"App" inManagedObjectContext:[self.appDelegate managedObjectContext]];
-        managedApp = [[App alloc] initWithEntity:entity insertIntoManagedObjectContext:[self.appDelegate managedObjectContext]];
-        
-        assert(tempApp.host != nil);
-        
-        managedApp.id = tempApp.id;
-        managedApp.image = tempApp.image;
-        managedApp.name = tempApp.name;
-        managedApp.isRunning = tempApp.isRunning;
-        managedApp.host = tempApp.host;
-        
-        [managedApp.host addAppListObject:managedApp];
+// Only call from within performBlockAndWait!!!
+- (Host*) getHostForTemporaryHost:(TemporaryHost*)tempHost withHostRecords:(NSArray*)hosts {
+    for (Host* host in hosts) {
+        if ([tempHost.uuid isEqualToString:host.uuid]) {
+            return host;
+        }
     }
     
-    return managedApp;
+    return nil;
 }
 
-- (void) removeAppFromHost:(App*)app {
-    @synchronized([DataManager databaseLock]) {
-        assert(app.host != nil);
-        
-        [app.host removeAppListObject:app];
-        [[self.appDelegate managedObjectContext] deleteObject:app];
+// Only call from within performBlockAndWait!!!
+- (App*) getAppForTemporaryApp:(TemporaryApp*)tempApp withAppRecords:(NSArray*)apps {
+    for (App* app in apps) {
+        if ([app.id isEqualToString:tempApp.id] &&
+            [app.host.uuid isEqualToString:app.host.uuid]) {
+            return app;
+        }
     }
+    
+    return nil;
 }
 
 - (NSArray*) fetchRecords:(NSString*)entityName {
     NSArray* fetchedRecords;
     
-    @synchronized([DataManager databaseLock]) {
-        NSFetchRequest* fetchRequest = [[NSFetchRequest alloc] init];
-        NSEntityDescription* entity = [NSEntityDescription entityForName:entityName inManagedObjectContext:[self.appDelegate managedObjectContext]];
-        [fetchRequest setEntity:entity];
-        [fetchRequest setAffectedStores:[NSArray arrayWithObjects:[[self.appDelegate persistentStoreCoordinator] persistentStoreForURL:[self.appDelegate getStoreURL]], nil]];
-        
-        NSError* error;
-        fetchedRecords = [[self.appDelegate managedObjectContext] executeFetchRequest:fetchRequest error:&error];
-        //TODO: handle errors
-    }
+    NSFetchRequest* fetchRequest = [[NSFetchRequest alloc] init];
+    NSEntityDescription* entity = [NSEntityDescription entityForName:entityName inManagedObjectContext:_managedObjectContext];
+    [fetchRequest setEntity:entity];
+    
+    NSError* error;
+    fetchedRecords = [_managedObjectContext executeFetchRequest:fetchRequest error:&error];
+    //TODO: handle errors
     
     return fetchedRecords;
 }

Limelight/Database/Host.h

@@ -10,18 +10,8 @@
 #import <CoreData/CoreData.h>
 #import "Utils.h"
 
-NS_ASSUME_NONNULL_BEGIN
-
 @interface Host : NSManagedObject
 
-@property (nonatomic) BOOL online;
-@property (nonatomic) PairState pairState;
-@property (nonatomic) NSString * activeAddress;
-
-- (NSComparisonResult)compareName:(Host *)other;
-
 @end
 
-NS_ASSUME_NONNULL_END
-
 #import "Host+CoreDataProperties.h"

Limelight/Database/Host.m

@@ -10,12 +10,4 @@
 
 @implementation Host
 
-@dynamic pairState;
-@synthesize online;
-@synthesize activeAddress;
-
-- (NSComparisonResult)compareName:(Host *)other {
-    return [self.name caseInsensitiveCompare:other.name];
-}
-
 @end

Limelight/Database/TemporaryApp.h

@@ -7,7 +7,8 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "Host.h"
+#import "TemporaryHost.h"
+#import "App.h"
 
 @interface TemporaryApp : NSObject
 
@@ -15,6 +16,16 @@
 @property (nullable, nonatomic, retain) NSData *image;
 @property (nullable, nonatomic, retain) NSString *name;
 @property (nonatomic) BOOL isRunning;
-@property (nullable, nonatomic, retain) Host *host;
+@property (nullable, nonatomic, retain) TemporaryHost *host;
+
+NS_ASSUME_NONNULL_BEGIN
+
+- (id) initFromApp:(App*)app withTempHost:(TemporaryHost*)tempHost;
+
+- (NSComparisonResult)compareName:(TemporaryApp *)other;
+
+- (void) propagateChangesToParent:(App*)parent withHost:(Host*)host;
+
+NS_ASSUME_NONNULL_END
 
 @end

Limelight/Database/TemporaryApp.m

@@ -7,7 +7,46 @@
 //
 
 #import "TemporaryApp.h"
+#import "App.h"
 
 @implementation TemporaryApp
 
+- (id) initFromApp:(App*)app withTempHost:(TemporaryHost*)tempHost {
+    self = [self init];
+    
+    self.id = app.id;
+    self.image = app.image;
+    self.name = app.name;
+    self.host = tempHost;
+    
+    return self;
+}
+
+- (void) propagateChangesToParent:(App*)parent withHost:(Host*)host {
+    parent.id = self.id;
+    parent.name = self.name;
+    parent.host = host;
+}
+
+- (NSComparisonResult)compareName:(TemporaryApp *)other {
+    return [self.name caseInsensitiveCompare:other.name];
+}
+
+- (NSUInteger)hash {
+    return [self.host.uuid hash] * 31 + [self.id intValue];
+}
+
+- (BOOL)isEqual:(id)object {
+    if (self == object) {
+        return YES;
+    }
+    
+    if (![object isKindOfClass:[App class]]) {
+        return NO;
+    }
+    
+    return [self.host.uuid isEqualToString:((App*)object).host.uuid] &&
+    [self.id isEqualToString:((App*)object).id];
+}
+
 @end

Limelight/Database/TemporaryHost.h

@@ -0,0 +1,37 @@
+//
+//  TemporaryHost.h
+//  Moonlight
+//
+//  Created by Cameron Gutman on 12/1/15.
+//  Copyright © 2015 Moonlight Stream. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "Utils.h"
+#import "Host.h"
+
+@interface TemporaryHost : NSObject
+
+@property (nonatomic) BOOL online;
+@property (nonatomic) PairState pairState;
+@property (nonatomic, nullable) NSString * activeAddress;
+
+NS_ASSUME_NONNULL_BEGIN
+
+@property (nonatomic, retain) NSString *address;
+@property (nonatomic, retain) NSString *externalAddress;
+@property (nonatomic, retain) NSString *localAddress;
+@property (nonatomic, retain) NSString *mac;
+@property (nonatomic, retain) NSString *name;
+@property (nonatomic, retain) NSString *uuid;
+@property (nonatomic, retain) NSMutableSet *appList;
+
+- (id) initFromHost:(Host*)host;
+
+- (NSComparisonResult)compareName:(TemporaryHost *)other;
+
+- (void) propagateChangesToParent:(Host*)host;
+
+NS_ASSUME_NONNULL_END
+
+@end

Limelight/Database/TemporaryHost.m

@@ -0,0 +1,77 @@
+//
+//  TemporaryHost.m
+//  Moonlight
+//
+//  Created by Cameron Gutman on 12/1/15.
+//  Copyright © 2015 Moonlight Stream. All rights reserved.
+//
+
+#import "DataManager.h"
+#import "TemporaryHost.h"
+#import "Host.h"
+#import "TemporaryApp.h"
+#import "App.h"
+
+@implementation TemporaryHost
+
+- (id) init {
+    self = [super init];
+    self.appList = [[NSMutableSet alloc] init];
+    
+    return self;
+}
+
+- (id) initFromHost:(Host*)host {
+    self = [self init];
+    
+    self.address = host.address;
+    self.externalAddress = host.externalAddress;
+    self.localAddress = host.localAddress;
+    self.mac = host.mac;
+    self.name = host.name;
+    self.uuid = host.uuid;
+    self.pairState = [host.pairState intValue];
+    
+    NSMutableSet *appList = [[NSMutableSet alloc] init];
+
+    for (App* app in host.appList) {
+        TemporaryApp *tempApp = [[TemporaryApp alloc] initFromApp:app withTempHost:self];
+        [appList addObject:tempApp];
+    }
+    
+    self.appList = appList;
+    
+    return self;
+}
+
+- (void) propagateChangesToParent:(Host*)parentHost {
+    parentHost.address = self.address;
+    parentHost.externalAddress = self.externalAddress;
+    parentHost.localAddress = self.localAddress;
+    parentHost.mac = self.mac;
+    parentHost.name = self.name;
+    parentHost.uuid = self.uuid;
+    parentHost.pairState = [NSNumber numberWithInt:self.pairState];
+}
+
+- (NSComparisonResult)compareName:(TemporaryHost *)other {
+    return [self.name caseInsensitiveCompare:other.name];
+}
+
+- (NSUInteger)hash {
+    return [self.uuid hash];
+}
+
+- (BOOL)isEqual:(id)object {
+    if (self == object) {
+        return YES;
+    }
+    
+    if (![object isKindOfClass:[Host class]]) {
+        return NO;
+    }
+    
+    return [self.uuid isEqualToString:((Host*)object).uuid];
+}
+
+@end

Limelight/Database/TemporarySettings.h

@@ -0,0 +1,25 @@
+//
+//  TemporarySettings.h
+//  Moonlight
+//
+//  Created by Cameron Gutman on 12/1/15.
+//  Copyright © 2015 Moonlight Stream. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "Settings.h"
+
+@interface TemporarySettings : NSObject
+
+@property (nonatomic, retain) Settings * parent;
+
+@property (nonatomic, retain) NSNumber * bitrate;
+@property (nonatomic, retain) NSNumber * framerate;
+@property (nonatomic, retain) NSNumber * height;
+@property (nonatomic, retain) NSNumber * width;
+@property (nonatomic, retain) NSNumber * onscreenControls;
+@property (nonatomic, retain) NSString * uniqueId;
+
+- (id) initFromSettings:(Settings*)settings;
+
+@end

Limelight/Database/TemporarySettings.m

@@ -0,0 +1,28 @@
+//
+//  TemporarySettings.m
+//  Moonlight
+//
+//  Created by Cameron Gutman on 12/1/15.
+//  Copyright © 2015 Moonlight Stream. All rights reserved.
+//
+
+#import "TemporarySettings.h"
+
+@implementation TemporarySettings
+
+- (id) initFromSettings:(Settings*)settings {
+    self = [self init];
+    
+    self.parent = settings;
+    
+    self.bitrate = settings.bitrate;
+    self.framerate = settings.framerate;
+    self.height = settings.height;
+    self.width = settings.width;
+    self.onscreenControls = settings.onscreenControls;
+    self.uniqueId = settings.uniqueId;
+    
+    return self;
+}
+
+@end

Limelight/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -71,6 +71,12 @@
       "idiom" : "ipad",
       "filename" : "app_icon_152x152_@2x.png",
       "scale" : "2x"
+    },
+    {
+      "size" : "83.5x83.5",
+      "idiom" : "ipad",
+      "filename" : "app_icon_167x167_@2x.png",
+      "scale" : "2x"
     }
   ],
   "info" : {

Limelight/Input/StreamView.m

@@ -32,7 +32,7 @@
 - (void) setupOnScreenControls:(ControllerSupport*)controllerSupport swipeDelegate:(id<EdgeDetectionDelegate>)swipeDelegate {
     onScreenControls = [[OnScreenControls alloc] initWithView:self controllerSup:controllerSupport swipeDelegate:swipeDelegate];
     DataManager* dataMan = [[DataManager alloc] init];
-    OnScreenControlsLevel level = (OnScreenControlsLevel)[[dataMan retrieveSettings].onscreenControls integerValue];
+    OnScreenControlsLevel level = (OnScreenControlsLevel)[[dataMan getSettings].onscreenControls integerValue];
     
     if (level == OnScreenControlsLevelAuto) {
         [controllerSupport initAutoOnScreenControlMode:onScreenControls];

Limelight/Limelight-Info.plist

@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.1</string>
+	<string>1.0.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>4</string>
+	<string>1</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.games</string>
 	<key>LSRequiresIPhoneOS</key>

Limelight/Network/AppAssetManager.h

@@ -7,20 +7,20 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "App.h"
+#import "TemporaryApp.h"
 #import "HttpManager.h"
-#import "Host.h"
+#import "TemporaryHost.h"
 
 @protocol AppAssetCallback <NSObject>
 
-- (void) receivedAssetForApp:(App*)app;
+- (void) receivedAssetForApp:(TemporaryApp*)app;
 
 @end
 
 @interface AppAssetManager : NSObject
 
 - (id) initWithCallback:(id<AppAssetCallback>)callback;
-- (void) retrieveAssetsFromHost:(Host*)host;
+- (void) retrieveAssetsFromHost:(TemporaryHost*)host;
 - (void) stopRetrieving;
 
 @end

Limelight/Network/AppAssetManager.m

@@ -28,8 +28,8 @@ static const int MAX_REQUEST_COUNT = 4;
     return self;
 }
 
-- (void) retrieveAssetsFromHost:(Host*)host {
-    for (App* app in host.appList) {
+- (void) retrieveAssetsFromHost:(TemporaryHost*)host {
+    for (TemporaryApp* app in host.appList) {
         if (app.image == nil) {
             AppAssetRetriever* retriever = [[AppAssetRetriever alloc] init];
             retriever.app = app;
@@ -45,7 +45,7 @@ static const int MAX_REQUEST_COUNT = 4;
     [_opQueue cancelAllOperations];
 }
 
-- (void) sendCallBackForApp:(App*)app {
+- (void) sendCallBackForApp:(TemporaryApp*)app {
     [_callback receivedAssetForApp:app];
 }
 

Limelight/Network/AppAssetRetriever.h

@@ -7,14 +7,14 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "Host.h"
-#import "App.h"
+#import "TemporaryHost.h"
+#import "TemporaryApp.h"
 #import "AppAssetManager.h"
 
 @interface AppAssetRetriever : NSOperation
 
-@property (nonatomic) Host* host;
-@property (nonatomic) App* app;
+@property (nonatomic) TemporaryHost* host;
+@property (nonatomic) TemporaryApp* app;
 @property (nonatomic) id<AppAssetCallback> callback;
 
 @end

Limelight/Network/AppAssetRetriever.m

@@ -36,7 +36,7 @@ static const int MAX_ATTEMPTS = 5;
     [self performSelectorOnMainThread:@selector(sendCallbackForApp:) withObject:self.app waitUntilDone:NO];
 }
 
-- (void) sendCallbackForApp:(App*)app {
+- (void) sendCallbackForApp:(TemporaryApp*)app {
     [self.callback receivedAssetForApp:app];
 }
 

Limelight/Network/AppListResponse.h

@@ -11,7 +11,7 @@
 @interface AppListResponse : NSObject <Response>
 
 - (void)populateWithData:(NSData *)data;
-- (NSArray*) getAppList;
+- (NSSet*) getAppList;
 - (BOOL) isStatusOk;
 
 @end

Limelight/Network/AppListResponse.m

@@ -12,7 +12,7 @@
 #import <libxml2/libxml/xmlreader.h>
 
 @implementation AppListResponse {
-    NSMutableArray* _appList;
+    NSMutableSet* _appList;
 }
 @synthesize data, statusCode, statusMessage;
 
@@ -23,7 +23,7 @@ static const char* TAG_APP_IS_RUNNING = "IsRunning";
 
 - (void)populateWithData:(NSData *)xml {
     self.data = xml;
-    _appList = [[NSMutableArray alloc] init];
+    _appList = [[NSMutableSet alloc] init];
     [self parseData];
 }
 
@@ -108,7 +108,7 @@ static const char* TAG_APP_IS_RUNNING = "IsRunning";
     xmlFreeDoc(docPtr);
 }
 
-- (NSArray*) getAppList {
+- (NSSet*) getAppList {
     return _appList;
 }
 

Limelight/Network/DiscoveryManager.h

@@ -8,7 +8,7 @@
 
 #import <Foundation/Foundation.h>
 #import "MDNSManager.h"
-#import "Host.h"
+#import "TemporaryHost.h"
 
 @protocol DiscoveryCallback <NSObject>
 
@@ -22,8 +22,8 @@
 - (void) startDiscovery;
 - (void) stopDiscovery;
 - (void) stopDiscoveryBlocking;
-- (BOOL) addHostToDiscovery:(Host*)host;
-- (void) removeHostFromDiscovery:(Host*)host;
-- (void) discoverHost:(NSString*)hostAddress withCallback:(void (^)(Host*, NSString*))callback;
+- (BOOL) addHostToDiscovery:(TemporaryHost*)host;
+- (void) removeHostFromDiscovery:(TemporaryHost*)host;
+- (void) discoverHost:(NSString*)hostAddress withCallback:(void (^)(TemporaryHost*, NSString*))callback;
 
 @end

Limelight/Network/DiscoveryManager.m

@@ -17,7 +17,6 @@
 
 @implementation DiscoveryManager {
     NSMutableArray* _hostQueue;
-    NSMutableArray* _discoveredHosts;
     id<DiscoveryCallback> _callback;
     MDNSManager* _mdnsMan;
     NSOperationQueue* _opQueue;
@@ -34,16 +33,10 @@
     _callback = callback;
     shouldDiscover = NO;
     _hostQueue = [NSMutableArray array];
-    DataManager* dataMan = [[DataManager alloc] init];
-    for (Host* host in hosts)
+    for (TemporaryHost* host in hosts)
     {
-        if (![self addHostToDiscovery:host])
-        {
-            // Remove the duplicate host from the database
-            [dataMan removeHost:host];
-        }
+        [self addHostToDiscovery:host];
     }
-    [dataMan saveData];
     [_callback updateAllHosts:_hostQueue];
     
     _opQueue = [[NSOperationQueue alloc] init];
@@ -54,20 +47,18 @@
     return self;
 }
 
-- (void) discoverHost:(NSString *)hostAddress withCallback:(void (^)(Host *, NSString*))callback {
+- (void) discoverHost:(NSString *)hostAddress withCallback:(void (^)(TemporaryHost *, NSString*))callback {
     HttpManager* hMan = [[HttpManager alloc] initWithHost:hostAddress uniqueId:_uniqueId deviceName:deviceName cert:_cert];
     ServerInfoResponse* serverInfoResponse = [[ServerInfoResponse alloc] init];
     [hMan executeRequestSynchronously:[HttpRequest requestForResponse:serverInfoResponse withUrlRequest:[hMan newServerInfoRequest] fallbackError:401 fallbackRequest:[hMan newHttpServerInfoRequest]]];
     
-    Host* host = nil;
+    TemporaryHost* host = nil;
     if ([serverInfoResponse isStatusOk]) {
-        DataManager* dataMan = [[DataManager alloc] init];
-        host = [dataMan createHost];
+        host = [[TemporaryHost alloc] init];
         host.activeAddress = host.address = hostAddress;
         host.online = YES;
         [serverInfoResponse populateHost:host];
         if (![self addHostToDiscovery:host]) {
-            [dataMan removeHost:host];
             callback(nil, @"Host already added");
         } else {
             callback(host, nil);
@@ -82,7 +73,7 @@
     Log(LOG_I, @"Starting discovery");
     shouldDiscover = YES;
     [_mdnsMan searchForHosts];
-    for (Host* host in _hostQueue) {
+    for (TemporaryHost* host in _hostQueue) {
         [_opQueue addOperation:[self createWorkerForHost:host]];
     }
 }
@@ -103,7 +94,7 @@
     Log(LOG_I, @"All discovery workers stopped");
 }
 
-- (BOOL) addHostToDiscovery:(Host *)host {
+- (BOOL) addHostToDiscovery:(TemporaryHost *)host {
     if (host.uuid.length > 0 && ![self isHostInDiscovery:host]) {
         [_hostQueue addObject:host];
         if (shouldDiscover) {
@@ -114,7 +105,7 @@
     return NO;
 }
 
-- (void) removeHostFromDiscovery:(Host *)host {
+- (void) removeHostFromDiscovery:(TemporaryHost *)host {
     for (DiscoveryWorker* worker in [_opQueue operations]) {
         if ([worker getHost] == host) {
             [worker cancel];
@@ -126,9 +117,8 @@
 // Override from MDNSCallback
 - (void)updateHosts:(NSArray *)hosts {
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-        DataManager* dataMan = [[DataManager alloc] init];
         // Discover the hosts before adding to eliminate duplicates
-        for (Host* host in hosts) {
+        for (TemporaryHost* host in hosts) {
             Log(LOG_I, @"Found host through MDNS: %@:", host.name);
             // Since this is on a background thread, we do not need to use the opQueue
             DiscoveryWorker* worker = (DiscoveryWorker*)[self createWorkerForHost:host];
@@ -138,16 +128,14 @@
                 [_callback updateAllHosts:_hostQueue];
             } else {
                 Log(LOG_I, @"Not adding host to discovery: %@", host.name);
-                [dataMan removeHost:host];
             }
         }
-        [dataMan saveData];
     });
 }
 
-- (BOOL) isHostInDiscovery:(Host*)host {
+- (BOOL) isHostInDiscovery:(TemporaryHost*)host {
     for (int i = 0; i < _hostQueue.count; i++) {
-        Host* discoveredHost = [_hostQueue objectAtIndex:i];
+        TemporaryHost* discoveredHost = [_hostQueue objectAtIndex:i];
         if (discoveredHost.uuid.length > 0 && [discoveredHost.uuid isEqualToString:host.uuid]) {
             return YES;
         }
@@ -155,7 +143,7 @@
     return NO;
 }
 
-- (NSOperation*) createWorkerForHost:(Host*)host {
+- (NSOperation*) createWorkerForHost:(TemporaryHost*)host {
     DiscoveryWorker* worker = [[DiscoveryWorker alloc] initWithHost:host uniqueId:_uniqueId cert:_cert];
     return worker;
 }

Limelight/Network/DiscoveryWorker.h

@@ -7,12 +7,12 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "Host.h"
+#import "TemporaryHost.h"
 
 @interface DiscoveryWorker : NSOperation
 
-- (id) initWithHost:(Host*)host uniqueId:(NSString*)uniqueId cert:(NSData*)cert;
+- (id) initWithHost:(TemporaryHost*)host uniqueId:(NSString*)uniqueId cert:(NSData*)cert;
 - (void) discoverHost;
-- (Host*) getHost;
+- (TemporaryHost*) getHost;
 
 @end

Limelight/Network/DiscoveryWorker.m

@@ -11,16 +11,17 @@
 #import "HttpManager.h"
 #import "ServerInfoResponse.h"
 #import "HttpRequest.h"
+#import "DataManager.h"
 
 @implementation DiscoveryWorker {
-    Host* _host;
+    TemporaryHost* _host;
     NSString* _uniqueId;
     NSData* _cert;
 }
 
 static const float POLL_RATE = 2.0f; // Poll every 2 seconds
 
-- (id) initWithHost:(Host*)host uniqueId:(NSString*)uniqueId cert:(NSData*)cert {
+- (id) initWithHost:(TemporaryHost*)host uniqueId:(NSString*)uniqueId cert:(NSData*)cert {
     self = [super init];
     _host = host;
     _uniqueId = uniqueId;
@@ -28,7 +29,7 @@ static const float POLL_RATE = 2.0f; // Poll every 2 seconds
     return self;
 }
 
-- (Host*) getHost {
+- (TemporaryHost*) getHost {
     return _host;
 }
 
@@ -100,7 +101,12 @@ static const float POLL_RATE = 2.0f; // Poll every 2 seconds
             ServerInfoResponse* serverInfoResp = [self requestInfoAtAddress:address];
             receivedResponse = [self checkResponse:serverInfoResp];
             if (receivedResponse) {
+                [serverInfoResp populateHost:_host];
                 _host.activeAddress = address;
+                
+                // Update the database using the response
+                DataManager *dataManager = [[DataManager alloc] init];
+                [dataManager updateHost:_host];
                 break;
             }
         }
@@ -137,7 +143,6 @@ static const float POLL_RATE = 2.0f; // Poll every 2 seconds
     if ([response isStatusOk]) {
         // If the response is from a different host then do not update this host
         if ((_host.uuid == nil || [[response getStringTag:TAG_UNIQUE_ID] isEqualToString:_host.uuid])) {
-            [response populateHost:_host];
             return YES;
         } else {
             Log(LOG_I, @"Received response from incorrect host: %@ expected: %@", [response getStringTag:TAG_UNIQUE_ID], _host.uuid);

Limelight/Network/HttpManager.h

@@ -7,7 +7,6 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "Host.h"
 #import "HttpResponse.h"
 #import "HttpRequest.h"
 

Limelight/Network/HttpManager.m

@@ -9,7 +9,7 @@
 #import "HttpManager.h"
 #import "HttpRequest.h"
 #import "CryptoManager.h"
-#import "App.h"
+#import "TemporaryApp.h"
 
 #include <libxml2/libxml/xmlreader.h>
 #include <string.h>

Limelight/Network/HttpResponse.h

@@ -7,7 +7,6 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "Host.h"
 
 static NSString* TAG_STATUS_CODE = @"status_code";
 static NSString* TAG_STATUS_MESSAGE = @"status_message";

Limelight/Network/HttpResponse.m

@@ -7,7 +7,7 @@
 //
 
 #import "HttpResponse.h"
-#import "App.h"
+#import "TemporaryApp.h"
 #import <libxml2/libxml/xmlreader.h>
 
 @implementation HttpResponse {

Limelight/Network/MDNSManager.m

@@ -7,8 +7,7 @@
 //
 
 #import "MDNSManager.h"
-#import "Host.h"
-#import "DataManager.h"
+#import "TemporaryHost.h"
 
 @implementation MDNSManager {
     NSNetServiceBrowser* mDNSBrowser;
@@ -47,10 +46,9 @@ static NSString* NV_SERVICE_TYPE = @"_nvstream._tcp";
 
 - (NSArray*) getFoundHosts {
     NSMutableArray* hosts = [[NSMutableArray alloc] init];
-    DataManager* dataMan = [[DataManager alloc] init];
     for (NSNetService* service in services) {
         if (service.hostName != nil) {
-            Host* host = [dataMan createHost];
+            TemporaryHost* host = [[TemporaryHost alloc] init];
             host.activeAddress = host.address = service.hostName;
             host.name = host.address;
             [hosts addObject:host];

Limelight/Network/ServerInfoResponse.h

@@ -7,6 +7,7 @@
 //
 
 #import "HttpResponse.h"
+#import "TemporaryHost.h"
 
 #define TAG_HOSTNAME @"hostname"
 #define TAG_EXTERNAL_IP @"ExternalIP"
@@ -18,7 +19,7 @@
 @interface ServerInfoResponse : HttpResponse <Response>
 
 - (void) populateWithData:(NSData *)data;
-- (void) populateHost:(Host*)host;
+- (void) populateHost:(TemporaryHost*)host;
 
 @end
 

Limelight/Network/ServerInfoResponse.m

@@ -17,7 +17,7 @@
     [super parseData];
 }
 
-- (void) populateHost:(Host*)host {
+- (void) populateHost:(TemporaryHost*)host {
     host.name = [[self getStringTag:TAG_HOSTNAME] trim];
     host.externalAddress = [[self getStringTag:TAG_EXTERNAL_IP] trim];
     host.localAddress = [[self getStringTag:TAG_LOCAL_IP] trim];

Limelight/Network/WakeOnLanManager.h

@@ -7,10 +7,10 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "Host.h"
+#import "TemporaryHost.h"
 
 @interface WakeOnLanManager : NSObject
 
-+ (void) wakeHost:(Host*)host;
++ (void) wakeHost:(TemporaryHost*)host;
 
 @end

Limelight/Network/WakeOnLanManager.m

@@ -18,7 +18,7 @@
 static const int numPorts = 5;
 static const int ports[numPorts] = {7, 9, 47998, 47999, 48000};
 
-+ (void) wakeHost:(Host*)host {
++ (void) wakeHost:(TemporaryHost*)host {
     NSData* wolPayload = [WakeOnLanManager createPayload:host];
     CFDataRef dataPayload = CFDataCreate(kCFAllocatorDefault, [wolPayload bytes], [wolPayload length]);
     CFSocketRef wolSocket = CFSocketCreate(kCFAllocatorDefault, PF_INET, SOCK_DGRAM, IPPROTO_UDP, 0, NULL, NULL);
@@ -56,7 +56,7 @@ static const int ports[numPorts] = {7, 9, 47998, 47999, 48000};
     CFRelease(dataPayload);
 }
 
-+ (NSData*) createPayload:(Host*)host {
++ (NSData*) createPayload:(TemporaryHost*)host {
     NSMutableData* payload = [[NSMutableData alloc] initWithCapacity:102];
     
     // 6 bytes of FF

Limelight/Stream/StreamManager.m

@@ -49,7 +49,6 @@
     [hMan executeRequestSynchronously:[HttpRequest requestForResponse:serverInfoResp withUrlRequest:[hMan newServerInfoRequest]
                                        fallbackError:401 fallbackRequest:[hMan newHttpServerInfoRequest]]];
     NSString* pairStatus = [serverInfoResp getStringTag:@"PairStatus"];
-    NSString* currentClient = [serverInfoResp getStringTag:@"CurrentClient"];
     NSString* appversion = [serverInfoResp getStringTag:@"appversion"];
     NSString* serverState = [serverInfoResp getStringTag:@"state"];
     if (![serverInfoResp isStatusOk] || pairStatus == NULL || appversion == NULL || serverState == NULL) {
@@ -65,11 +64,6 @@
     
     // resumeApp and launchApp handle calling launchFailed
     if ([serverState hasSuffix:@"_SERVER_BUSY"]) {
-        if (![currentClient isEqualToString:@"1"]) {
-            // The server is streaming to someone else
-            [_callbacks launchFailed:@"There is another stream in progress"];
-            return;
-        }
         // App already running, resume it
         if (![self resumeApp:hMan]) {
             return;

Limelight/UIAppView.h

@@ -7,17 +7,17 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "App.h"
+#import "TemporaryApp.h"
 
 @protocol AppCallback <NSObject>
 
-- (void) appClicked:(App*) app;
+- (void) appClicked:(TemporaryApp*) app;
 
 @end
 
 @interface UIAppView : UIView
 
-- (id) initWithApp:(App*)app cache:(NSCache*)cache andCallback:(id<AppCallback>)callback;
+- (id) initWithApp:(TemporaryApp*)app cache:(NSCache*)cache andCallback:(id<AppCallback>)callback;
 - (void) updateAppImage;
 
 @end

Limelight/UIAppView.m

@@ -9,7 +9,7 @@
 #import "UIAppView.h"
 
 @implementation UIAppView {
-    App* _app;
+    TemporaryApp* _app;
     UIButton* _appButton;
     UILabel* _appLabel;
     UIImageView* _appOverlay;
@@ -19,7 +19,7 @@
 
 static UIImage* noImage;
 
-- (id) initWithApp:(App*)app cache:(NSCache*)cache andCallback:(id<AppCallback>)callback {
+- (id) initWithApp:(TemporaryApp*)app cache:(NSCache*)cache andCallback:(id<AppCallback>)callback {
     self = [super init];
     _app = app;
     _callback = callback;

Limelight/UIComputerView.h

@@ -7,19 +7,19 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "Host.h"
+#import "TemporaryHost.h"
 
 @protocol HostCallback <NSObject>
 
-- (void) hostClicked:(Host*)host view:(UIView*)view;
-- (void) hostLongClicked:(Host*)host view:(UIView*)view;
+- (void) hostClicked:(TemporaryHost*)host view:(UIView*)view;
+- (void) hostLongClicked:(TemporaryHost*)host view:(UIView*)view;
 - (void) addHostClicked;
 
 @end
 
 @interface UIComputerView : UIView
 
-- (id) initWithComputer:(Host*)host andCallback:(id<HostCallback>)callback;
+- (id) initWithComputer:(TemporaryHost*)host andCallback:(id<HostCallback>)callback;
 - (id) initForAddWithCallback:(id<HostCallback>)callback;
 
 @end

Limelight/UIComputerView.m

@@ -9,7 +9,7 @@
 #import "UIComputerView.h"
 
 @implementation UIComputerView {
-    Host* _host;
+    TemporaryHost* _host;
     UIButton* _hostButton;
     UILabel* _hostLabel;
     UILabel* _hostStatus;
@@ -72,7 +72,7 @@ static const int LABEL_DY = 20;
     return self;
 }
 
-- (id) initWithComputer:(Host*)host andCallback:(id<HostCallback>)callback {
+- (id) initWithComputer:(TemporaryHost*)host andCallback:(id<HostCallback>)callback {
     self = [self init];
     _host = host;
     _callback = callback;
@@ -123,7 +123,7 @@ static const int LABEL_DY = 20;
     self.frame = CGRectMake(x, y, width, height);
 }
 
-- (void) updateContentsForHost:(Host*)host {
+- (void) updateContentsForHost:(TemporaryHost*)host {
     _hostLabel.text = _host.name;
     _hostLabel.textColor = [UIColor whiteColor];
     [_hostLabel sizeToFit];

Limelight/ViewControllers/MainFrameViewController.m

@@ -15,10 +15,9 @@
 #import "Utils.h"
 #import "UIComputerView.h"
 #import "UIAppView.h"
-#import "App.h"
 #import "SettingsViewController.h"
 #import "DataManager.h"
-#import "Settings.h"
+#import "TemporarySettings.h"
 #import "WakeOnLanManager.h"
 #import "AppListResponse.h"
 #import "ServerInfoResponse.h"
@@ -30,7 +29,7 @@
 
 @implementation MainFrameViewController {
     NSOperationQueue* _opQueue;
-    Host* _selectedHost;
+    TemporaryHost* _selectedHost;
     NSString* _uniqueId;
     NSData* _cert;
     DiscoveryManager* _discMan;
@@ -80,7 +79,7 @@ static NSMutableSet* hostList;
     
     // Capture the host here because it can change once we
     // leave the main thread
-    Host* host = _selectedHost;
+    TemporaryHost* host = _selectedHost;
     
     if ([host.appList count] > 0) {
         usingCachedAppList = true;
@@ -141,7 +140,7 @@ static NSMutableSet* hostList;
             });
         } else {
             dispatch_async(dispatch_get_main_queue(), ^{
-                [self mergeAppLists:[appListResp getAppList] forHost:host];
+                [self updateApplist:[appListResp getAppList] forHost:host];
 
                 if (host != _selectedHost) {
                     return;
@@ -159,11 +158,12 @@ static NSMutableSet* hostList;
     });
 }
 
-- (void) mergeAppLists:(NSArray*) newList forHost:(Host*)host {
+- (void) updateApplist:(NSSet*) newList forHost:(TemporaryHost*)host {
     DataManager* database = [[DataManager alloc] init];
+    
     for (TemporaryApp* app in newList) {
-        BOOL appAlreadyInList = NO; 
-        for (App* savedApp in host.appList) {
+        BOOL appAlreadyInList = NO;
+        for (TemporaryApp* savedApp in host.appList) {
             if ([app.id isEqualToString:savedApp.id]) {
                 savedApp.name = app.name;
                 savedApp.isRunning = app.isRunning;
@@ -173,7 +173,7 @@ static NSMutableSet* hostList;
         }
         if (!appAlreadyInList) {
             app.host = host;
-            [database addAppFromTemporaryApp:app];
+            [host.appList addObject:app];
         }
     }
     
@@ -181,9 +181,9 @@ static NSMutableSet* hostList;
     do {
         appWasRemoved = NO;
         
-        for (App* app in host.appList) {
+        for (TemporaryApp* app in host.appList) {
             appWasRemoved = YES;
-            for (App* mergedApp in newList) {
+            for (TemporaryApp* mergedApp in newList) {
                 if ([mergedApp.id isEqualToString:app.id]) {
                     appWasRemoved = NO;
                     break;
@@ -192,7 +192,14 @@ static NSMutableSet* hostList;
             if (appWasRemoved) {
                 // Removing the app mutates the list we're iterating (which isn't legal).
                 // We need to jump out of this loop and restart enumeration.
-                [database removeAppFromHost:app];
+                
+                [host.appList removeObject:app];
+                
+                // It's important to remove the app record from the database
+                // since we'll have a constraint violation now that appList
+                // doesn't have this app in it.
+                [database removeApp:app];
+                
                 break;
             }
         }
@@ -200,23 +207,25 @@ static NSMutableSet* hostList;
         // Keep looping until the list is no longer being mutated
     } while (appWasRemoved);
 
-    [database saveData];
+    [database updateAppsForExistingHost:host];
 }
 
 - (void)showHostSelectionView {
     [_appManager stopRetrieving];
-    [[[DataManager alloc] init] saveData];
     _selectedHost = nil;
     _computerNameButton.title = @"No Host Selected";
     [self.collectionView reloadData];
     [self.view addSubview:hostScrollView];
 }
 
-- (void) receivedAssetForApp:(App*)app {
+- (void) receivedAssetForApp:(TemporaryApp*)app {
     // Update the box art cache now so we don't have to do it
     // on the main thread
     [self updateBoxArtCacheForApp:app];
     
+    DataManager* dataManager = [[DataManager alloc] init];
+    [dataManager updateIconForExistingApp: app];
+    
     dispatch_async(dispatch_get_main_queue(), ^{
         [self.collectionView reloadData];
     });
@@ -230,7 +239,7 @@ static NSMutableSet* hostList;
     [self presentViewController:alert animated:YES completion:nil];
 }
 
-- (void) hostClicked:(Host *)host view:(UIView *)view {
+- (void) hostClicked:(TemporaryHost *)host view:(UIView *)view {
     // Treat clicks on offline hosts to be long clicks
     // This shows the context menu with wake, delete, etc. rather
     // than just hanging for a while and failing as we would in this
@@ -296,7 +305,7 @@ static NSMutableSet* hostList;
     });
 }
 
-- (void)hostLongClicked:(Host *)host view:(UIView *)view {
+- (void)hostLongClicked:(TemporaryHost *)host view:(UIView *)view {
     Log(LOG_D, @"Long clicked host: %@", host.name);
     UIAlertController* longClickAlert = [UIAlertController alertControllerWithTitle:host.name message:@"" preferredStyle:UIAlertControllerStyleActionSheet];
     if (!host.online) {
@@ -322,8 +331,8 @@ static NSMutableSet* hostList;
         [dataMan removeHost:host];
         @synchronized(hostList) {
             [hostList removeObject:host];
+            [self updateAllHosts:[hostList allObjects]];
         }
-        [self updateAllHosts:[hostList allObjects]];
         
     }]];
     [longClickAlert addAction:[UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel handler:nil]];
@@ -345,10 +354,8 @@ static NSMutableSet* hostList;
     [alertController addAction:[UIAlertAction actionWithTitle:@"OK" style:UIAlertActionStyleDefault handler:^(UIAlertAction* action){
         NSString* hostAddress = ((UITextField*)[[alertController textFields] objectAtIndex:0]).text;
         dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
-            [_discMan discoverHost:hostAddress withCallback:^(Host* host, NSString* error){
+            [_discMan discoverHost:hostAddress withCallback:^(TemporaryHost* host, NSString* error){
                 if (host != nil) {
-                    DataManager* dataMan = [[DataManager alloc] init];
-                    [dataMan saveData];
                     dispatch_async(dispatch_get_main_queue(), ^{
                         @synchronized(hostList) {
                             [hostList addObject:host];
@@ -369,14 +376,14 @@ static NSMutableSet* hostList;
     [self presentViewController:alertController animated:YES completion:nil];
 }
 
-- (void) appClicked:(App *)app {
+- (void) appClicked:(TemporaryApp *)app {
     Log(LOG_D, @"Clicked app: %@", app.name);
     _streamConfig = [[StreamConfiguration alloc] init];
     _streamConfig.host = app.host.activeAddress;
     _streamConfig.appID = app.id;
     
     DataManager* dataMan = [[DataManager alloc] init];
-    Settings* streamSettings = [dataMan retrieveSettings];
+    TemporarySettings* streamSettings = [dataMan getSettings];
     
     _streamConfig.frameRate = [streamSettings.framerate intValue];
     _streamConfig.bitRate = [streamSettings.bitrate intValue];
@@ -389,7 +396,7 @@ static NSMutableSet* hostList;
         [[self revealViewController] revealToggle:self];
     }
     
-    App* currentApp = [self findRunningApp:app.host];
+    TemporaryApp* currentApp = [self findRunningApp:app.host];
     if (currentApp != nil) {
         UIAlertController* alertController = [UIAlertController
                                               alertControllerWithTitle: app.name
@@ -455,8 +462,8 @@ static NSMutableSet* hostList;
     }
 }
 
-- (App*) findRunningApp:(Host*)host {
-    for (App* app in host.appList) {
+- (TemporaryApp*) findRunningApp:(TemporaryHost*)host {
+    for (TemporaryApp* app in host.appList) {
         if (app.isRunning) {
             return app;
         }
@@ -593,19 +600,16 @@ static NSMutableSet* hostList;
     
     // Purge the box art cache
     [_boxArtCache removeAllObjects];
-    
-    // In case the host objects were updated in the background
-    [[[DataManager alloc] init] saveData];
 }
 
 - (void) retrieveSavedHosts {
     DataManager* dataMan = [[DataManager alloc] init];
-    NSArray* hosts = [dataMan retrieveHosts];
+    NSArray* hosts = [dataMan getHosts];
     @synchronized(hostList) {
         [hostList addObjectsFromArray:hosts];
         
         // Initialize the non-persistent host state
-        for (Host* host in hostList) {
+        for (TemporaryHost* host in hostList) {
             if (host.activeAddress == nil) {
                 host.activeAddress = host.localAddress;
             }
@@ -622,7 +626,7 @@ static NSMutableSet* hostList;
 - (void) updateAllHosts:(NSArray *)hosts {
     dispatch_async(dispatch_get_main_queue(), ^{
         Log(LOG_D, @"New host list:");
-        for (Host* host in hosts) {
+        for (TemporaryHost* host in hosts) {
             Log(LOG_D, @"Host: \n{\n\t name:%@ \n\t address:%@ \n\t localAddress:%@ \n\t externalAddress:%@ \n\t uuid:%@ \n\t mac:%@ \n\t pairState:%d \n\t online:%d \n\t activeAddress:%@ \n}", host.name, host.address, host.localAddress, host.externalAddress, host.uuid, host.mac, host.pairState, host.online, host.activeAddress);
         }
         @synchronized(hostList) {
@@ -642,7 +646,7 @@ static NSMutableSet* hostList;
     @synchronized (hostList) {
         // Sort the host list in alphabetical order
         NSArray* sortedHostList = [[hostList allObjects] sortedArrayUsingSelector:@selector(compareName:)];
-        for (Host* comp in sortedHostList) {
+        for (TemporaryHost* comp in sortedHostList) {
             compView = [[UIComputerView alloc] initWithComputer:comp andCallback:self];
             compView.center = CGPointMake([self getCompViewX:compView addComp:addComp prevEdge:prevEdge], hostScrollView.frame.size.height / 2);
             prevEdge = compView.frame.origin.x + compView.frame.size.width;
@@ -667,7 +671,7 @@ static NSMutableSet* hostList;
 
 // This function forces immediate decoding of the UIImage, rather
 // than the default lazy decoding that results in janky scrolling.
-+ (UIImage*) loadBoxArtForCaching:(App*)app {
++ (UIImage*) loadBoxArtForCaching:(TemporaryApp*)app {
     
     CGImageSourceRef source = CGImageSourceCreateWithData((__bridge CFDataRef)app.image, NULL);
     CGImageRef cgImage = CGImageSourceCreateImageAtIndex(source, 0, (__bridge CFDictionaryRef)@{(id)kCGImageSourceShouldCacheImmediately: (id)kCFBooleanTrue});
@@ -680,7 +684,7 @@ static NSMutableSet* hostList;
     return boxArt;
 }
 
-- (void) updateBoxArtCacheForApp:(App*)app {
+- (void) updateBoxArtCacheForApp:(TemporaryApp*)app {
     if (app.image == nil) {
         [_boxArtCache removeObjectForKey:app];
     }
@@ -689,7 +693,7 @@ static NSMutableSet* hostList;
     }
 }
 
-- (void) updateAppsForHost:(Host*)host {
+- (void) updateAppsForHost:(TemporaryHost*)host {
     if (host != _selectedHost) {
         Log(LOG_W, @"Mismatched host during app update");
         return;
@@ -715,12 +719,12 @@ static NSMutableSet* hostList;
     
     // Start 2 jobs
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-        for (App* app in firstHalf) {
+        for (TemporaryApp* app in firstHalf) {
             [self updateBoxArtCacheForApp:app];
         }
     });
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-        for (App* app in secondHalf) {
+        for (TemporaryApp* app in secondHalf) {
             [self updateBoxArtCacheForApp:app];
         }
     });
@@ -732,7 +736,7 @@ static NSMutableSet* hostList;
 - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath {
     UICollectionViewCell* cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"AppCell" forIndexPath:indexPath];
     
-    App* app = _sortedAppList[indexPath.row];
+    TemporaryApp* app = _sortedAppList[indexPath.row];
     UIAppView* appView = [[UIAppView alloc] initWithApp:app cache:_boxArtCache andCallback:self];
     [appView updateAppImage];
     

Limelight/ViewControllers/SettingsViewController.m

@@ -7,7 +7,7 @@
 //
 
 #import "SettingsViewController.h"
-#import "Settings.h"
+#import "TemporarySettings.h"
 #import "DataManager.h"
 
 #define BITRATE_INTERVAL 500 // in kbps
@@ -22,7 +22,7 @@ static NSString* bitrateFormat = @"Bitrate: %.1f Mbps";
     [super viewDidLoad];
     
     DataManager* dataMan = [[DataManager alloc] init];
-    Settings* currentSettings = [dataMan retrieveSettings];
+    TemporarySettings* currentSettings = [dataMan getSettings];
     
     // Bitrate is persisted in kbps
     _bitrate = [currentSettings.bitrate integerValue];

Moonlight.xcodeproj/project.pbxproj

@@ -9,6 +9,8 @@
 /* Begin PBXBuildFile section */
 		9832D1361BBCD5C50036EF48 /* TemporaryApp.m in Sources */ = {isa = PBXBuildFile; fileRef = 9832D1351BBCD5C50036EF48 /* TemporaryApp.m */; };
 		987140041B04542F00AB57D5 /* libmoonlight-common.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FB1E43101AE8B0F200AFF679 /* libmoonlight-common.a */; };
+		98D5856D1C0EA79600F6CC00 /* TemporaryHost.m in Sources */ = {isa = PBXBuildFile; fileRef = 98D5856C1C0EA79600F6CC00 /* TemporaryHost.m */; };
+		98D585701C0ED0E800F6CC00 /* TemporarySettings.m in Sources */ = {isa = PBXBuildFile; fileRef = 98D5856F1C0ED0E800F6CC00 /* TemporarySettings.m */; };
 		9E5D600B1A5A5A3900689918 /* Apache License.txt in Resources */ = {isa = PBXBuildFile; fileRef = 9E5D5FF81A5A5A3900689918 /* Apache License.txt */; };
 		9E5D600C1A5A5A3900689918 /* Roboto-Black.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 9E5D5FF91A5A5A3900689918 /* Roboto-Black.ttf */; };
 		9E5D600E1A5A5A3900689918 /* Roboto-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 9E5D5FFB1A5A5A3900689918 /* Roboto-Bold.ttf */; };
@@ -98,6 +100,10 @@
 		9832D1341BBCD5C50036EF48 /* TemporaryApp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TemporaryApp.h; path = Database/TemporaryApp.h; sourceTree = "<group>"; };
 		9832D1351BBCD5C50036EF48 /* TemporaryApp.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TemporaryApp.m; path = Database/TemporaryApp.m; sourceTree = "<group>"; };
 		98A03B4519F3514B00861ACA /* moonlight-common.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "moonlight-common.xcodeproj"; path = "limelight-common-c/moonlight-common.xcodeproj"; sourceTree = "<group>"; };
+		98D5856B1C0EA79600F6CC00 /* TemporaryHost.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TemporaryHost.h; path = Database/TemporaryHost.h; sourceTree = "<group>"; };
+		98D5856C1C0EA79600F6CC00 /* TemporaryHost.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TemporaryHost.m; path = Database/TemporaryHost.m; sourceTree = "<group>"; };
+		98D5856E1C0ED0E800F6CC00 /* TemporarySettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TemporarySettings.h; path = Database/TemporarySettings.h; sourceTree = "<group>"; };
+		98D5856F1C0ED0E800F6CC00 /* TemporarySettings.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TemporarySettings.m; path = Database/TemporarySettings.m; sourceTree = "<group>"; };
 		9E5D5FF81A5A5A3900689918 /* Apache License.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "Apache License.txt"; sourceTree = "<group>"; };
 		9E5D5FF91A5A5A3900689918 /* Roboto-Black.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Roboto-Black.ttf"; sourceTree = "<group>"; };
 		9E5D5FFB1A5A5A3900689918 /* Roboto-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Roboto-Bold.ttf"; sourceTree = "<group>"; };
@@ -733,6 +739,10 @@
 				FBD349611A0089F6002D2A60 /* DataManager.m */,
 				9832D1341BBCD5C50036EF48 /* TemporaryApp.h */,
 				9832D1351BBCD5C50036EF48 /* TemporaryApp.m */,
+				98D5856B1C0EA79600F6CC00 /* TemporaryHost.h */,
+				98D5856C1C0EA79600F6CC00 /* TemporaryHost.m */,
+				98D5856E1C0ED0E800F6CC00 /* TemporarySettings.h */,
+				98D5856F1C0ED0E800F6CC00 /* TemporarySettings.m */,
 			);
 			name = Database;
 			sourceTree = "<group>";
@@ -855,11 +865,13 @@
 				FB89462D19F646E200339C8A /* MDNSManager.m in Sources */,
 				FB89462B19F646E200339C8A /* StreamView.m in Sources */,
 				FB4678FA1A55FFAD00377732 /* DiscoveryManager.m in Sources */,
+				98D5856D1C0EA79600F6CC00 /* TemporaryHost.m in Sources */,
 				FB89463519F646E200339C8A /* MainFrameViewController.m in Sources */,
 				FBD1C8E21A8AD71400C6703C /* Logger.m in Sources */,
 				FB1D599A1BBCCD7E00F482CA /* AppCollectionView.m in Sources */,
 				FB89463619F646E200339C8A /* StreamFrameViewController.m in Sources */,
 				9832D1361BBCD5C50036EF48 /* TemporaryApp.m in Sources */,
+				98D585701C0ED0E800F6CC00 /* TemporarySettings.m in Sources */,
 				FB89462819F646E200339C8A /* CryptoManager.m in Sources */,
 				FB89462E19F646E200339C8A /* PairManager.m in Sources */,
 				FB9AFD371A7E02DB00872C98 /* HttpRequest.m in Sources */,

README.md

@@ -2,7 +2,13 @@
 
 #### Now available on the [App Store](https://itunes.apple.com/us/app/moonlight-game-streaming/id1000551566?mt=8) 
 
-[Moonlight](https://github.com/moonlight-stream) is an open source implementation of NVIDIA's GameStream, as used by the NVIDIA Shield, but built for iOS. Moonlight iOS allows you to stream your full collection of Steam games from
+[Moonlight](http://moonlight-stream.com) is an open source implementation of NVIDIA's GameStream, as used by the NVIDIA Shield, but built for iOS. Moonlight iOS allows you to stream your full collection of Steam games from
 your powerful desktop computer to your iOS Device.
 
 There are also versions for [Android](https://github.com/moonlight-stream/moonlight-android) and [PC](https://github.com/moonlight-stream/moonlight-pc). 
+
+##### Apple TV Note: 
+We current cannot write a port for Apple TV due to a limitation in the tvOS SDK that prevents Moonlight from using the APIs that would be necessary for it to work. Thank you for your interest - you can track this issue [here](https://github.com/moonlight-stream/moonlight-ios/issues/184). 
+
+##### Questions?
+Check out our [wiki](https://github.com/moonlight-stream/moonlight-android/wiki).