Removed "Headers" build phase from common and created v1.0.4

This reverts commit ad0705d126.

.gitignore

@@ -1,2 +1,3 @@
 **/xcuserdata/
+**/Moonlight.xcscmblueprint
 Build

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "limelight-common-c"]
+[submodule "moonlight-common/moonlight-common-c"]
-	path = limelight-common-c
+	path = moonlight-common/moonlight-common-c
-	url = git@github.com:limelight-stream/limelight-common-c.git
+	url = https://github.com/moonlight-stream/moonlight-common-c.git

BuildScripts/Opus/build.sh

@@ -31,43 +31,44 @@ do
       exit 1
     fi
     echo "Compiling source for $ARCH in directory $OPUS_DIR"
-
+    echo "cd $OPUS_DIR"
     cd $OPUS_DIR
 
     DIST_DIR=$DIST_DIR_BASE-$ARCH
+    echo "mkdir -p $DIST_DIR"
     mkdir -p $DIST_DIR
     CFLAGS_ARCH=$ARCH
     case $ARCH in
         armv7)
             EXTRA_FLAGS="--with-pic --enable-fixed-point"
-            EXTRA_CFLAGS="-mcpu=cortex-a8 -mfpu=neon"
+            EXTRA_CFLAGS="-mcpu=cortex-a8 -mfpu=neon -miphoneos-version-min=7.1"
             PLATFORM="${PLATFORMBASE}/iPhoneOS.platform"
-            IOSSDK=iPhoneOS${IOSSDK_VER}
+            IOSSDK=iPhoneOS
             ;;
         armv7s)
             EXTRA_FLAGS="--with-pic --enable-fixed-point"
-            EXTRA_CFLAGS="-mcpu=cortex-a9 -mfpu=neon -miphoneos-version-min=6.0"
+            EXTRA_CFLAGS="-mcpu=cortex-a9 -mfpu=neon -miphoneos-version-min=7.1"
             PLATFORM="${PLATFORMBASE}/iPhoneOS.platform"
-            IOSSDK=iPhoneOS${IOSSDK_VER}
+            IOSSDK=iPhoneOS
             ;;
         aarch64)
             CFLAGS_ARCH="arm64"
             EXTRA_FLAGS="--with-pic --enable-fixed-point"
             EXTRA_CFLAGS="-miphoneos-version-min=7.1"
             PLATFORM="${PLATFORMBASE}/iPhoneOS.platform"
-            IOSSDK=iPhoneOS${IOSSDK_VER}
+            IOSSDK=iPhoneOS
           ;;
         x86_64)
             EXTRA_FLAGS="--with-pic"
             EXTRA_CFLAGS="-miphoneos-version-min=7.1"
             PLATFORM="${PLATFORMBASE}/iPhoneSimulator.platform"
-            IOSSDK=iPhoneSimulator${IOSSDK_VER}
+            IOSSDK=iPhoneSimulator
           ;;
         i386)
             EXTRA_FLAGS="--with-pic"
             EXTRA_CFLAGS="-miphoneos-version-min=7.1"
             PLATFORM="${PLATFORMBASE}/iPhoneSimulator.platform"
-            IOSSDK=iPhoneSimulator${IOSSDK_VER}
+            IOSSDK=iPhoneSimulator
             ;;
         *)
             echo "Unsupported architecture ${ARCH}"
@@ -76,7 +77,7 @@ do
     esac
 
     echo "Configuring opus for $ARCH..."
-	
+    echo "./autogen.sh"	
 	./autogen.sh
 	
 	CFLAGS="-g -O2 -pipe -arch ${CFLAGS_ARCH} \
@@ -87,6 +88,9 @@ do
 		-isysroot ${PLATFORM}/Developer/SDKs/${IOSSDK}.sdk \
 		-L${PLATFORM}/Developer/SDKs/${IOSSDK}.sdk/usr/lib"
 
+    echo "CFLAGS=$CFLAGS"
+    echo "LDFLAGS=$LDFLAGS"
+
 	export CFLAGS
 	export LDFLAGS
 	
@@ -100,6 +104,14 @@ do
     export NM="/usr/bin/nm"
     export RANLIB="/usr/bin/ranlib"
     export STRIP="/usr/bin/strip"
+    echo "./configure \
+    	--prefix=$DIST_DIR \
+		--host=${ARCH}-apple-darwin \
+		--with-sysroot=${PLATFORM}/Developer/SDKs/${IOSSDK}.sdk \
+		--enable-static=yes \
+		--enable-shared=no \
+	    --disable-doc \
+		${EXTRA_FLAGS}"
 
     ./configure \
     	--prefix=$DIST_DIR \
@@ -111,10 +123,14 @@ do
 		${EXTRA_FLAGS}
 
     echo "Installing opus for $ARCH..."
+    echo "make clean"
     make clean
+    echo "make -j$NJOB V=1"
     make -j$NJOB V=1
+    echo "make install"
     make install
 
+    echo "cd $SCRIPT_DIR"
     cd $SCRIPT_DIR
 
     if [ -d $DIST_DIR/bin ]

BuildScripts/Opus/sync.sh

@@ -7,7 +7,6 @@ source config.sh
 SCRIPT_DIR=$( (cd -P $(dirname $0) && pwd) )
 DIST_DIR_BASE=${DIST_DIR_BASE:="$SCRIPT_DIR/dist"}
 
-git submodule update --init opus
 cd opus
 git checkout master 
 git pull origin master 

Launch Screen.xib

@@ -1,33 +1,51 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="15A279b" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="iN0-l3-epB">
+        <navigationController id="vV9-32-ww6">
-            <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
+            <simulatedOrientationMetrics key="simulatedOrientationMetrics" orientation="landscapeRight"/>
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <navigationBar key="navigationBar" contentMode="scaleToFill" id="y2P-aE-Haa">
-            <subviews>
+                <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="  Copyright (c) 2015 Moonlight Stream. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
+                <autoresizingMask key="autoresizingMask"/>
-                    <rect key="frame" x="19" y="439" width="444" height="21"/>
+                <animations/>
-                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                <color key="barTintColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
-                    <color key="textColor" red="0.72941176470000002" green="0.69411764710000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            </navigationBar>
-                    <nil key="highlightedColor"/>
+            <viewControllers>
-                    <variation key="widthClass=compact">
+                <viewController id="l6V-ue-5Om">
-                        <fontDescription key="fontDescription" type="system" pointSize="11"/>
+                    <layoutGuides>
-                    </variation>
+                        <viewControllerLayoutGuide type="top" id="rEZ-vx-akr"/>
-                </label>
+                        <viewControllerLayoutGuide type="bottom" id="gBD-cy-cth"/>
-            </subviews>
+                    </layoutGuides>
-            <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                    <view key="view" contentMode="scaleToFill" id="6lF-fc-kpK">
-            <constraints>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                <constraint firstAttribute="bottom" secondItem="8ie-xW-0ye" secondAttribute="bottom" constant="20" id="Gnz-uJ-CDw"/>
+                        <animations/>
-                <constraint firstAttribute="centerX" secondItem="8ie-xW-0ye" secondAttribute="centerX" id="ZEH-qu-HZ9"/>
+                        <color key="backgroundColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
-            </constraints>
+                    </view>
-            <nil key="simulatedStatusBarMetrics"/>
+                    <navigationItem key="navigationItem" id="rW0-BH-s7l">
-            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+                        <barButtonItem key="leftBarButtonItem" enabled="NO" id="d9R-Zo-Uml">
-            <point key="canvasLocation" x="404" y="445"/>
+                            <button key="customView" opaque="NO" contentMode="center" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="9JC-B5-BAE">
-        </view>
+                                <rect key="frame" x="-23" y="-15" width="46" height="30"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <animations/>
+                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                                <state key="normal" title="Moonlight" image="Logo">
+                                    <color key="titleColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="titleShadowColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
+                                </state>
+                                <variation key="widthClass=regular" preservesSuperviewLayoutMargins="NO"/>
+                            </button>
+                        </barButtonItem>
+                    </navigationItem>
+                </viewController>
+            </viewControllers>
+        </navigationController>
     </objects>
+    <resources>
+        <image name="Logo" width="32" height="32"/>
+    </resources>
 </document>

Limelight/App.h

@@ -1,18 +0,0 @@
-//
-//  App.h
-//  Moonlight
-//
-//  Created by Diego Waxemberg on 10/22/14.
-//  Copyright (c) 2014 Moonlight Stream. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-@interface App : NSObject
-
-@property NSString* appId;
-@property NSString* appName;
-@property UIImage* appImage;
-@property BOOL isRunning;
-
-@end

Limelight/App.m

@@ -1,15 +0,0 @@
-//
-//  App.m
-//  Moonlight
-//
-//  Created by Diego Waxemberg on 10/22/14.
-//  Copyright (c) 2014 Moonlight Stream. All rights reserved.
-//
-
-#import "App.h"
-#import "HttpManager.h"
-
-@implementation App
-@synthesize appId, appName, appImage, isRunning;
-
-@end

Limelight/AppCollectionView.h

@@ -0,0 +1,13 @@
+//
+//  AppCollectionView.h
+//  Moonlight
+//
+//  Created by Diego Waxemberg on 9/30/15.
+//  Copyright © 2015 Moonlight Stream. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface AppCollectionView : UICollectionView
+
+@end

Limelight/AppCollectionView.m

@@ -0,0 +1,28 @@
+//
+//  AppCollectionView.m
+//  Moonlight
+//
+//  Created by Diego Waxemberg on 9/30/15.
+//  Copyright © 2015 Moonlight Stream. All rights reserved.
+//
+
+#import "AppCollectionView.h"
+
+@implementation AppCollectionView
+
+- (BOOL)touchesShouldCancelInContentView:(UIView *)view {
+    if ([view isKindOfClass:[UIButton class]]) {
+        return YES;
+    }
+    return [super touchesShouldCancelInContentView:view];
+}
+
+/*
+// Only override drawRect: if you perform custom drawing.
+// An empty implementation adversely affects performance during animation.
+- (void)drawRect:(CGRect)rect {
+    // Drawing code
+}
+*/
+
+@end

Limelight/AppDelegate.m

@@ -83,10 +83,7 @@ static NSOperationQueue* mainQueue;
     NSManagedObjectContext *managedObjectContext = self.managedObjectContext;
     if (managedObjectContext != nil) {
         if ([managedObjectContext hasChanges] && ![managedObjectContext save:&error]) {
-             // Replace this implementation with code to handle the error appropriately.
+            Log(LOG_E, @"Critical database error: %@, %@", error, [error userInfo]);
-             // abort() causes the application to generate a crash log and terminate. You should not use this function in a shipping application, although it may be useful during development.
-            Log(LOG_E, @"Unresolved error %@, %@", error, [error userInfo]);
-            abort();
         } 
     }
 }
@@ -103,7 +100,7 @@ static NSOperationQueue* mainQueue;
     
     NSPersistentStoreCoordinator *coordinator = [self persistentStoreCoordinator];
     if (coordinator != nil) {
-        _managedObjectContext = [[NSManagedObjectContext alloc] init];
+        _managedObjectContext = [[NSManagedObjectContext alloc] initWithConcurrencyType:NSPrivateQueueConcurrencyType];
         [_managedObjectContext setPersistentStoreCoordinator:coordinator];
     }
     return _managedObjectContext;
@@ -136,31 +133,14 @@ static NSOperationQueue* mainQueue;
                              [NSNumber numberWithBool:YES], NSMigratePersistentStoresAutomaticallyOption,
                              [NSNumber numberWithBool:YES], NSInferMappingModelAutomaticallyOption, nil];
     if (![_persistentStoreCoordinator addPersistentStoreWithType:NSSQLiteStoreType configuration:nil URL:storeURL options:options error:&error]) {
-        /*
+        // Log the error
-         Replace this implementation with code to handle the error appropriately.
+        Log(LOG_E, @"Critical database error: %@, %@", error, [error userInfo]);
         
-         abort() causes the application to generate a crash log and terminate. You should not use this function in a shipping application, although it may be useful during development. 
+        // Drop the database
+        [[NSFileManager defaultManager] removeItemAtURL:storeURL error:nil];
         
-         Typical reasons for an error here include:
+        // Try again
-         * The persistent store is not accessible;
+        return [self persistentStoreCoordinator];
-         * The schema for the persistent store is incompatible with current managed object model.
-         Check the error message to determine what the actual problem was.
-         
-         
-         If the persistent store is not accessible, there is typically something wrong with the file path. Often, a file URL is pointing into the application's resources directory instead of a writeable directory.
-         
-         If you encounter schema incompatibility errors during development, you can reduce their frequency by:
-         * Simply deleting the existing store:
-         [[NSFileManager defaultManager] removeItemAtURL:storeURL error:nil]
-         
-         * Performing automatic lightweight migration by passing the following dictionary as the options parameter:
-         @{NSMigratePersistentStoresAutomaticallyOption:@YES, NSInferMappingModelAutomaticallyOption:@YES}
-         
-         Lightweight migration will only work for a limited set of schema changes; consult "Core Data Model Versioning and Data Migration Programming Guide" for details.
-         
-         */
-        Log(LOG_E, @"Unresolved error %@, %@", error, [error userInfo]);
-        abort();
     }
     
     return _persistentStoreCoordinator;

Limelight/ComputerScrollView.h

@@ -0,0 +1,13 @@
+//
+//  ComputerScrollView.h
+//  Moonlight
+//
+//  Created by Diego Waxemberg on 9/30/15.
+//  Copyright © 2015 Moonlight Stream. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface ComputerScrollView : UIScrollView
+
+@end

Limelight/ComputerScrollView.m

@@ -0,0 +1,28 @@
+//
+//  ComputerScrollView.m
+//  Moonlight
+//
+//  Created by Diego Waxemberg on 9/30/15.
+//  Copyright © 2015 Moonlight Stream. All rights reserved.
+//
+
+#import "ComputerScrollView.h"
+
+@implementation ComputerScrollView
+
+- (BOOL)touchesShouldCancelInContentView:(UIView *)view {
+    if ([view isKindOfClass:[UIButton class]]) {
+        return YES;
+    }
+    return [super touchesShouldCancelInContentView:view];
+}
+
+/*
+// Only override drawRect: if you perform custom drawing.
+// An empty implementation adversely affects performance during animation.
+- (void)drawRect:(CGRect)rect {
+    // Drawing code
+}
+*/
+
+@end

Limelight/Crypto/CryptoManager.h

@@ -11,14 +11,16 @@
 @interface CryptoManager : NSObject
 
 + (void) generateKeyPairUsingSSl;
-+ (NSString*) getUniqueID;
 + (NSData*) readCertFromFile;
 + (NSData*) readKeyFromFile;
 + (NSData*) readP12FromFile;
 + (NSData*) getSignatureFromCert:(NSData*)cert;
++ (NSData*) nullTerminateString:(NSData*)data;
 
-- (NSData*) createAESKeyFromSalt:(NSData*)saltedPIN;
+- (NSData*) createAESKeyFromSaltSHA1:(NSData*)saltedPIN;
+- (NSData*) createAESKeyFromSaltSHA256:(NSData*)saltedPIN;
 - (NSData*) SHA1HashData:(NSData*)data;
+- (NSData*) SHA256HashData:(NSData*)data;
 - (NSData*) aesEncrypt:(NSData*)data withKey:(NSData*)key;
 - (NSData*) aesDecrypt:(NSData*)data withKey:(NSData*)key;
 - (bool) verifySignature:(NSData *)data withSignature:(NSData*)signature andCert:(NSData*)cert;

Limelight/Crypto/CryptoManager.m

@@ -8,7 +8,6 @@
 
 #import "CryptoManager.h"
 #import "mkcert.h"
-#import <AdSupport/ASIdentifierManager.h>
 
 #include <openssl/aes.h>
 #include <openssl/sha.h>
@@ -17,19 +16,31 @@
 #include <openssl/evp.h>
 
 @implementation CryptoManager
-static const int SHA1_DIGEST_LENGTH = 20;
+static const int SHA1_HASH_LENGTH = 20;
+static const int SHA256_HASH_LENGTH = 32;
 static NSData* key = nil;
 static NSData* cert = nil;
 static NSData* p12 = nil;
 
-- (NSData*) createAESKeyFromSalt:(NSData*)saltedPIN {
+- (NSData*) createAESKeyFromSaltSHA1:(NSData*)saltedPIN {
     return [[self SHA1HashData:saltedPIN] subdataWithRange:NSMakeRange(0, 16)];
 }
 
+- (NSData*) createAESKeyFromSaltSHA256:(NSData*)saltedPIN {
+    return [[self SHA256HashData:saltedPIN] subdataWithRange:NSMakeRange(0, 16)];
+}
+
 - (NSData*) SHA1HashData:(NSData*)data {
-    unsigned char sha1[SHA1_DIGEST_LENGTH];
+    unsigned char sha1[SHA1_HASH_LENGTH];
     SHA1([data bytes], [data length], sha1);
-    NSData* bytes = [NSData dataWithBytes:sha1 length:20];
+    NSData* bytes = [NSData dataWithBytes:sha1 length:sizeof(sha1)];
+    return bytes;
+}
+
+- (NSData*) SHA256HashData:(NSData*)data {
+    unsigned char sha256[SHA256_HASH_LENGTH];
+    SHA256([data bytes], [data length], sha256);
+    NSData* bytes = [NSData dataWithBytes:sha256 length:sizeof(sha256)];
     return bytes;
 }
 
@@ -76,8 +87,14 @@ static NSData* p12 = nil;
     return (((int)[data length] + 15) / 16) * 16;
 }
 
++ (NSData*) nullTerminateString:(NSData*)data {
+    NSMutableData* mutData = [NSMutableData dataWithData:data];
+    [mutData appendBytes:"" length:1];
+    return mutData;
+}
+
 - (bool) verifySignature:(NSData *)data withSignature:(NSData*)signature andCert:(NSData*)cert {
-    const char* buffer = [cert bytes];
+    const char* buffer = [[CryptoManager nullTerminateString:cert] bytes];
     X509* x509;
     BIO* bio = BIO_new(BIO_s_mem());
     BIO_puts(bio, buffer);
@@ -105,7 +122,7 @@ static NSData* p12 = nil;
 }
 
 - (NSData *)signData:(NSData *)data withKey:(NSData *)key {
-    const char* buffer = [key bytes];
+    const char* buffer = [[CryptoManager nullTerminateString:key] bytes];
     BIO* bio = BIO_new(BIO_s_mem());
     BIO_puts(bio, buffer);
     
@@ -188,7 +205,7 @@ static NSData* p12 = nil;
 }
 
 + (NSData *)getSignatureFromCert:(NSData *)cert {
-    const char* buffer = [cert bytes];
+    const char* buffer = [[CryptoManager nullTerminateString:cert] bytes];
     X509* x509;
     BIO* bio = BIO_new(BIO_s_mem());
     BIO_puts(bio, buffer);
@@ -223,18 +240,4 @@ static NSData* p12 = nil;
     });
 }
 
-+ (NSString*) getUniqueID {
-    // generate a UUID
-    NSUUID* uuid = [ASIdentifierManager sharedManager].advertisingIdentifier;
-    NSString* idString = [NSString stringWithString:[uuid UUIDString]];
-    
-    // we need a 16byte hex-string so we take the last 17 characters
-    // and remove the '-' to get a 16 character string
-    NSMutableString* uniqueId = [NSMutableString stringWithString:[idString substringFromIndex:19]];
-    [uniqueId deleteCharactersInRange:NSMakeRange(4, 1)];
-    
-    //Log(LOG_D, @"Unique ID: %@", uniqueId);
-    return [NSString stringWithString:uniqueId];
-}
-
 @end

Limelight/Crypto/IdManager.h

@@ -0,0 +1,15 @@
+//
+//  IdManager.h
+//  Moonlight
+//
+//  Created by Diego Waxemberg on 10/31/15.
+//  Copyright © 2015 Moonlight Stream. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface IdManager : NSObject
+
++ (NSString*) getUniqueId;
+
+@end

Limelight/Crypto/IdManager.m

@@ -0,0 +1,32 @@
+//
+//  IdManager.m
+//  Moonlight
+//
+//  Created by Diego Waxemberg on 10/31/15.
+//  Copyright © 2015 Moonlight Stream. All rights reserved.
+//
+
+#import "IdManager.h"
+#import "DataManager.h"
+
+@implementation IdManager
+
++ (NSString*) getUniqueId {
+    DataManager* dataMan = [[DataManager alloc] init];
+
+    NSString* uniqueId = [dataMan getUniqueId];
+    if (uniqueId == nil) {
+        uniqueId = [IdManager generateUniqueId];
+        [dataMan updateUniqueId:uniqueId];
+        Log(LOG_I, @"No UUID found. Generated new UUID: %@", uniqueId);
+    }
+    
+    return uniqueId;
+}
+
++ (NSString*) generateUniqueId {
+    UInt64 uuidLong = ((UInt64) arc4random() << 32) | arc4random();
+    return [NSString stringWithFormat:@"%016llx", uuidLong];
+}
+
+@end

Limelight/Crypto/mkcert.c

@@ -85,7 +85,6 @@ int mkcert(X509 **x509p, EVP_PKEY **pkeyp, int bits, int serial, int years) {
     
     if (*pkeyp == NULL) {
         if ((pk=EVP_PKEY_new()) == NULL) {
-            abort();
             return(0);
         }
     } else {
@@ -102,7 +101,6 @@ int mkcert(X509 **x509p, EVP_PKEY **pkeyp, int bits, int serial, int years) {
     
     rsa = RSA_generate_key(bits, RSA_F4, NULL, NULL);
     if (!EVP_PKEY_assign_RSA(pk, rsa)) {
-        abort();
         goto err;
     }
     

Limelight/Database/App+CoreDataProperties.h

@@ -0,0 +1,25 @@
+//
+//  App+CoreDataProperties.h
+//  Moonlight
+//
+//  Created by Diego Waxemberg on 7/10/15.
+//  Copyright © 2015 Limelight Stream. All rights reserved.
+//
+//  Delete this file and regenerate it using "Create NSManagedObject Subclass…"
+//  to keep your implementation up to date with your model.
+//
+
+#import "App.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface App (CoreDataProperties)
+
+@property (nullable, nonatomic, retain) NSString *id;
+@property (nullable, nonatomic, retain) NSData *image;
+@property (nullable, nonatomic, retain) NSString *name;
+@property (nullable, nonatomic, retain) Host *host;
+
+@end
+
+NS_ASSUME_NONNULL_END

Limelight/Database/App.h

@@ -0,0 +1,18 @@
+//
+//  App.h
+//  Moonlight
+//
+//  Created by Diego Waxemberg on 7/10/15.
+//  Copyright © 2015 Limelight Stream. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <CoreData/CoreData.h>
+
+@class Host;
+
+@interface App : NSManagedObject
+
+@end
+
+#import "App+CoreDataProperties.h"

Limelight/Database/App.m

@@ -0,0 +1,13 @@
+//
+//  App.m
+//  Moonlight
+//
+//  Created by Diego Waxemberg on 7/10/15.
+//  Copyright © 2015 Limelight Stream. All rights reserved.
+//
+
+#import "App.h"
+
+@implementation App
+
+@end

Limelight/Database/DataManager.h

@@ -7,19 +7,25 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "Settings.h"
 #import "AppDelegate.h"
-#import "Host.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;
+- (NSArray*) getHosts;
-- (void) saveHosts;
+- (void) updateHost:(TemporaryHost*)host;
-- (Host*) createHost;
+- (void) updateAppsForExistingHost:(TemporaryHost *)host;
-- (void) removeHost:(Host*)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

@@ -7,37 +7,132 @@
 //
 
 #import "DataManager.h"
+#import "TemporaryApp.h"
+#import "TemporarySettings.h"
+#import "Settings.h"
 
-@implementation DataManager
+@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 {
+- (void) updateUniqueId:(NSString*)uniqueId {
-    Settings* settingsToSave = [self retrieveSettings];
+    [_managedObjectContext performBlockAndWait:^{
-    settingsToSave.framerate = [NSNumber numberWithInteger:framerate];
+        [self retrieveSettings].uniqueId = uniqueId;
-    // Bitrate is persisted in kbps
+        [self saveData];
-    settingsToSave.bitrate = [NSNumber numberWithInteger:bitrate];
+    }];
-    settingsToSave.height = [NSNumber numberWithInteger:height];
+}
-    settingsToSave.width = [NSNumber numberWithInteger:width];
-    settingsToSave.onscreenControls = [NSNumber numberWithInteger:onscreenControls];
 
-    NSError* error;
+- (NSString*) getUniqueId {
-    if (![[self.appDelegate managedObjectContext] save:&error]) {
+    __block NSString *uid;
-        Log(LOG_E, @"Unable to save settings to database: %@", error);
+    
-    }
+    [_managedObjectContext performBlockAndWait:^{
-    [self.appDelegate saveContext];
+        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]];
+        NSEntityDescription* entity = [NSEntityDescription entityForName:@"Settings" inManagedObjectContext:_managedObjectContext];
-        Settings* settings = [[Settings alloc] initWithEntity:entity insertIntoManagedObjectContext:[self.appDelegate managedObjectContext]];
+        Settings* settings = [[Settings alloc] initWithEntity:entity insertIntoManagedObjectContext:_managedObjectContext];
         
         return settings;
     } else {
@@ -46,40 +141,84 @@
     }
 }
 
-- (Host*) createHost {
+- (void) removeApp:(TemporaryApp*)app {
-    NSEntityDescription* entity = [NSEntityDescription entityForName:@"Host" inManagedObjectContext:[self.appDelegate managedObjectContext]];
+    [_managedObjectContext performBlockAndWait:^{
-    Host* host = [[Host alloc] initWithEntity:entity insertIntoManagedObjectContext:[self.appDelegate managedObjectContext]];
+        App* managedApp = [self getAppForTemporaryApp:app withAppRecords:[self fetchRecords:@"App"]];
-    return host;
+        if (managedApp != nil) {
+            [_managedObjectContext deleteObject:managedApp];
+            [self saveData];
+        }
+    }];
 }
 
-- (void) removeHost:(Host*)host {
+- (void) removeHost:(TemporaryHost*)host {
-    [[self.appDelegate managedObjectContext] deleteObject:host];
+    [_managedObjectContext performBlockAndWait:^{
+        Host* managedHost = [self getHostForTemporaryHost:host withHostRecords:[self fetchRecords:@"Host"]];
+        if (managedHost != nil) {
+            [_managedObjectContext deleteObject:managedHost];
+            [self saveData];
+        }
+    }];
 }
 
-- (void) saveHosts {
+- (void) saveData {
     NSError* error;
-    if (![[self.appDelegate managedObjectContext] save:&error]) {
+    if (![_managedObjectContext save:&error]) {
         Log(LOG_E, @"Unable to save hosts to database: %@", error);
     }
-    [self.appDelegate saveContext];
+
+    [_appDelegate saveContext];
 }
 
-- (NSArray*) retrieveHosts {
+- (NSArray*) getHosts {
-    return [self fetchRecords:@"Host"];
+    __block NSMutableArray *tempHosts = [[NSMutableArray alloc] init];
+    
+    [_managedObjectContext performBlockAndWait:^{
+        NSArray *hosts = [self fetchRecords:@"Host"];
+        
+        for (Host* host in hosts) {
+            [tempHosts addObject:[[TemporaryHost alloc] initFromHost:host]];
+        }
+    }];
+    
+    return tempHosts;
+}
+
+// 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 nil;
+}
+
+// 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;
+    
     NSFetchRequest* fetchRequest = [[NSFetchRequest alloc] init];
-    NSEntityDescription* entity = [NSEntityDescription entityForName:entityName inManagedObjectContext:[self.appDelegate managedObjectContext]];
+    NSEntityDescription* entity = [NSEntityDescription entityForName:entityName inManagedObjectContext:_managedObjectContext];
     [fetchRequest setEntity:entity];
-    [fetchRequest setAffectedStores:[NSArray arrayWithObjects:[[self.appDelegate persistentStoreCoordinator] persistentStoreForURL:[self.appDelegate getStoreURL]], nil]];
     
     NSError* error;
-    NSArray* fetchedRecords = [[self.appDelegate managedObjectContext] executeFetchRequest:fetchRequest error:&error];
+    fetchedRecords = [_managedObjectContext executeFetchRequest:fetchRequest error:&error];
     //TODO: handle errors
     
     return fetchedRecords;
-    
 }
 
 @end

Limelight/Database/Host+CoreDataProperties.h

@@ -0,0 +1,38 @@
+//
+//  Host+CoreDataProperties.h
+//  Moonlight
+//
+//  Created by Diego Waxemberg on 7/10/15.
+//  Copyright © 2015 Limelight Stream. All rights reserved.
+//
+//  Delete this file and regenerate it using "Create NSManagedObject Subclass…"
+//  to keep your implementation up to date with your model.
+//
+
+#import "Host.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface Host (CoreDataProperties)
+
+@property (nullable, nonatomic, retain) NSString *address;
+@property (nullable, nonatomic, retain) NSString *externalAddress;
+@property (nullable, nonatomic, retain) NSString *localAddress;
+@property (nullable, nonatomic, retain) NSString *mac;
+@property (nullable, nonatomic, retain) NSString *name;
+@property (nullable, nonatomic, retain) NSNumber *pairState;
+@property (nullable, nonatomic, retain) NSString *uuid;
+@property (nullable, nonatomic, retain) NSSet *appList;
+
+@end
+
+@interface Host (CoreDataGeneratedAccessors)
+
+- (void)addAppListObject:(NSManagedObject *)value;
+- (void)removeAppListObject:(NSManagedObject *)value;
+- (void)addAppList:(NSSet *)values;
+- (void)removeAppList:(NSSet *)values;
+
+@end
+
+NS_ASSUME_NONNULL_END

Limelight/Database/Host.h

@@ -2,8 +2,8 @@
 //  Host.h
 //  Moonlight
 //
-//  Created by Diego Waxemberg on 10/28/14.
+//  Created by Diego Waxemberg on 7/10/15.
-//  Copyright (c) 2014 Moonlight Stream. All rights reserved.
+//  Copyright © 2015 Limelight Stream. All rights reserved.
 //
 
 #import <Foundation/Foundation.h>
@@ -12,13 +12,6 @@
 
 @interface Host : NSManagedObject
 
-@property (nonatomic, retain) NSString * name;
-@property (nonatomic, retain) NSString * address;
-@property (nonatomic, retain) NSString * localAddress;
-@property (nonatomic, retain) NSString * externalAddress;
-@property (nonatomic, retain) NSString * uuid;
-@property (nonatomic, retain) NSString * mac;
-@property (nonatomic) BOOL online;
-@property (nonatomic) PairState pairState;
-
 @end
+
+#import "Host+CoreDataProperties.h"

Limelight/Database/Host.m

@@ -2,22 +2,12 @@
 //  Host.m
 //  Moonlight
 //
-//  Created by Diego Waxemberg on 10/28/14.
+//  Created by Diego Waxemberg on 7/10/15.
-//  Copyright (c) 2014 Moonlight Stream. All rights reserved.
+//  Copyright © 2015 Limelight Stream. All rights reserved.
 //
 
 #import "Host.h"
 
-
 @implementation Host
 
-@dynamic name;
-@dynamic address;
-@dynamic localAddress;
-@dynamic externalAddress;
-@dynamic uuid;
-@dynamic mac;
-@dynamic pairState;
-@synthesize online;
-
 @end

Limelight/Database/Settings.h

@@ -17,5 +17,6 @@
 @property (nonatomic, retain) NSNumber * height;
 @property (nonatomic, retain) NSNumber * width;
 @property (nonatomic, retain) NSNumber * onscreenControls;
+@property (nonatomic, retain) NSString * uniqueId;
 
 @end

Limelight/Database/Settings.m

@@ -16,5 +16,6 @@
 @dynamic height;
 @dynamic width;
 @dynamic onscreenControls;
+@dynamic uniqueId;
 
 @end

Limelight/Database/TemporaryApp.h

@@ -0,0 +1,31 @@
+//
+//  TemporaryApp.h
+//  Moonlight
+//
+//  Created by Cameron Gutman on 9/30/15.
+//  Copyright © 2015 Moonlight Stream. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "TemporaryHost.h"
+#import "App.h"
+
+@interface TemporaryApp : NSObject
+
+@property (nullable, nonatomic, retain) NSString *id;
+@property (nullable, nonatomic, retain) NSData *image;
+@property (nullable, nonatomic, retain) NSString *name;
+@property (nonatomic) BOOL isRunning;
+@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

@@ -0,0 +1,52 @@
+//
+//  TemporaryApp.m
+//  Moonlight
+//
+//  Created by Cameron Gutman on 9/30/15.
+//  Copyright © 2015 Moonlight Stream. All rights reserved.
+//
+
+#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/AButton.imageset/Contents.json

@@ -2,18 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
+      "filename" : "a_button_80x80@2x.png",
-      "filename" : "a_button_40x40@1x.png"
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "scale" : "2x",
+      "filename" : "a_button_120x120@3x.png",
-      "filename" : "a_button_80x80@2x.png"
+      "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "scale" : "3x",
+      "scale" : "3x"
-      "filename" : "a_button_120x120@3x.png"
     }
   ],
   "info" : {

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/Images.xcassets/BButton.imageset/Contents.json

@@ -2,18 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
+      "filename" : "b_button_80x80@2x.png",
-      "filename" : "b_button_40x40@1x.png"
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "scale" : "2x",
+      "filename" : "b_button_120x120@3x.png",
-      "filename" : "b_button_80x80@2x.png"
+      "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "scale" : "3x",
+      "scale" : "3x"
-      "filename" : "b_button_120x120@3x.png"
     }
   ],
   "info" : {

Limelight/Images.xcassets/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Limelight/Images.xcassets/DownButton.imageset/Contents.json

@@ -2,18 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
+      "filename" : "down_61x75@2x.png",
-      "filename" : "down_31x38@1x.png"
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "scale" : "2x",
+      "filename" : "down_93x114@3x.png",
-      "filename" : "down_61x75@2x.png"
+      "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "scale" : "3x",
+      "scale" : "3x"
-      "filename" : "down_93x114@3x.png"
     }
   ],
   "info" : {

Limelight/Images.xcassets/LeftButton.imageset/Contents.json

@@ -2,18 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
+      "filename" : "left_76x61@2x.png",
-      "filename" : "left_38x31@1x.png"
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "scale" : "2x",
+      "filename" : "left_114x92@3x.png",
-      "filename" : "left_76x61@2x.png"
+      "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "scale" : "3x",
+      "scale" : "3x"
-      "filename" : "left_114x92@3x.png"
     }
   ],
   "info" : {

Limelight/Images.xcassets/Play.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "play.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Limelight/Images.xcassets/PullArrow.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "pull-arrow-light-14x31@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "pull-arrow-light-28x61@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "pull-arrow-light-42x92@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Limelight/Images.xcassets/RightButton.imageset/Contents.json

@@ -2,18 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
+      "filename" : "right_75x61@2x.png",
-      "filename" : "right_38x31@1x.png"
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "scale" : "2x",
+      "filename" : "right_114x93@3x.png",
-      "filename" : "right_75x61@2x.png"
+      "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "scale" : "3x",
+      "scale" : "3x"
-      "filename" : "right_114x93@3x.png"
     }
   ],
   "info" : {

Limelight/Images.xcassets/UpButton.imageset/Contents.json

@@ -2,18 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
+      "filename" : "up_61x76@2x.png",
-      "filename" : "up_31x39@1x.png"
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "scale" : "2x",
+      "filename" : "up_93x116@3x.png",
-      "filename" : "up_61x76@2x.png"
+      "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "scale" : "3x",
+      "scale" : "3x"
-      "filename" : "up_93x116@3x.png"
     }
   ],
   "info" : {

Limelight/Images.xcassets/XButton.imageset/Contents.json

@@ -2,18 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
+      "filename" : "x_button_80x80@2x.png",
-      "filename" : "x_button_40x40@1x.png"
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "scale" : "2x",
+      "filename" : "x_button_120x120@3x.png",
-      "filename" : "x_button_80x80@2x.png"
+      "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "scale" : "3x",
+      "scale" : "3x"
-      "filename" : "x_button_120x120@3x.png"
     }
   ],
   "info" : {

Limelight/Images.xcassets/YButton.imageset/Contents.json

@@ -2,18 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
+      "filename" : "y_button_80x80@2x.png",
-      "filename" : "y_button_40x40@1x.png"
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "scale" : "2x",
+      "filename" : "y_button_120x120@3x.png",
-      "filename" : "y_button_80x80@2x.png"
+      "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "scale" : "3x",
+      "scale" : "3x"
-      "filename" : "y_button_120x120@3x.png"
     }
   ],
   "info" : {

Limelight/Input/OnScreenControls.m

@@ -63,25 +63,30 @@
     BOOL l3Set;
     BOOL r3Set;
     
+    BOOL _iPad;
+    CGRect _controlArea;
     UIView* _view;
     OnScreenControlsLevel _level;
     
     ControllerSupport *_controllerSupport;
     Controller *_controller;
     id<EdgeDetectionDelegate> _edgeDelegate;
+    NSMutableArray* _deadTouches;
 }
 
-static const float EDGE_WIDTH = .1;
+static const float EDGE_WIDTH = .05;
 
 //static const float BUTTON_SIZE = 50;
 static const float BUTTON_DIST = 20;
 static float BUTTON_CENTER_X;
 static float BUTTON_CENTER_Y;
 
-static const float D_PAD_DIST = 15;
+static const float D_PAD_DIST = 10;
 static float D_PAD_CENTER_X;
 static float D_PAD_CENTER_Y;
 
+static const float DEAD_ZONE_PADDING = 15;
+
 static const double STICK_CLICK_RATE = 100;
 static const float STICK_DEAD_ZONE = .1;
 static float STICK_INNER_SIZE;
@@ -117,6 +122,21 @@ static float L3_Y;
     _controller = [[Controller alloc] init];
     _controller.playerIndex = 0;
     _edgeDelegate = swipeDelegate;
+    _deadTouches = [[NSMutableArray alloc] init];
+    
+    _iPad = (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad);
+    _controlArea = CGRectMake(0, 0, _view.frame.size.width, _view.frame.size.height);
+    if (_iPad)
+    {
+        // Cut down the control area on an iPad so the controls are more reachable
+        _controlArea.size.height = _view.frame.size.height / 2.0;
+        _controlArea.origin.y = _view.frame.size.height - _controlArea.size.height;
+    }
+    else
+    {
+        _controlArea.origin.x = _controlArea.size.width * EDGE_WIDTH;
+        _controlArea.size.width -= _controlArea.origin.x * 2;
+    }
     
     _aButton = [CALayer layer];
     _bButton = [CALayer layer];
@@ -167,10 +187,10 @@ static float L3_Y;
             
             [self hideButtons];
             [self hideBumpers];
+            [self hideL3R3];
             [self drawTriggers];
             [self drawStartSelect];
             [self drawSticks];
-            [self drawL3R3];
             break;
         case OnScreenControlsLevelAutoGCExtendedGamepad:
             // GCExtendedGamepad is missing R3, L3, and select
@@ -219,8 +239,8 @@ static float L3_Y;
     // Start with the default complex layout
     [self setupComplexControls];
     
-    START_Y = _view.frame.size.height * .9;
+    START_Y = _controlArea.size.height * .9 + _controlArea.origin.y;
-    SELECT_Y = _view.frame.size.height * .9;
+    SELECT_Y = _controlArea.size.height * .9 + _controlArea.origin.y;
 }
 
 // For GCGamepad controls we move triggers, start, and select
@@ -229,7 +249,42 @@ static float L3_Y;
     // Start with the default complex layout
     [self setupComplexControls];
     
-    // TODO
+    START_X = _controlArea.size.width * .6 + _controlArea.origin.x;
+    START_Y = _controlArea.size.height * .9 + _controlArea.origin.y;
+    
+    SELECT_X = _controlArea.size.width * .4 + _controlArea.origin.x;
+    SELECT_Y = _controlArea.size.height * .9 + _controlArea.origin.y;
+    
+    L2_Y = _controlArea.size.height * .9 + _controlArea.origin.y;
+    L2_X = _controlArea.size.width * .1 + _controlArea.origin.x;
+    
+    R2_Y = _controlArea.size.height * .9 + _controlArea.origin.y;
+    R2_X = _controlArea.size.width * .9 + _controlArea.origin.x;
+    
+    if (_iPad) {
+        START_X = _controlArea.size.width * .75 + _controlArea.origin.x;
+        START_Y = _controlArea.size.height * .9 + _controlArea.origin.y;
+        
+        SELECT_X = _controlArea.size.width * .25 + _controlArea.origin.x;
+        SELECT_Y = _controlArea.size.height * .9 + _controlArea.origin.y;
+        
+        // The analog sticks are kept closer to the sides on iPad
+        LS_CENTER_X = _controlArea.size.width * .18 + _controlArea.origin.x;
+        LS_CENTER_Y = _controlArea.size.height * .75 + _controlArea.origin.y;
+        RS_CENTER_X = _controlArea.size.width * .82 + _controlArea.origin.x;
+        RS_CENTER_Y = _controlArea.size.height * .75 + _controlArea.origin.y;
+    } else {
+        START_X = _controlArea.size.width * .6 + _controlArea.origin.x;
+        START_Y = _controlArea.size.height * .9 + _controlArea.origin.y;
+        
+        SELECT_X = _controlArea.size.width * .4 + _controlArea.origin.x;
+        SELECT_Y = _controlArea.size.height * .9 + _controlArea.origin.y;
+        
+        LS_CENTER_X = _controlArea.size.width * .25 + _controlArea.origin.x;
+        LS_CENTER_Y = _controlArea.size.height * .75 + _controlArea.origin.y;
+        RS_CENTER_X = _controlArea.size.width * .75 + _controlArea.origin.x;
+        RS_CENTER_Y = _controlArea.size.height * .75 + _controlArea.origin.y;
+    }
 }
 
 // For simple controls we move the triggers and buttons to the bottom
@@ -237,46 +292,59 @@ static float L3_Y;
     // Start with the default complex layout
     [self setupComplexControls];
     
-    START_Y = _view.frame.size.height * .9;
+    START_X = _controlArea.size.width * .6 + _controlArea.origin.x;
-    SELECT_Y = _view.frame.size.height * .9;
+    START_Y = _controlArea.size.height * .9 + _controlArea.origin.y;
     
-    L1_Y = _view.frame.size.height * .7;
+    SELECT_X = _controlArea.size.width * .4 + _controlArea.origin.x;
-    L2_Y = _view.frame.size.height * .9;
+    SELECT_Y = _controlArea.size.height * .9 + _controlArea.origin.y;
-    L2_X = _view.frame.size.width * .1;
+    
-    R1_Y = _view.frame.size.height * .7;
+    L2_Y = _controlArea.size.height * .9 + _controlArea.origin.y;
-    R2_Y = _view.frame.size.height * .9;
+    L2_X = _controlArea.size.width * .1 + _controlArea.origin.x;
-    R2_X = _view.frame.size.width * .9;
+
+    R2_Y = _controlArea.size.height * .9 + _controlArea.origin.y;
+    R2_X = _controlArea.size.width * .9 + _controlArea.origin.x;
 }
 
 - (void) setupComplexControls
 {
-    D_PAD_CENTER_X = _view.frame.size.width * .15;
+    D_PAD_CENTER_X = _controlArea.size.width * .1 + _controlArea.origin.x;
-    D_PAD_CENTER_Y = _view.frame.size.height * .55;
+    D_PAD_CENTER_Y = _controlArea.size.height * .60 + _controlArea.origin.y;
-    BUTTON_CENTER_X = _view.frame.size.width * .85;
+    BUTTON_CENTER_X = _controlArea.size.width * .9 + _controlArea.origin.x;
-    BUTTON_CENTER_Y = _view.frame.size.height * .55;
+    BUTTON_CENTER_Y = _controlArea.size.height * .60 + _controlArea.origin.y;
     
-    LS_CENTER_X = _view.frame.size.width * .35;
+    if (_iPad)
-    LS_CENTER_Y = _view.frame.size.height * .75;
+    {
-    RS_CENTER_X = _view.frame.size.width * .65;
+        // The analog sticks are kept closer to the sides on iPad
-    RS_CENTER_Y = _view.frame.size.height * .75;
+        LS_CENTER_X = _controlArea.size.width * .22 + _controlArea.origin.x;
+        LS_CENTER_Y = _controlArea.size.height * .75 + _controlArea.origin.y;
+        RS_CENTER_X = _controlArea.size.width * .77 + _controlArea.origin.x;
+        RS_CENTER_Y = _controlArea.size.height * .75 + _controlArea.origin.y;
+    }
+    else
+    {
+        LS_CENTER_X = _controlArea.size.width * .35 + _controlArea.origin.x;
+        LS_CENTER_Y = _controlArea.size.height * .75 + _controlArea.origin.y;
+        RS_CENTER_X = _controlArea.size.width * .65 + _controlArea.origin.x;
+        RS_CENTER_Y = _controlArea.size.height * .75 + _controlArea.origin.y;
+    }
     
-    START_X = _view.frame.size.width * .6;
+    START_X = _controlArea.size.width * .9 + _controlArea.origin.x;
-    START_Y = _view.frame.size.height * .1;
+    START_Y = _controlArea.size.height * .9 + _controlArea.origin.y;
-    SELECT_X = _view.frame.size.width * .4;
+    SELECT_X = _controlArea.size.width * .1 + _controlArea.origin.x;
-    SELECT_Y = _view.frame.size.height * .1;
+    SELECT_Y = _controlArea.size.height * .9 + _controlArea.origin.y;
     
-    L1_X = _view.frame.size.width * .15;
+    L1_X = _controlArea.size.width * .1 + _controlArea.origin.x;
-    L1_Y = _view.frame.size.height * .27;
+    L1_Y = _controlArea.size.height * .27 + _controlArea.origin.y;
-    L2_X = _view.frame.size.width * .15;
+    L2_X = _controlArea.size.width * .1 + _controlArea.origin.x;
-    L2_Y = _view.frame.size.height * .1;
+    L2_Y = _controlArea.size.height * .1 + _controlArea.origin.y;
-    R1_X = _view.frame.size.width * .85;
+    R1_X = _controlArea.size.width * .9 + _controlArea.origin.x;
-    R1_Y = _view.frame.size.height * .27;
+    R1_Y = _controlArea.size.height * .27 + _controlArea.origin.y;
-    R2_X = _view.frame.size.width * .85;
+    R2_X = _controlArea.size.width * .9 + _controlArea.origin.x;
-    R2_Y = _view.frame.size.height * .1;
+    R2_Y = _controlArea.size.height * .1 + _controlArea.origin.y;
-    L3_X = _view.frame.size.width * .25;
+    L3_X = _controlArea.size.width * .25 + _controlArea.origin.x;
-    L3_Y = _view.frame.size.height * .75;
+    L3_Y = _controlArea.size.height * .75 + _controlArea.origin.y;
-    R3_X = _view.frame.size.width * .75;
+    R3_X = _controlArea.size.width * .75 + _controlArea.origin.x;
-    R3_Y = _view.frame.size.height * .75;
+    R3_Y = _controlArea.size.height * .75 + _controlArea.origin.y;
 }
 
 - (void) drawButtons {
@@ -535,11 +603,14 @@ static float L3_Y;
         } else if (touch == _r3Touch) {
             buttonTouch = true;
         }
+        if ([_deadTouches containsObject:touch]) {
+            updated = true;
+        }
     }
     if (updated) {
         [_controllerSupport updateFinished:_controller];
     }
-    return updated || buttonTouch;
+        return updated || buttonTouch;
 }
 
 - (BOOL)handleTouchDownEvent:touches {
@@ -653,6 +724,10 @@ static float L3_Y;
         } else if ([_edge.presentationLayer hitTest:touchLocation]) {
             _edgeTouch = touch;
         }
+        if (!updated && !stickTouch && [self isInDeadZone:touch]) {
+            [_deadTouches addObject:touch];
+            updated = true;
+        }
     }
     if (updated) {
         [_controllerSupport updateFinished:_controller];
@@ -744,15 +819,123 @@ static float L3_Y;
             touched = true;
         } else if (touch == _edgeTouch) {
             _edgeTouch = nil;
-            if (![_edge.presentationLayer hitTest:[touch locationInView:_view]]) {
+            if ([touch locationInView:_view].x >= _view.frame.size.width / 4) {
                 [_edgeDelegate edgeSwiped];
             }
         }
+        if ([_deadTouches containsObject:touch]) {
+            [_deadTouches removeObject:touch];
+            updated = true;
+        }
     }
     if (updated) {
         [_controllerSupport updateFinished:_controller];
     }
+    
     return updated || touched;
 }
 
+- (BOOL) isInDeadZone:(UITouch*) touch {
+    switch (_level) {
+        case OnScreenControlsLevelFull:
+            return [self isDpadDeadZone:touch]
+            || [self isAbxyDeadZone:touch]
+            || [self isTriggerDeadZone:touch]
+            || [self isBumperDeadZone:touch]
+            || [self isStartSelectDeadZone:touch];
+        case OnScreenControlsLevelSimple:
+            return [self isTriggerDeadZone:touch]
+            || [self isStartSelectDeadZone:touch]
+            || [self isL3R3DeadZone:touch];
+        case OnScreenControlsLevelAutoGCExtendedGamepad:
+            return [self isL3R3DeadZone:touch]
+            || [self isStartSelectDeadZone:touch];
+        case OnScreenControlsLevelAutoGCGamepad:
+            return [self isTriggerDeadZone:touch]
+            || [self isStartSelectDeadZone:touch];
+        default:
+            return false;
+    }
+}
+
+- (BOOL) isDpadDeadZone:(UITouch*) touch {
+    return [self isDeadZone:touch
+                     startX:_view.frame.origin.x
+                     startY:_upButton.frame.origin.y
+                       endX:_rightButton.frame.origin.x + _rightButton.frame.size.width
+                       endY:_view.frame.origin.y + _view.frame.size.height];
+}
+
+- (BOOL) isAbxyDeadZone:(UITouch*) touch {
+    return [self isDeadZone:touch
+                     startX:_xButton.frame.origin.x
+                     startY:_yButton.frame.origin.y
+                       endX:_view.frame.origin.x + _view.frame.size.width
+                       endY:_view.frame.origin.y + _view.frame.size.height];
+}
+
+- (BOOL) isBumperDeadZone:(UITouch*) touch {
+    return [self isDeadZone:touch
+                     startX:_view.frame.origin.x
+                     startY:_l2Button.frame.origin.y + _l2Button.frame.size.height
+                       endX:_l1Button.frame.origin.x + _l1Button.frame.size.width
+                       endY:_upButton.frame.origin.y]
+    || [self isDeadZone:touch
+                 startX:_r2Button.frame.origin.x
+                 startY:_r2Button.frame.origin.y + _r2Button.frame.size.height
+                   endX:_view.frame.origin.x + _view.frame.size.width
+                   endY:_yButton.frame.origin.y];
+}
+
+- (BOOL) isTriggerDeadZone:(UITouch*) touch {
+    return [self isDeadZone:touch
+                     startX:_view.frame.origin.x
+                     startY:_l2Button.frame.origin.y
+                       endX:_l2Button.frame.origin.x + _l2Button.frame.size.width
+                       endY:_view.frame.origin.y + _view.frame.size.height]
+    || [self isDeadZone:touch
+                 startX:_r2Button.frame.origin.x
+                 startY:_r2Button.frame.origin.y
+                   endX:_view.frame.origin.x + _view.frame.size.width
+                   endY:_view.frame.origin.y + _view.frame.size.height];
+}
+
+- (BOOL) isL3R3DeadZone:(UITouch*) touch {
+    return [self isDeadZone:touch
+                     startX:_view.frame.origin.x
+                     startY:_l3Button.frame.origin.y
+                       endX:_view.frame.origin.x
+                       endY:_view.frame.origin.y + _view.frame.size.height]
+    || [self isDeadZone:touch
+                 startX:_r3Button.frame.origin.x
+                 startY:_r3Button.frame.origin.y
+                   endX:_view.frame.origin.x + _view.frame.size.width
+                   endY:_view.frame.origin.y + _view.frame.size.height];
+}
+
+- (BOOL) isStartSelectDeadZone:(UITouch*) touch {
+    return [self isDeadZone:touch
+                     startX:_startButton.frame.origin.x
+                     startY:_startButton.frame.origin.y
+                       endX:_view.frame.origin.x + _view.frame.size.width
+                       endY:_view.frame.origin.y + _view.frame.size.height]
+    || [self isDeadZone:touch
+                 startX:_view.frame.origin.x
+                 startY:_selectButton.frame.origin.y
+                   endX:_selectButton.frame.origin.x + _selectButton.frame.size.width
+                   endY:_view.frame.origin.y + _view.frame.size.height];
+}
+
+- (BOOL) isDeadZone:(UITouch*) touch startX:(float)deadZoneStartX startY:(float)deadZoneStartY endX:(float)deadZoneEndX endY:(float)deadZoneEndY {
+    deadZoneStartX -= DEAD_ZONE_PADDING;
+    deadZoneStartY -= DEAD_ZONE_PADDING;
+    deadZoneEndX += DEAD_ZONE_PADDING;
+    deadZoneEndY += DEAD_ZONE_PADDING;
+    
+    CGPoint touchLocation = [touch locationInView:_view];
+    return (touchLocation.x > deadZoneStartX && touchLocation.x < deadZoneEndX
+            && touchLocation.y > deadZoneStartY && touchLocation.y < deadZoneEndY);
+    
+}
+
 @end

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];
@@ -67,10 +67,11 @@
                 deltaX *= xDeltaFactor * screenFactor;
                 deltaY *= yDeltaFactor * screenFactor;
                 
-                LiSendMouseMoveEvent(deltaX, deltaY);
+                if (deltaX != 0 || deltaY != 0) {
-
+                    LiSendMouseMoveEvent(deltaX, deltaY);
-                touchMoved = true;
+                    touchMoved = true;
-                touchLocation = currentLocation;
+                    touchLocation = currentLocation;
+                }
             }
         } else if ([[event allTouches] count] == 2) {
             CGPoint firstLocation = [[[[event allTouches] allObjects] objectAtIndex:0] locationInView:self];

Limelight/Limelight-Info.plist

@@ -9,7 +9,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.moonlight-stream.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.9.1</string>
+	<string>1.0.4</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
@@ -26,6 +26,11 @@
 	<string>public.app-category.games</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
 	<key>UIAppFonts</key>
 	<array>
 		<string>Roboto-Black.ttf</string>
@@ -45,9 +50,9 @@
 	<array>
 		<string>armv7</string>
 	</array>
-	<key>UIStatusBarHidden</key>
+	<key>UIRequiresFullScreen</key>
 	<true/>
-	<key>UIStatusBarHidden~ipad</key>
+	<key>UIStatusBarHidden</key>
 	<true/>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
@@ -59,5 +64,7 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
+	<key>UIViewControllerBasedStatusBarAppearance</key>
+	<false/>
 </dict>
 </plist>

Limelight/Limelight.xcdatamodeld/.xccurrentversion

@@ -3,6 +3,6 @@
 <plist version="1.0">
 <dict>
 	<key>_XCCurrentVersionName</key>
-	<string>Limelight 0.3.1.xcdatamodel</string>
+	<string>Moonlight v1.0-2.xcdatamodel</string>
 </dict>
 </plist>

Limelight/Limelight.xcdatamodeld/Moonlight v1.0-2.xcdatamodel/contents

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<model userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="9057" systemVersion="15B42" minimumToolsVersion="Automatic">
+    <entity name="App" representedClassName="App" syncable="YES">
+        <attribute name="id" attributeType="String" syncable="YES"/>
+        <attribute name="image" optional="YES" attributeType="Binary" allowsExternalBinaryDataStorage="YES" syncable="YES"/>
+        <attribute name="name" optional="YES" attributeType="String" syncable="YES"/>
+        <relationship name="host" maxCount="1" deletionRule="Nullify" destinationEntity="Host" inverseName="appList" inverseEntity="Host" syncable="YES"/>
+    </entity>
+    <entity name="Host" representedClassName="Host" syncable="YES">
+        <attribute name="address" attributeType="String" syncable="YES"/>
+        <attribute name="externalAddress" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="localAddress" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="mac" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="name" attributeType="String" syncable="YES"/>
+        <attribute name="pairState" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
+        <attribute name="uuid" optional="YES" attributeType="String" syncable="YES"/>
+        <relationship name="appList" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="App" inverseName="host" inverseEntity="App" syncable="YES"/>
+    </entity>
+    <entity name="Settings" representedClassName="Settings" syncable="YES">
+        <attribute name="bitrate" attributeType="Integer 32" defaultValueString="10000" syncable="YES"/>
+        <attribute name="framerate" attributeType="Integer 32" defaultValueString="60" syncable="YES"/>
+        <attribute name="height" attributeType="Integer 32" defaultValueString="720" syncable="YES"/>
+        <attribute name="onscreenControls" attributeType="Integer 32" defaultValueString="1" syncable="YES"/>
+        <attribute name="uniqueId" attributeType="String" syncable="YES"/>
+        <attribute name="width" attributeType="Integer 32" defaultValueString="1280" syncable="YES"/>
+    </entity>
+    <elements>
+        <element name="App" positionX="0" positionY="54" width="128" height="105"/>
+        <element name="Host" positionX="0" positionY="0" width="128" height="163"/>
+        <element name="Settings" positionX="0" positionY="0" width="128" height="135"/>
+    </elements>
+</model>

Limelight/Limelight.xcdatamodeld/Moonlight v1.0.xcdatamodel/contents

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<model userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="9057" systemVersion="15B42" minimumToolsVersion="Automatic">
+    <entity name="App" representedClassName="App" syncable="YES">
+        <attribute name="id" attributeType="String" syncable="YES"/>
+        <attribute name="image" optional="YES" attributeType="Binary" allowsExternalBinaryDataStorage="YES" syncable="YES"/>
+        <attribute name="name" optional="YES" attributeType="String" syncable="YES"/>
+        <relationship name="host" maxCount="1" deletionRule="Nullify" destinationEntity="Host" inverseName="appList" inverseEntity="Host" syncable="YES"/>
+    </entity>
+    <entity name="Host" representedClassName="Host" syncable="YES">
+        <attribute name="address" attributeType="String" syncable="YES"/>
+        <attribute name="externalAddress" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="localAddress" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="mac" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="name" attributeType="String" syncable="YES"/>
+        <attribute name="pairState" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
+        <attribute name="uuid" optional="YES" attributeType="String" syncable="YES"/>
+        <relationship name="appList" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="App" inverseName="host" inverseEntity="App" syncable="YES"/>
+    </entity>
+    <entity name="Settings" representedClassName="Settings" syncable="YES">
+        <attribute name="bitrate" attributeType="Integer 32" defaultValueString="10000" syncable="YES"/>
+        <attribute name="framerate" attributeType="Integer 32" defaultValueString="60" syncable="YES"/>
+        <attribute name="height" attributeType="Integer 32" defaultValueString="720" syncable="YES"/>
+        <attribute name="onscreenControls" attributeType="Integer 32" defaultValueString="1" syncable="YES"/>
+        <attribute name="uniqueId" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="width" attributeType="Integer 32" defaultValueString="1280" syncable="YES"/>
+    </entity>
+    <elements>
+        <element name="App" positionX="0" positionY="54" width="128" height="105"/>
+        <element name="Host" positionX="0" positionY="0" width="128" height="163"/>
+        <element name="Settings" positionX="0" positionY="0" width="128" height="135"/>
+    </elements>
+</model>

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) retrieveAssets:(NSArray*)appList fromHost:(Host*)host;
+- (void) retrieveAssetsFromHost:(TemporaryHost*)host;
 - (void) stopRetrieving;
 
 @end

Limelight/Network/AppAssetManager.m

@@ -15,8 +15,6 @@
 @implementation AppAssetManager {
     NSOperationQueue* _opQueue;
     id<AppAssetCallback> _callback;
-    Host* _host;
-    NSMutableDictionary* _imageCache;
 }
 
 static const int MAX_REQUEST_COUNT = 4;
@@ -24,29 +22,22 @@ static const int MAX_REQUEST_COUNT = 4;
 - (id) initWithCallback:(id<AppAssetCallback>)callback {
     self = [super init];
     _callback = callback;
-    _imageCache = [[NSMutableDictionary alloc] init];
     _opQueue = [[NSOperationQueue alloc] init];
     [_opQueue setMaxConcurrentOperationCount:MAX_REQUEST_COUNT];
     
     return self;
 }
 
-- (void) retrieveAssets:(NSArray*)appList fromHost:(Host*)host {
+- (void) retrieveAssetsFromHost:(TemporaryHost*)host {
-    Host* oldHost = _host;
+    for (TemporaryApp* app in host.appList) {
-    _host = host;
+        if (app.image == nil) {
-    BOOL useCache = [oldHost.uuid isEqualToString:_host.uuid];
+            AppAssetRetriever* retriever = [[AppAssetRetriever alloc] init];
-    Log(LOG_I, @"Using cached app images: %d", useCache);
+            retriever.app = app;
-    if (!useCache) {
+            retriever.host = host;
-        [_imageCache removeAllObjects];
+            retriever.callback = _callback;
-    }
+            
-    for (App* app in appList) {
+            [_opQueue addOperation:retriever];
-        AppAssetRetriever* retriever = [[AppAssetRetriever alloc] init];
+        }
-        retriever.app = app;
-        retriever.host = _host;
-        retriever.callback = _callback;
-        retriever.cache = _imageCache;
-        retriever.useCache = useCache;
-        [_opQueue addOperation:retriever];
     }
 }
 
@@ -54,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,16 +7,14 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "Host.h"
+#import "TemporaryHost.h"
-#import "App.h"
+#import "TemporaryApp.h"
 #import "AppAssetManager.h"
 
 @interface AppAssetRetriever : NSOperation
 
-@property (nonatomic) Host* host;
+@property (nonatomic) TemporaryHost* host;
-@property (nonatomic) App* app;
+@property (nonatomic) TemporaryApp* app;
-@property (nonatomic) NSMutableDictionary* cache;
 @property (nonatomic) id<AppAssetCallback> callback;
-@property (nonatomic) BOOL useCache;
 
 @end

Limelight/Network/AppAssetRetriever.m

@@ -11,45 +11,32 @@
 #import "CryptoManager.h"
 #import "AppAssetResponse.h"
 #import "HttpRequest.h"
+#import "IdManager.h"
 
 @implementation AppAssetRetriever
 static const double RETRY_DELAY = 2; // seconds
 static const int MAX_ATTEMPTS = 5;
 
-
 - (void) main {
     UIImage* appImage = nil;
     int attempts = 0;
     while (![self isCancelled] && appImage == nil && attempts++ < MAX_ATTEMPTS) {
-        if (self.useCache) {
-            @synchronized(self.cache) {
-                UIImage* cachedImage = [self.cache objectForKey:self.app.appId];
-                if (cachedImage != nil) {
-                    appImage = cachedImage;
-                    self.app.appImage = appImage;
-                }
-            }
-        }
-        if (appImage == nil) {
-            HttpManager* hMan = [[HttpManager alloc] initWithHost:_host.address uniqueId:[CryptoManager getUniqueID] deviceName:deviceName cert:[CryptoManager readCertFromFile]];
-            AppAssetResponse* appAssetResp = [[AppAssetResponse alloc] init];
-            [hMan executeRequestSynchronously:[HttpRequest requestForResponse:appAssetResp withUrlRequest:[hMan newAppAssetRequestWithAppId:self.app.appId]]];
         
-            appImage = [UIImage imageWithData:appAssetResp.data];
+        HttpManager* hMan = [[HttpManager alloc] initWithHost:_host.activeAddress uniqueId:[IdManager getUniqueId] deviceName:deviceName cert:[CryptoManager readCertFromFile]];
-            self.app.appImage = appImage;
+        AppAssetResponse* appAssetResp = [[AppAssetResponse alloc] init];
-            if (appImage != nil) {
+        [hMan executeRequestSynchronously:[HttpRequest requestForResponse:appAssetResp withUrlRequest:[hMan newAppAssetRequestWithAppId:self.app.id]]];
-                @synchronized(self.cache) {
-                    [self.cache setObject:appImage forKey:self.app.appId];
-                }
-            }
-        }
         
-        [NSThread sleepForTimeInterval:RETRY_DELAY];
+        appImage = [UIImage imageWithData:appAssetResp.data];
+        self.app.image = UIImagePNGRepresentation(appImage);
+        
+        if (![self isCancelled] && appImage == nil) {
+            [NSThread sleepForTimeInterval:RETRY_DELAY];
+        }
     }
     [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

@@ -7,11 +7,12 @@
 //
 
 #import "AppListResponse.h"
-#import "App.h"
+#import "TemporaryApp.h"
+#import "DataManager.h"
 #import <libxml2/libxml/xmlreader.h>
 
 @implementation AppListResponse {
-    NSMutableArray* _appList;
+    NSMutableSet* _appList;
 }
 @synthesize data, statusCode, statusMessage;
 
@@ -22,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];
 }
 
@@ -64,8 +65,8 @@ static const char* TAG_APP_IS_RUNNING = "IsRunning";
         //Log(LOG_D, @"node: %s", node->name);
         if (!xmlStrcmp(node->name, (xmlChar*)TAG_APP)) {
             xmlNodePtr appInfoNode = node->xmlChildrenNode;
-            NSString* appName;
+            NSString* appName = @"";
-            NSString* appId;
+            NSString* appId = nil;
             BOOL appIsRunning = NO;
             while (appInfoNode != NULL) {
                 if (!xmlStrcmp(appInfoNode->name, (xmlChar*)TAG_APP_TITLE)) {
@@ -93,11 +94,11 @@ static const char* TAG_APP_IS_RUNNING = "IsRunning";
                 }
                 appInfoNode = appInfoNode->next;
             }
-            App* app = [[App alloc] init];
+            if (appId != nil) {
-            app.appName = appName;
+                TemporaryApp* app = [[TemporaryApp alloc] init];
-            app.appId = appId;
+                app.name = appName;
-            app.isRunning = appIsRunning;
+                app.id = appId;
-            if (app.appId != nil) {
+                app.isRunning = appIsRunning;
                 [_appList addObject:app];
             }
         }
@@ -107,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;
+- (BOOL) addHostToDiscovery:(TemporaryHost*)host;
-- (void) removeHostFromDiscovery:(Host*)host;
+- (void) removeHostFromDiscovery:(TemporaryHost*)host;
-- (void) discoverHost:(NSString*)hostAddress withCallback:(void (^)(Host*, NSString*))callback;
+- (void) discoverHost:(NSString*)hostAddress withCallback:(void (^)(TemporaryHost*, NSString*))callback;
 
 @end

Limelight/Network/DiscoveryManager.m

@@ -13,10 +13,10 @@
 #import "DataManager.h"
 #import "DiscoveryWorker.h"
 #import "ServerInfoResponse.h"
+#import "IdManager.h"
 
 @implementation DiscoveryManager {
     NSMutableArray* _hostQueue;
-    NSMutableArray* _discoveredHosts;
     id<DiscoveryCallback> _callback;
     MDNSManager* _mdnsMan;
     NSOperationQueue* _opQueue;
@@ -27,31 +27,38 @@
 
 - (id)initWithHosts:(NSArray *)hosts andCallback:(id<DiscoveryCallback>)callback {
     self = [super init];
-    _hostQueue = [NSMutableArray arrayWithArray:hosts];
+    
+    // Using addHostToDiscovery ensures no duplicates
+    // will make it into the list from the database
     _callback = callback;
+    shouldDiscover = NO;
+    _hostQueue = [NSMutableArray array];
+    for (TemporaryHost* host in hosts)
+    {
+        [self addHostToDiscovery:host];
+    }
+    [_callback updateAllHosts:_hostQueue];
+    
     _opQueue = [[NSOperationQueue alloc] init];
     _mdnsMan = [[MDNSManager alloc] initWithCallback:self];
     [CryptoManager generateKeyPairUsingSSl];
-    _uniqueId = [CryptoManager getUniqueID];
+    _uniqueId = [IdManager getUniqueId];
     _cert = [CryptoManager readCertFromFile];
-    shouldDiscover = NO;
     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]]];
+    [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 = [[TemporaryHost alloc] init];
-        host = [dataMan createHost];
+        host.activeAddress = host.address = hostAddress;
-        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);
@@ -66,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]];
     }
 }
@@ -87,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) {
@@ -98,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];
@@ -110,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];
@@ -122,16 +128,14 @@
                 [_callback updateAllHosts:_hostQueue];
             } else {
                 Log(LOG_I, @"Not adding host to discovery: %@", host.name);
-                [dataMan removeHost:host];
             }
         }
-        [dataMan saveHosts];
     });
 }
 
-- (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;
         }
@@ -139,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;
 }
 
@@ -41,23 +42,88 @@ static const float POLL_RATE = 2.0f; // Poll every 2 seconds
     }
 }
 
+- (NSArray*) getHostAddressList {
+    NSMutableArray *array = [[NSMutableArray alloc] initWithCapacity:3];
+
+    if (_host.localAddress != nil) {
+        [array addObject:_host.localAddress];
+    }
+    if (_host.externalAddress != nil) {
+        [array addObject:_host.externalAddress];
+    }
+    if (_host.address != nil) {
+        [array addObject:_host.address];
+    }
+    
+    // Remove duplicate addresses from the list.
+    // This is done using an array rather than a set
+    // to preserve insertion order of addresses.
+    for (int i = 0; i < [array count]; i++) {
+        NSString *addr1 = [array objectAtIndex:i];
+        
+        for (int j = 1; j < [array count]; j++) {
+            if (i == j) {
+                continue;
+            }
+            
+            NSString *addr2 = [array objectAtIndex:j];
+            
+            if ([addr1 isEqualToString:addr2]) {
+                // Remove the last address
+                [array removeObjectAtIndex:j];
+                
+                // Begin searching again from the start
+                i = -1;
+                break;
+            }
+        }
+    }
+    
+    return array;
+}
+
 - (void) discoverHost {
     BOOL receivedResponse = NO;
-    if (!self.cancelled && _host.localAddress != nil) {
+    NSArray *addresses = [self getHostAddressList];
-        ServerInfoResponse* serverInfoResp = [self requestInfoAtAddress:_host.localAddress];
+    
-        receivedResponse = [self checkResponse:serverInfoResp];
+    Log(LOG_D, @"%@ has %d unique addresses", _host.name, [addresses count]);
-    }
+    
-    if (!self.cancelled && !receivedResponse && _host.externalAddress != nil) {
+    // Give the PC 3 tries to respond before declaring it offline
-        ServerInfoResponse* serverInfoResp = [self requestInfoAtAddress:_host.externalAddress];
+    for (int i = 0; i < 3; i++) {
-        receivedResponse = [self checkResponse:serverInfoResp];
+        for (NSString *address in addresses) {
-    }
+            if (self.cancelled) {
-    if (!self.cancelled && !receivedResponse && _host.address != nil) {
+                // Get out without updating the status because
-        ServerInfoResponse* serverInfoResp = [self requestInfoAtAddress:_host.address];
+                // it might not have finished checking the various
-        receivedResponse = [self checkResponse:serverInfoResp];
+                // addresses
+                return;
+            }
+            
+            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;
+            }
+        }
+        
+        if (receivedResponse) {
+            Log(LOG_I, @"Received serverinfo response on try %d", i);
+            break;
+        }
+        else {
+            // Wait for one second then retry
+            [NSThread sleepForTimeInterval:1];
+        }
     }
+
     _host.online = receivedResponse;
     if (receivedResponse) {
-        Log(LOG_D, @"Received response from: %@\n{\n\t address:%@ \n\t localAddress:%@ \n\t externalAddress:%@ \n\t uuid:%@ \n\t mac:%@ \n\t pairState:%d \n\t online:%d \n}", _host.name, _host.address, _host.localAddress, _host.externalAddress, _host.uuid, _host.mac, _host.pairState, _host.online);
+        Log(LOG_D, @"Received response from: %@\n{\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);
     }
 }
 
@@ -68,7 +134,8 @@ static const float POLL_RATE = 2.0f; // Poll every 2 seconds
                                                      cert:_cert];
     ServerInfoResponse* response = [[ServerInfoResponse alloc] init];
     [hMan executeRequestSynchronously:[HttpRequest requestForResponse:response
-                                                       withUrlRequest:[hMan newServerInfoRequest]]];
+                                                       withUrlRequest:[hMan newServerInfoRequest]
+                                       fallbackError:401 fallbackRequest:[hMan newHttpServerInfoRequest]]];
     return response;
 }
 
@@ -76,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,11 +7,10 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "Host.h"
 #import "HttpResponse.h"
 #import "HttpRequest.h"
 
-@interface HttpManager : NSObject <NSURLConnectionDelegate, NSURLConnectionDataDelegate>
+@interface HttpManager : NSObject <NSURLSessionDelegate>
 
 - (id) initWithHost:(NSString*) host uniqueId:(NSString*) uniqueId deviceName:(NSString*) deviceName cert:(NSData*) cert;
 - (NSURLRequest*) newPairRequest:(NSData*)salt;
@@ -22,12 +21,12 @@
 - (NSURLRequest*) newPairChallenge;
 - (NSURLRequest*) newAppListRequest;
 - (NSURLRequest*) newServerInfoRequest;
+- (NSURLRequest*) newHttpServerInfoRequest;
 - (NSURLRequest*) newLaunchRequest:(NSString*)appId width:(int)width height:(int)height refreshRate:(int)refreshRate rikey:(NSString*)rikey rikeyid:(int)rikeyid;
 - (NSURLRequest*) newResumeRequestWithRiKey:(NSString*)riKey riKeyId:(int)riKeyId;
 - (NSURLRequest*) newQuitAppRequest;
 - (NSURLRequest*) newAppAssetRequestWithAppId:(NSString*)appId;
 - (void) executeRequestSynchronously:(HttpRequest*)request;
-- (void) executeRequest:(HttpRequest*)request;
 
 @end
 

Limelight/Network/HttpManager.m

@@ -9,13 +9,15 @@
 #import "HttpManager.h"
 #import "HttpRequest.h"
 #import "CryptoManager.h"
-#import "App.h"
+#import "TemporaryApp.h"
 
 #include <libxml2/libxml/xmlreader.h>
 #include <string.h>
 
 @implementation HttpManager {
-    NSString* _baseURL;
+    NSURLSession* _urlSession;
+    NSString* _baseHTTPURL;
+    NSString* _baseHTTPSURL;
     NSString* _host;
     NSString* _uniqueId;
     NSString* _deviceName;
@@ -27,7 +29,8 @@
     BOOL _errorOccurred;
 }
 
-static const NSString* PORT = @"47984";
+static const NSString* HTTP_PORT = @"47989";
+static const NSString* HTTPS_PORT = @"47984";
 
 + (NSData*) fixXmlVersion:(NSData*) xmlData {
     NSString* dataString = [[NSString alloc] initWithData:xmlData encoding:NSUTF8StringEncoding];
@@ -42,38 +45,63 @@ static const NSString* PORT = @"47984";
     _uniqueId = uniqueId;
     _deviceName = deviceName;
     _cert = cert;
-    _baseURL = [[NSString stringWithFormat:@"https://%@:%@", host, PORT]
+    _baseHTTPURL = [NSString stringWithFormat:@"http://%@:%@", host, HTTP_PORT];
-                stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+    _baseHTTPSURL = [NSString stringWithFormat:@"https://%@:%@", host, HTTPS_PORT];
     _requestLock = dispatch_semaphore_create(0);
     _respData = [[NSMutableData alloc] init];
+    NSURLSessionConfiguration* config = [NSURLSessionConfiguration ephemeralSessionConfiguration];
+    _urlSession = [NSURLSession sessionWithConfiguration:config delegate:self delegateQueue:nil];
     return self;
 }
 
 - (void) executeRequestSynchronously:(HttpRequest*)request {
     Log(LOG_D, @"Making Request: %@", request);
     [_respData setLength:0];
-    dispatch_sync(dispatch_get_main_queue(), ^{
+    [[_urlSession dataTaskWithRequest:request.request completionHandler:^(NSData * __nullable data, NSURLResponse * __nullable response, NSError * __nullable error) {
-        [NSURLConnection connectionWithRequest:request.request delegate:self];
+        
-    });
+        if (error != NULL) {
+            Log(LOG_D, @"Connection error: %@", error);
+            _errorOccurred = true;
+        }
+        else {
+            Log(LOG_D, @"Received response: %@", response);
+
+            if (data != NULL) {
+                Log(LOG_D, @"\n\nReceived data: %@\n\n", [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding]);
+                [_respData appendData:data];
+                if ([[NSString alloc] initWithData:_respData encoding:NSUTF8StringEncoding] != nil) {
+                    _requestResp = [HttpManager fixXmlVersion:_respData];
+                } else {
+                    _requestResp = _respData;
+                }
+            }
+        }
+        
+        dispatch_semaphore_signal(_requestLock);
+    }] resume];
     dispatch_semaphore_wait(_requestLock, DISPATCH_TIME_FOREVER);
     
     if (!_errorOccurred && request.response) {
         [request.response populateWithData:_requestResp];
+        
+        // If the fallback error code was detected, issue the fallback request
+        if (request.response.statusCode == request.fallbackError && request.fallbackRequest != NULL) {
+            Log(LOG_D, @"Request failed with fallback error code: %d", request.fallbackError);
+            request.request = request.fallbackRequest;
+            request.fallbackError = 0;
+            request.fallbackRequest = NULL;
+            [self executeRequestSynchronously:request];
+        }
     }
     _errorOccurred = false;
 }
 
-- (void) executeRequest:(HttpRequest*)request {
-    [NSURLConnection connectionWithRequest:request.request delegate:self];
-}
-
 - (NSURLRequest*) createRequestFromString:(NSString*) urlString enableTimeout:(BOOL)normalTimeout {
-    NSString* escapedUrl = [urlString stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+    NSURL* url = [[NSURL alloc] initWithString:urlString];
-    NSURL* url = [[NSURL alloc] initWithString:escapedUrl];
     NSMutableURLRequest* request = [NSMutableURLRequest requestWithURL:url];
     if (normalTimeout) {
-        // Timeout the request after 5 seconds
+        // Timeout the request after 7 seconds
-        [request setTimeoutInterval:5];
+        [request setTimeoutInterval:7];
     }
     else {
         // Timeout the request after 60 seconds
@@ -84,67 +112,72 @@ static const NSString* PORT = @"47984";
 
 - (NSURLRequest*) newPairRequest:(NSData*)salt {
     NSString* urlString = [NSString stringWithFormat:@"%@/pair?uniqueid=%@&devicename=%@&updateState=1&phrase=getservercert&salt=%@&clientcert=%@",
-                           _baseURL, _uniqueId, _deviceName, [self bytesToHex:salt], [self bytesToHex:_cert]];
+                           _baseHTTPSURL, _uniqueId, _deviceName, [self bytesToHex:salt], [self bytesToHex:_cert]];
     // This call blocks while waiting for the user to input the PIN on the PC
     return [self createRequestFromString:urlString enableTimeout:FALSE];
 }
 
 - (NSURLRequest*) newUnpairRequest {
-    NSString* urlString = [NSString stringWithFormat:@"%@/unpair?uniqueid=%@", _baseURL, _uniqueId];
+    NSString* urlString = [NSString stringWithFormat:@"%@/unpair?uniqueid=%@", _baseHTTPSURL, _uniqueId];
     return [self createRequestFromString:urlString enableTimeout:TRUE];
 }
 
 - (NSURLRequest*) newChallengeRequest:(NSData*)challenge {
     NSString* urlString = [NSString stringWithFormat:@"%@/pair?uniqueid=%@&devicename=%@&updateState=1&clientchallenge=%@",
-                           _baseURL, _uniqueId, _deviceName, [self bytesToHex:challenge]];
+                           _baseHTTPSURL, _uniqueId, _deviceName, [self bytesToHex:challenge]];
     return [self createRequestFromString:urlString enableTimeout:TRUE];
 }
 
 - (NSURLRequest*) newChallengeRespRequest:(NSData*)challengeResp {
     NSString* urlString = [NSString stringWithFormat:@"%@/pair?uniqueid=%@&devicename=%@&updateState=1&serverchallengeresp=%@",
-                           _baseURL, _uniqueId, _deviceName, [self bytesToHex:challengeResp]];
+                           _baseHTTPSURL, _uniqueId, _deviceName, [self bytesToHex:challengeResp]];
     return [self createRequestFromString:urlString enableTimeout:TRUE];
 }
 
 - (NSURLRequest*) newClientSecretRespRequest:(NSString*)clientPairSecret {
-    NSString* urlString = [NSString stringWithFormat:@"%@/pair?uniqueid=%@&devicename=%@&updateState=1&clientpairingsecret=%@", _baseURL, _uniqueId, _deviceName, clientPairSecret];
+    NSString* urlString = [NSString stringWithFormat:@"%@/pair?uniqueid=%@&devicename=%@&updateState=1&clientpairingsecret=%@", _baseHTTPSURL, _uniqueId, _deviceName, clientPairSecret];
     return [self createRequestFromString:urlString enableTimeout:TRUE];
 }
 
 - (NSURLRequest*) newPairChallenge {
-    NSString* urlString = [NSString stringWithFormat:@"%@/pair?uniqueid=%@&devicename=%@&updateState=1&phrase=pairchallenge", _baseURL, _uniqueId, _deviceName];
+    NSString* urlString = [NSString stringWithFormat:@"%@/pair?uniqueid=%@&devicename=%@&updateState=1&phrase=pairchallenge", _baseHTTPSURL, _uniqueId, _deviceName];
     return [self createRequestFromString:urlString enableTimeout:TRUE];
 }
 
 - (NSURLRequest *)newAppListRequest {
-    NSString* urlString = [NSString stringWithFormat:@"%@/applist?uniqueid=%@", _baseURL, _uniqueId];
+    NSString* urlString = [NSString stringWithFormat:@"%@/applist?uniqueid=%@", _baseHTTPSURL, _uniqueId];
     return [self createRequestFromString:urlString enableTimeout:TRUE];
 }
 
 - (NSURLRequest *)newServerInfoRequest {
-    NSString* urlString = [NSString stringWithFormat:@"%@/serverinfo?uniqueid=%@", _baseURL, _uniqueId];
+    NSString* urlString = [NSString stringWithFormat:@"%@/serverinfo?uniqueid=%@", _baseHTTPSURL, _uniqueId];
+    return [self createRequestFromString:urlString enableTimeout:TRUE];
+}
+
+- (NSURLRequest *)newHttpServerInfoRequest {
+    NSString* urlString = [NSString stringWithFormat:@"%@/serverinfo", _baseHTTPURL];
     return [self createRequestFromString:urlString enableTimeout:TRUE];
 }
 
 - (NSURLRequest*) newLaunchRequest:(NSString*)appId width:(int)width height:(int)height refreshRate:(int)refreshRate rikey:(NSString*)rikey rikeyid:(int)rikeyid {
-    NSString* urlString = [NSString stringWithFormat:@"%@/launch?uniqueid=%@&appid=%@&mode=%dx%dx%d&additionalStates=1&sops=1&rikey=%@&rikeyid=%d", _baseURL, _uniqueId, appId, width, height, refreshRate, rikey, rikeyid];
+    NSString* urlString = [NSString stringWithFormat:@"%@/launch?uniqueid=%@&appid=%@&mode=%dx%dx%d&additionalStates=1&sops=1&rikey=%@&rikeyid=%d", _baseHTTPSURL, _uniqueId, appId, width, height, refreshRate, rikey, rikeyid];
     // This blocks while the app is launching
     return [self createRequestFromString:urlString enableTimeout:FALSE];
 }
 
 - (NSURLRequest*) newResumeRequestWithRiKey:(NSString*)riKey riKeyId:(int)riKeyId {
-    NSString* urlString = [NSString stringWithFormat:@"%@/resume?uniqueid=%@&rikey=%@&rikeyid=%d", _baseURL, _uniqueId, riKey, riKeyId];
+    NSString* urlString = [NSString stringWithFormat:@"%@/resume?uniqueid=%@&rikey=%@&rikeyid=%d", _baseHTTPSURL, _uniqueId, riKey, riKeyId];
     // This blocks while the app is resuming
     return [self createRequestFromString:urlString enableTimeout:FALSE];
 }
 
 - (NSURLRequest*) newQuitAppRequest {
-    NSString* urlString = [NSString stringWithFormat:@"%@/cancel?uniqueid=%@", _baseURL, _uniqueId];
+    NSString* urlString = [NSString stringWithFormat:@"%@/cancel?uniqueid=%@", _baseHTTPSURL, _uniqueId];
     return [self createRequestFromString:urlString enableTimeout:FALSE];
 }
 
 - (NSURLRequest*) newAppAssetRequestWithAppId:(NSString *)appId {
-    NSString* urlString = [NSString stringWithFormat:@"%@/appasset?uniqueid=%@&appid=%@&AssetType=2&AssetIdx=0", _baseURL, _uniqueId, appId];
+    NSString* urlString = [NSString stringWithFormat:@"%@/appasset?uniqueid=%@&appid=%@&AssetType=2&AssetIdx=0", _baseHTTPSURL, _uniqueId, appId];
     return [self createRequestFromString:urlString enableTimeout:FALSE];
 }
 
@@ -157,33 +190,6 @@ static const NSString* PORT = @"47984";
     return hex;
 }
 
-- (void)connection:(NSURLConnection *)connection didReceiveResponse:(NSURLResponse *)response {
-    Log(LOG_D, @"Received response: %@", response);
-}
-
-- (void)connection:(NSURLConnection *)connection didReceiveData:(NSData *)data {
-    Log(LOG_D, @"\n\nReceived data: %@\n\n", [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding]);
-    [_respData appendData:data];
-}
-
-- (void)connectionDidFinishLoading:(NSURLConnection *)connection {
-    if ([[NSString alloc] initWithData:_respData encoding:NSUTF8StringEncoding] != nil) {
-        _requestResp = [HttpManager fixXmlVersion:_respData];
-    } else {
-        _requestResp = _respData;
-    }
-    dispatch_semaphore_signal(_requestLock);
-}
-
-- (void)connection:(NSURLConnection *)connection willSendRequestForAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge {
-    SecIdentityRef identity = [self getClientCertificate];
-    NSArray *certArray = [self getCertificate:identity];
-    
-    NSURLCredential *newCredential = [NSURLCredential credentialWithIdentity:identity certificates:certArray persistence:NSURLCredentialPersistencePermanent];
-    
-    [challenge.sender useCredential:newCredential forAuthenticationChallenge:challenge];
-}
-
 // Returns an array containing the certificate
 - (NSArray*)getCertificate:(SecIdentityRef) identity {
     SecCertificateRef certificate = nil;
@@ -219,10 +225,25 @@ static const NSString* PORT = @"47984";
     return identityApp;
 }
 
-- (void)connection:(NSURLConnection *)connection didFailWithError:(NSError *)error {
+- (void)URLSession:(NSURLSession *)session didReceiveChallenge:(NSURLAuthenticationChallenge *)challenge completionHandler:(nonnull void (^)(NSURLSessionAuthChallengeDisposition, NSURLCredential * __nullable))completionHandler {
-    Log(LOG_D, @"connection error: %@", error);
+    // Allow untrusted server certificates
-    _errorOccurred = true;
+    if([challenge.protectionSpace.authenticationMethod isEqualToString:NSURLAuthenticationMethodServerTrust])
-    dispatch_semaphore_signal(_requestLock);
+    {
+        completionHandler(NSURLSessionAuthChallengeUseCredential,
+                          [NSURLCredential credentialForTrust: challenge.protectionSpace.serverTrust]);
+    }
+    // Respond to client certificate challenge with our certificate
+    else if ([challenge.protectionSpace.authenticationMethod isEqualToString:NSURLAuthenticationMethodClientCertificate])
+    {
+        SecIdentityRef identity = [self getClientCertificate];
+        NSArray* certArray = [self getCertificate:identity];
+        NSURLCredential* newCredential = [NSURLCredential credentialWithIdentity:identity certificates:certArray persistence:NSURLCredentialPersistencePermanent];
+        completionHandler(NSURLSessionAuthChallengeUseCredential, newCredential);
+    }
+    else
+    {
+        completionHandler(NSURLSessionAuthChallengePerformDefaultHandling, NULL);
+    }
 }
 
 @end

Limelight/Network/HttpRequest.h

@@ -13,7 +13,10 @@
 
 @property (nonatomic) id<Response> response;
 @property (nonatomic) NSURLRequest* request;
+@property (nonatomic) int fallbackError;
+@property (nonatomic) NSURLRequest* fallbackRequest;
 
++ (instancetype) requestForResponse:(id<Response>)response withUrlRequest:(NSURLRequest*)req fallbackError:(int)error fallbackRequest:(NSURLRequest*) fallbackReq;
 + (instancetype) requestForResponse:(id<Response>)response withUrlRequest:(NSURLRequest*)req;
 + (instancetype) requestWithUrlRequest:(NSURLRequest*)req;
 

Limelight/Network/HttpRequest.m

@@ -25,4 +25,13 @@
     return request;
 }
 
++ (HttpRequest*) requestForResponse:(id<Response>)response withUrlRequest:(NSURLRequest*)req fallbackError:(int)error fallbackRequest:(NSURLRequest*) fallbackReq {
+    HttpRequest* request = [[HttpRequest alloc] init];
+    request.request = req;
+    request.response = response;
+    request.fallbackError = error;
+    request.fallbackRequest = fallbackReq;
+    return request;
+}
+
 @end

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 "TemporaryHost.h"
-#import "DataManager.h"
 
 @implementation MDNSManager {
     NSNetServiceBrowser* mDNSBrowser;
@@ -47,11 +46,10 @@ 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.address = service.hostName;
+            host.activeAddress = host.address = service.hostName;
             host.name = host.address;
             [hosts addObject:host];
         }

Limelight/Network/PairManager.h

@@ -22,6 +22,6 @@
 - (id) initWithManager:(HttpManager*)httpManager andCert:(NSData*)cert callback:(id<PairCallback>)callback;
 - (NSString*) generatePIN;
 - (NSData*) saltPIN:(NSString*)PIN;
-- (void) initiatePair;
+- (void) initiatePair:(int)serverMajorVersion;
 
 @end

Limelight/Network/PairManager.m

@@ -31,23 +31,31 @@
 
 - (void) main {
     ServerInfoResponse* serverInfoResp = [[ServerInfoResponse alloc] init];
-    [_httpManager executeRequestSynchronously:[HttpRequest requestForResponse:serverInfoResp withUrlRequest:[_httpManager newServerInfoRequest]]];
+    [_httpManager executeRequestSynchronously:[HttpRequest requestForResponse:serverInfoResp withUrlRequest:[_httpManager newServerInfoRequest]
+                                               fallbackError:401 fallbackRequest:[_httpManager newHttpServerInfoRequest]]];
     if (serverInfoResp == nil) {
         [_callback pairFailed:@"Unable to connect to PC"];
         return;
     }
     if ([serverInfoResp isStatusOk]) {
-        if (![[serverInfoResp getStringTag:@"currentgame"] isEqual:@"0"]) {
+        if (![[serverInfoResp getStringTag:@"state"] hasSuffix:@"_SERVER_AVAILABLE"]) {
             [_callback pairFailed:@"You must stop streaming before attempting to pair."];
         } else if (![[serverInfoResp getStringTag:@"PairStatus"] isEqual:@"1"]) {
-            [self initiatePair];
+            NSString* appversion = [serverInfoResp getStringTag:@"appversion"];
+            if (appversion == nil) {
+                [_callback pairFailed:@"Missing XML element"];
+                return;
+            }            
+            [self initiatePair: [[appversion substringToIndex:1] intValue]];
         } else {
             [_callback alreadyPaired];
         }
     }
 }
 
-- (void) initiatePair {
+- (void) initiatePair:(int)serverMajorVersion {
+    Log(LOG_I, @"Pairing with generation %d server", serverMajorVersion);
+    
     NSString* PIN = [self generatePIN];
     NSData* salt = [self saltPIN:PIN];
     Log(LOG_I, @"PIN: %@, saltedPIN: %@", PIN, salt);
@@ -60,7 +68,7 @@
     }
     NSInteger pairedStatus;
     if (![pairResp getIntTag:@"paired" value:&pairedStatus] || !pairedStatus) {
-        [_httpManager executeRequest:[HttpRequest requestWithUrlRequest:[_httpManager newUnpairRequest]]];
+        [_httpManager executeRequestSynchronously:[HttpRequest requestWithUrlRequest:[_httpManager newUnpairRequest]]];
         [_callback pairFailed:@"Pairing was declined by the target."];
         return;
     }
@@ -68,7 +76,18 @@
     NSString* plainCert = [pairResp getStringTag:@"plaincert"];
     
     CryptoManager* cryptoMan = [[CryptoManager alloc] init];
-    NSData* aesKey = [cryptoMan createAESKeyFromSalt:salt];
+    NSData* aesKey;
+    
+    // Gen 7 servers use SHA256 to get the key
+    int hashLength;
+    if (serverMajorVersion >= 7) {
+        aesKey = [cryptoMan createAESKeyFromSaltSHA256:salt];
+        hashLength = 32;
+    }
+    else {
+        aesKey = [cryptoMan createAESKeyFromSaltSHA1:salt];
+        hashLength = 20;
+    }
     
     NSData* randomChallenge = [Utils randomBytes:16];
     NSData* encryptedChallenge = [cryptoMan aesEncrypt:randomChallenge withKey:aesKey];
@@ -78,8 +97,8 @@
     if (![self verifyResponseStatus:challengeResp]) {
         return;
     }
-    if (![challengeResp getIntTag:@"paired" value:&pairedStatus] || !pairedStatus) {
+    if (![challengeResp getIntTag:@"paired" value:&pairedStatus] || pairedStatus != 1) {
-        [_httpManager executeRequest:[HttpRequest requestWithUrlRequest:[_httpManager newUnpairRequest]]];
+        [_httpManager executeRequestSynchronously:[HttpRequest requestWithUrlRequest:[_httpManager newUnpairRequest]]];
         [_callback pairFailed:@"Pairing stage #2 failed"];
         return;
     }
@@ -87,11 +106,18 @@
     NSData* encServerChallengeResp = [Utils hexToBytes:[challengeResp getStringTag:@"challengeresponse"]];
     NSData* decServerChallengeResp = [cryptoMan aesDecrypt:encServerChallengeResp withKey:aesKey];
     
-    NSData* serverResponse = [decServerChallengeResp subdataWithRange:NSMakeRange(0, 20)];
+    NSData* serverResponse = [decServerChallengeResp subdataWithRange:NSMakeRange(0, hashLength)];
-    NSData* serverChallenge = [decServerChallengeResp subdataWithRange:NSMakeRange(20, 16)];
+    NSData* serverChallenge = [decServerChallengeResp subdataWithRange:NSMakeRange(hashLength, 16)];
     
     NSData* clientSecret = [Utils randomBytes:16];
-    NSData* challengeRespHash = [cryptoMan SHA1HashData:[self concatData:[self concatData:serverChallenge with:[CryptoManager getSignatureFromCert:_cert]] with:clientSecret]];
+    NSData* challengeRespHashInput = [self concatData:[self concatData:serverChallenge with:[CryptoManager getSignatureFromCert:_cert]] with:clientSecret];
+    NSData* challengeRespHash;
+    if (serverMajorVersion >= 7) {
+        challengeRespHash = [cryptoMan SHA256HashData: challengeRespHashInput];
+    }
+    else {
+        challengeRespHash = [cryptoMan SHA1HashData: challengeRespHashInput];
+    }
     NSData* challengeRespEncrypted = [cryptoMan aesEncrypt:challengeRespHash withKey:aesKey];
     
     HttpResponse* secretResp = [[HttpResponse alloc] init];
@@ -99,8 +125,8 @@
     if (![self verifyResponseStatus:secretResp]) {
         return;
     }
-    if (![secretResp getIntTag:@"paired" value:&pairedStatus] || !pairedStatus) {
+    if (![secretResp getIntTag:@"paired" value:&pairedStatus] || pairedStatus != 1) {
-        [_httpManager executeRequest:[HttpRequest requestWithUrlRequest:[_httpManager newUnpairRequest]]];
+        [_httpManager executeRequestSynchronously:[HttpRequest requestWithUrlRequest:[_httpManager newUnpairRequest]]];
         [_callback pairFailed:@"Pairing stage #3 failed"];
         return;
     }
@@ -110,14 +136,21 @@
     NSData* serverSignature = [serverSecretResp subdataWithRange:NSMakeRange(16, 256)];
     
     if (![cryptoMan verifySignature:serverSecret withSignature:serverSignature andCert:[Utils hexToBytes:plainCert]]) {
-        [_httpManager executeRequest:[HttpRequest requestWithUrlRequest:[_httpManager newUnpairRequest]]];
+        [_httpManager executeRequestSynchronously:[HttpRequest requestWithUrlRequest:[_httpManager newUnpairRequest]]];
         [_callback pairFailed:@"Server certificate invalid"];
         return;
     }
     
-    NSData* serverChallengeRespHash = [cryptoMan SHA1HashData:[self concatData:[self concatData:randomChallenge with:[CryptoManager getSignatureFromCert:[Utils hexToBytes:plainCert]]] with:serverSecret]];
+    NSData* serverChallengeRespHashInput = [self concatData:[self concatData:randomChallenge with:[CryptoManager getSignatureFromCert:[Utils hexToBytes:plainCert]]] with:serverSecret];
+    NSData* serverChallengeRespHash;
+    if (serverMajorVersion >= 7) {
+        serverChallengeRespHash = [cryptoMan SHA256HashData: serverChallengeRespHashInput];
+    }
+    else {
+        serverChallengeRespHash = [cryptoMan SHA1HashData: serverChallengeRespHashInput];
+    }
     if (![serverChallengeRespHash isEqual:serverResponse]) {
-        [_httpManager executeRequest:[HttpRequest requestWithUrlRequest:[_httpManager newUnpairRequest]]];
+        [_httpManager executeRequestSynchronously:[HttpRequest requestWithUrlRequest:[_httpManager newUnpairRequest]]];
         [_callback pairFailed:@"Incorrect PIN"];
         return;
     }
@@ -128,8 +161,8 @@
     if (![self verifyResponseStatus:clientSecretResp]) {
         return;
     }
-    if (![clientSecretResp getIntTag:@"paired" value:&pairedStatus] || !pairedStatus) {
+    if (![clientSecretResp getIntTag:@"paired" value:&pairedStatus] || pairedStatus != 1) {
-        [_httpManager executeRequest:[HttpRequest requestWithUrlRequest:[_httpManager newUnpairRequest]]];
+        [_httpManager executeRequestSynchronously:[HttpRequest requestWithUrlRequest:[_httpManager newUnpairRequest]]];
         [_callback pairFailed:@"Pairing stage #4 failed"];
         return;
     }
@@ -139,8 +172,8 @@
     if (![self verifyResponseStatus:clientPairChallengeResp]) {
         return;
     }
-    if (![clientPairChallengeResp getIntTag:@"paired" value:&pairedStatus] || !pairedStatus) {
+    if (![clientPairChallengeResp getIntTag:@"paired" value:&pairedStatus] || pairedStatus != 1) {
-        [_httpManager executeRequest:[HttpRequest requestWithUrlRequest:[_httpManager newUnpairRequest]]];
+        [_httpManager executeRequestSynchronously:[HttpRequest requestWithUrlRequest:[_httpManager newUnpairRequest]]];
         [_callback pairFailed:@"Pairing stage #5 failed"];
         return;
     }
@@ -149,11 +182,11 @@
 
 - (BOOL) verifyResponseStatus:(HttpResponse*)resp {
     if (resp == nil) {
-        [_httpManager executeRequest:[HttpRequest requestWithUrlRequest:[_httpManager newUnpairRequest]]];
+        [_httpManager executeRequestSynchronously:[HttpRequest requestWithUrlRequest:[_httpManager newUnpairRequest]]];
         [_callback pairFailed:@"Network error occured."];
         return false;
     } else if (![resp isStatusOk]) {
-        [_httpManager executeRequest:[HttpRequest requestWithUrlRequest:[_httpManager newUnpairRequest]]];
+        [_httpManager executeRequestSynchronously:[HttpRequest requestWithUrlRequest:[_httpManager newUnpairRequest]]];
         [_callback pairFailed:resp.statusMessage];
         return false;
     } else {

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/Connection.m

@@ -15,7 +15,7 @@
 #include "opus.h"
 
 @implementation Connection {
-    IP_ADDRESS _host;
+    const char* _host;
     STREAM_CONFIGURATION _streamConfig;
     CONNECTION_LISTENER_CALLBACKS _clCallbacks;
     DECODER_RENDERER_CALLBACKS _drCallbacks;
@@ -65,11 +65,16 @@ int DrSubmitDecodeUnit(PDECODE_UNIT decodeUnit)
     return [renderer submitDecodeBuffer:data length:decodeUnit->fullLength];
 }
 
-void ArInit(void)
+void ArInit(int audioConfiguration, POPUS_MULTISTREAM_CONFIGURATION opusConfig)
 {
     int err;
     
-    opusDecoder = opus_decoder_create(48000, 2, &err);
+    // We only support stereo for now
+    assert(audioConfiguration == AUDIO_CONFIGURATION_STEREO);
+    
+    opusDecoder = opus_decoder_create(opusConfig->sampleRate,
+                                      opusConfig->channelCount,
+                                      &err);
     
     audioLock = [[NSLock alloc] init];
     
@@ -77,9 +82,9 @@ void ArInit(void)
     NSError *audioSessionError = nil;
     AVAudioSession* audioSession = [AVAudioSession sharedInstance];
     
-    [audioSession setPreferredSampleRate:48000.0 error:&audioSessionError];
+    [audioSession setPreferredSampleRate:opusConfig->sampleRate error:&audioSessionError];
     [audioSession setCategory: AVAudioSessionCategoryPlayback error: &audioSessionError];
-    [audioSession setPreferredOutputNumberOfChannels:2 error:&audioSessionError];
+    [audioSession setPreferredOutputNumberOfChannels:opusConfig->channelCount error:&audioSessionError];
     [audioSession setPreferredIOBufferDuration:0.005 error:&audioSessionError];
     [audioSession setActive: YES error: &audioSessionError];
     
@@ -99,11 +104,11 @@ void ArInit(void)
     }
     
     AudioStreamBasicDescription audioFormat = {0};
-    audioFormat.mSampleRate = 48000;
+    audioFormat.mSampleRate = opusConfig->sampleRate;
     audioFormat.mBitsPerChannel = 16;
     audioFormat.mFormatID = kAudioFormatLinearPCM;
     audioFormat.mFormatFlags = kAudioFormatFlagIsSignedInteger | kLinearPCMFormatFlagIsPacked;
-    audioFormat.mChannelsPerFrame = 2;
+    audioFormat.mChannelsPerFrame = opusConfig->channelCount;
     audioFormat.mBytesPerFrame = audioFormat.mChannelsPerFrame * (audioFormat.mBitsPerChannel / 8);
     audioFormat.mBytesPerPacket = audioFormat.mBytesPerFrame;
     audioFormat.mFramesPerPacket = audioFormat.mBytesPerPacket / audioFormat.mBytesPerFrame;
@@ -137,16 +142,26 @@ void ArInit(void)
     if (status) {
         Log(LOG_E, @"Unable to initialize audioUnit: %d", (int32_t)status);
     }
+    
+    status = AudioOutputUnitStart(audioUnit);
+    if (status) {
+        Log(LOG_E, @"Unable to start audioUnit: %d", (int32_t)status);
+    }
 }
 
-void ArRelease(void)
+void ArCleanup(void)
 {
     if (opusDecoder != NULL) {
         opus_decoder_destroy(opusDecoder);
         opusDecoder = NULL;
     }
     
-    OSStatus status = AudioUnitUninitialize(audioUnit);
+    OSStatus status = AudioOutputUnitStop(audioUnit);
+    if (status) {
+        Log(LOG_E, @"Unable to stop audioUnit: %d", (int32_t)status);
+    }
+    
+    status = AudioUnitUninitialize(audioUnit);
     if (status) {
         Log(LOG_E, @"Unable to uninitialize audioUnit: %d", (int32_t)status);
     }
@@ -166,22 +181,6 @@ void ArRelease(void)
     }
 }
 
-void ArStart(void)
-{
-    OSStatus status = AudioOutputUnitStart(audioUnit);
-    if (status) {
-        Log(LOG_E, @"Unable to start audioUnit: %d", (int32_t)status);
-    }
-}
-
-void ArStop(void)
-{
-    OSStatus status = AudioOutputUnitStop(audioUnit);
-    if (status) {
-        Log(LOG_E, @"Unable to stop audioUnit: %d", (int32_t)status);
-    }
-}
-
 void ArDecodeAndPlaySample(char* sampleData, int sampleLength)
 {
     int decodedLength = opus_decode(opusDecoder, (unsigned char*)sampleData, sampleLength, decodedPcmBuffer, PCM_BUFFER_SIZE / 2, 0);
@@ -282,10 +281,12 @@ void ClDisplayTransientMessage(char* message)
 -(id) initWithConfig:(StreamConfiguration*)config renderer:(VideoDecoderRenderer*)myRenderer connectionCallbacks:(id<ConnectionCallbacks>)callbacks serverMajorVersion:(int)serverMajorVersion
 {
     self = [super init];
-    _host = config.hostAddr;
+    _host = [config.host cStringUsingEncoding:NSUTF8StringEncoding];
     renderer = myRenderer;
     _callbacks = callbacks;
     _serverMajorVersion = serverMajorVersion;
+    
+    LiInitializeStreamConfiguration(&_streamConfig);
     _streamConfig.width = config.width;
     _streamConfig.height = config.height;
     _streamConfig.fps = config.frameRate;
@@ -299,18 +300,15 @@ void ClDisplayTransientMessage(char* message)
     int riKeyId = htonl(config.riKeyId);
     memcpy(_streamConfig.remoteInputAesIv, &riKeyId, sizeof(riKeyId));
     
-    _drCallbacks.setup = NULL;
+    LiInitializeVideoCallbacks(&_drCallbacks);
-    _drCallbacks.start = NULL;
-    _drCallbacks.stop = NULL;
-    _drCallbacks.release = NULL;
     _drCallbacks.submitDecodeUnit = DrSubmitDecodeUnit;
     
+    LiInitializeAudioCallbacks(&_arCallbacks);
     _arCallbacks.init = ArInit;
-    _arCallbacks.start = ArStart;
+    _arCallbacks.cleanup = ArCleanup;
-    _arCallbacks.stop = ArStop;
-    _arCallbacks.release = ArRelease;
     _arCallbacks.decodeAndPlaySample = ArDecodeAndPlaySample;
     
+    LiInitializeConnectionCallbacks(&_clCallbacks);
     _clCallbacks.stageStarting = ClStageStarting;
     _clCallbacks.stageComplete = ClStageComplete;
     _clCallbacks.stageFailed = ClStageFailed;
@@ -410,7 +408,6 @@ static OSStatus playbackCallback(void *inRefCon,
                       &_clCallbacks,
                       &_drCallbacks,
                       &_arCallbacks,
-                      NULL,
                       NULL, 0, _serverMajorVersion);
 }
 

Limelight/Stream/StreamConfiguration.h

@@ -12,7 +12,6 @@
 
 @property NSString* host;
 @property NSString* appID;
-@property int hostAddr;
 @property int width;
 @property int height;
 @property int frameRate;

Limelight/Stream/StreamConfiguration.m

@@ -9,5 +9,5 @@
 #import "StreamConfiguration.h"
 
 @implementation StreamConfiguration
-@synthesize host, appID, hostAddr, width, height, frameRate, bitRate, riKeyId, riKey;
+@synthesize host, appID, width, height, frameRate, bitRate, riKeyId, riKey;
 @end

Limelight/Stream/StreamManager.m

@@ -15,6 +15,7 @@
 #import "ServerInfoResponse.h"
 #import "HttpResponse.h"
 #import "HttpRequest.h"
+#import "IdManager.h"
 
 @implementation StreamManager {
     StreamConfiguration* _config;
@@ -36,7 +37,7 @@
 
 - (void)main {
     [CryptoManager generateKeyPairUsingSSl];
-    NSString* uniqueId = [CryptoManager getUniqueID];
+    NSString* uniqueId = [IdManager getUniqueId];
     NSData* cert = [CryptoManager readCertFromFile];
     
     HttpManager* hMan = [[HttpManager alloc] initWithHost:_config.host
@@ -45,12 +46,12 @@
                                                      cert:cert];
     
     ServerInfoResponse* serverInfoResp = [[ServerInfoResponse alloc] init];
-    [hMan executeRequestSynchronously:[HttpRequest requestForResponse:serverInfoResp withUrlRequest:[hMan newServerInfoRequest]]];
+    [hMan executeRequestSynchronously:[HttpRequest requestForResponse:serverInfoResp withUrlRequest:[hMan newServerInfoRequest]
-    NSString* currentGame = [serverInfoResp getStringTag:@"currentgame"];
+                                       fallbackError:401 fallbackRequest:[hMan newHttpServerInfoRequest]]];
     NSString* pairStatus = [serverInfoResp getStringTag:@"PairStatus"];
-    NSString* currentClient = [serverInfoResp getStringTag:@"CurrentClient"];
     NSString* appversion = [serverInfoResp getStringTag:@"appversion"];
-    if (![serverInfoResp isStatusOk] || currentGame == NULL || pairStatus == NULL || appversion == NULL) {
+    NSString* serverState = [serverInfoResp getStringTag:@"state"];
+    if (![serverInfoResp isStatusOk] || pairStatus == NULL || appversion == NULL || serverState == NULL) {
         [_callbacks launchFailed:@"Failed to connect to PC"];
         return;
     }
@@ -62,12 +63,7 @@
     }
     
     // resumeApp and launchApp handle calling launchFailed
-    if (![currentGame isEqualToString:@"0"]) {
+    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 andCallback:(id<AppCallback>)callback;
+- (id) initWithApp:(TemporaryApp*)app cache:(NSCache*)cache andCallback:(id<AppCallback>)callback;
 - (void) updateAppImage;
 
 @end

Limelight/UIAppView.m

@@ -9,38 +9,45 @@
 #import "UIAppView.h"
 
 @implementation UIAppView {
-    App* _app;
+    TemporaryApp* _app;
     UIButton* _appButton;
     UILabel* _appLabel;
+    UIImageView* _appOverlay;
+    NSCache* _artCache;
     id<AppCallback> _callback;
 }
-static int LABEL_DY = 20;
 
-- (id) initWithApp:(App*)app andCallback:(id<AppCallback>)callback {
+static UIImage* noImage;
+
+- (id) initWithApp:(TemporaryApp*)app cache:(NSCache*)cache andCallback:(id<AppCallback>)callback {
     self = [super init];
     _app = app;
     _callback = callback;
+    _artCache = cache;
+    
+    // Cache the NoAppImage ourselves to avoid
+    // having to load it each time
+    if (noImage == nil) {
+        noImage = [UIImage imageNamed:@"NoAppImage"];
+    }
     
     _appButton = [UIButton buttonWithType:UIButtonTypeCustom];
-    UIImage* noImage = [UIImage imageNamed:@"NoAppImage"];
     [_appButton setBackgroundImage:noImage forState:UIControlStateNormal];
-	[_appButton setContentEdgeInsets:UIEdgeInsetsMake(0, 4, 0, 4)];
+    [_appButton setContentEdgeInsets:UIEdgeInsetsMake(0, 4, 0, 4)];
     [_appButton sizeToFit];
     [_appButton addTarget:self action:@selector(appClicked) forControlEvents:UIControlEventTouchUpInside];
     
     [self addSubview:_appButton];
     [self sizeToFit];
+    
     _appButton.frame = CGRectMake(0, 0, noImage.size.width, noImage.size.height);
     self.frame = CGRectMake(0, 0, noImage.size.width, noImage.size.height);
     
-    return self;
+    // Rasterizing the cell layer increases rendering performance by quite a bit
-}
+    self.layer.shouldRasterize = YES;
+    self.layer.rasterizationScale = [UIScreen mainScreen].scale;
     
-- (void) updateBounds {
+    return self;
-    float x = _appButton.frame.origin.x < _appLabel.frame.origin.x ? _appButton.frame.origin.x : _appLabel.frame.origin.x;
-    float y = _appButton.frame.origin.y < _appLabel.frame.origin.y ? _appButton.frame.origin.y : _appLabel.frame.origin.y;
-    self.bounds = CGRectMake(x , y, _appButton.frame.size.width > _appLabel.frame.size.width ? _appButton.frame.size.width : _appLabel.frame.size.width, _appButton.frame.size.height + _appLabel.frame.size.height + LABEL_DY / 2);
-    self.frame = CGRectMake(x , y, _appButton.frame.size.width > _appLabel.frame.size.width ? _appButton.frame.size.width : _appLabel.frame.size.width, _appButton.frame.size.height + _appLabel.frame.size.height + LABEL_DY / 2);
 }
 
 - (void) appClicked {
@@ -48,15 +55,54 @@ static int LABEL_DY = 20;
 }
 
 - (void) updateAppImage {
-    if (_app.appImage != nil) {
+    if (_appOverlay != nil) {
-        _appButton.frame = CGRectMake(0, 0, _app.appImage.size.width / 2, _app.appImage.size.height / 2);
+        [_appOverlay removeFromSuperview];
-        self.frame = CGRectMake(0, 0, _app.appImage.size.width / 2, _app.appImage.size.height / 2);
+        _appOverlay = nil;
-        [_appButton setBackgroundImage:_app.appImage forState:UIControlStateNormal];
+    }
-        [self setNeedsDisplay];
+    
+    if (_app.isRunning) {
+        // Only create the app overlay if needed
+        _appOverlay = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"Play"]];
+        _appOverlay.layer.shadowColor = [UIColor blackColor].CGColor;
+        _appOverlay.layer.shadowOffset = CGSizeMake(0, 0);
+        _appOverlay.layer.shadowOpacity = 1;
+        _appOverlay.layer.shadowRadius = 2.0;
+        
+        [self addSubview:_appOverlay];
+        
+        _appOverlay.frame = CGRectMake(0, 0, noImage.size.width / 2.f, noImage.size.height / 4.f);
+        [_appOverlay setCenter:CGPointMake(self.frame.size.width/2, self.frame.size.height/6)];
     }
     
     // TODO: Improve no-app image detection
-    if (_app.appImage == nil || (_app.appImage.size.width == 130.f && _app.appImage.size.height == 180.f)) { // This size of image might be blank image received from GameStream.
+    BOOL noAppImage = false;
+    
+    if (_app.image != nil) {
+        // Load the decoded image from the cache
+        UIImage* appImage = [_artCache objectForKey:_app];
+        if (appImage == nil) {
+            // Not cached; we have to decode this now
+            appImage = [UIImage imageWithData:_app.image];
+            [_artCache setObject:appImage forKey:_app];
+        }
+        
+        // This size of image might be blank image received from GameStream.
+        if (!(appImage.size.width == 130.f && appImage.size.height == 180.f)) {
+            _appButton.frame = CGRectMake(0, 0, appImage.size.width / 2, appImage.size.height / 2);
+            self.frame = CGRectMake(0, 0, appImage.size.width / 2, appImage.size.height / 2);
+            _appOverlay.frame = CGRectMake(0, 0, self.frame.size.width / 2.f, self.frame.size.height / 4.f);
+            _appOverlay.layer.shadowRadius = 4.0;
+            [_appOverlay setCenter:CGPointMake(self.frame.size.width/2, self.frame.size.height/6)];
+            [_appButton setBackgroundImage:appImage forState:UIControlStateNormal];
+            [self setNeedsDisplay];
+        } else {
+            noAppImage = true;
+        }
+    } else {
+        noAppImage = true;
+    }
+    
+    if (noAppImage) {
         _appLabel = [[UILabel alloc] init];
         CGFloat padding = 4.f;
         [_appLabel setFrame: CGRectMake(padding, padding, _appButton.frame.size.width - 2 * padding, _appButton.frame.size.height - 2 * padding)];
@@ -66,18 +112,10 @@ static int LABEL_DY = 20;
         [_appLabel setTextAlignment:NSTextAlignmentCenter];
         [_appLabel setLineBreakMode:NSLineBreakByWordWrapping];
         [_appLabel setNumberOfLines:0];
-        [_appLabel setText:_app.appName];
+        [_appLabel setText:_app.name];
         [_appButton addSubview:_appLabel];
     }
     
 }
 
-/*
-// Only override drawRect: if you perform custom drawing.
-// An empty implementation adversely affects performance during animation.
-- (void)drawRect:(CGRect)rect {
-    // Drawing code
-}
-*/
-
 @end

Limelight/UIComputerView.h

@@ -7,19 +7,19 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "Host.h"
+#import "TemporaryHost.h"
 
 @protocol HostCallback <NSObject>
 
-- (void) hostClicked:(Host*)host;
+- (void) hostClicked:(TemporaryHost*)host view:(UIView*)view;
-- (void) hostLongClicked:(Host*)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];
@@ -171,7 +171,7 @@ static const int LABEL_DY = 20;
 }
 
 - (void) hostClicked {
-    [_callback hostClicked:_host];
+    [_callback hostClicked:_host view:self];
 }
 
 - (void) addClicked {

Limelight/ViewControllers/MainFrameViewController.m

@@ -5,6 +5,8 @@
 //  Copyright (c) 2014 Moonlight Stream. All rights reserved.
 //
 
+@import ImageIO;
+
 #import "MainFrameViewController.h"
 #import "CryptoManager.h"
 #import "HttpManager.h"
@@ -13,98 +15,220 @@
 #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"
 #import "StreamFrameViewController.h"
 #import "LoadingFrameViewController.h"
+#import "ComputerScrollView.h"
+#import "TemporaryApp.h"
+#import "IdManager.h"
 
 @implementation MainFrameViewController {
     NSOperationQueue* _opQueue;
-    Host* _selectedHost;
+    TemporaryHost* _selectedHost;
     NSString* _uniqueId;
     NSData* _cert;
-    NSString* _currentGame;
     DiscoveryManager* _discMan;
     AppAssetManager* _appManager;
     StreamConfiguration* _streamConfig;
-    UIAlertView* _pairAlert;
+    UIAlertController* _pairAlert;
     UIScrollView* hostScrollView;
     int currentPosition;
+    NSArray* _sortedAppList;
+    NSCache* _boxArtCache;
 }
 static NSMutableSet* hostList;
-static NSArray* appList;
 
 - (void)showPIN:(NSString *)PIN {
-    dispatch_sync(dispatch_get_main_queue(), ^{
+    dispatch_async(dispatch_get_main_queue(), ^{
-        _pairAlert = [[UIAlertView alloc] initWithTitle:@"Pairing" message:[NSString stringWithFormat:@"Enter the following PIN on the host machine: %@", PIN]delegate:self cancelButtonTitle:@"Ok" otherButtonTitles:nil, nil];
+        _pairAlert = [UIAlertController alertControllerWithTitle:@"Pairing"
-        [_pairAlert show];
+                                                         message:[NSString stringWithFormat:@"Enter the following PIN on the host machine: %@", PIN]
+                                                  preferredStyle:UIAlertControllerStyleAlert];
+        [self presentViewController:_pairAlert animated:YES completion:nil];
     });
 }
 
 - (void)pairFailed:(NSString *)message {
-    dispatch_sync(dispatch_get_main_queue(), ^{
+    dispatch_async(dispatch_get_main_queue(), ^{
-        [_pairAlert dismissWithClickedButtonIndex:0 animated:NO];
+        [_pairAlert dismissViewControllerAnimated:YES completion:nil];
-        _pairAlert = [[UIAlertView alloc] initWithTitle:@"Pairing Failed" message:message delegate:self cancelButtonTitle:@"Ok" otherButtonTitles:nil, nil];
+        _pairAlert = [UIAlertController alertControllerWithTitle:@"Pairing Failed"
-        [_pairAlert show];
+                                                         message:message
+                                                  preferredStyle:UIAlertControllerStyleAlert];
+        [_pairAlert addAction:[UIAlertAction actionWithTitle:@"Ok" style:UIAlertActionStyleDestructive handler:nil]];
+        [self presentViewController:_pairAlert animated:YES completion:nil];
+        
         [_discMan startDiscovery];
         [self hideLoadingFrame];
     });
 }
 
 - (void)pairSuccessful {
-    dispatch_sync(dispatch_get_main_queue(), ^{
+    dispatch_async(dispatch_get_main_queue(), ^{
-        [_pairAlert dismissWithClickedButtonIndex:0 animated:NO];
+        [_pairAlert dismissViewControllerAnimated:YES completion:nil];
-        _pairAlert = [[UIAlertView alloc] initWithTitle:@"Pairing Succesful" message:@"Successfully paired to host" delegate:self cancelButtonTitle:@"Ok" otherButtonTitles:nil, nil];
-        [_pairAlert show];
         [_discMan startDiscovery];
-        [self hideLoadingFrame];
+        [self alreadyPaired];
     });
 }
 
 - (void)alreadyPaired {
-    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+    BOOL usingCachedAppList = false;
+    
+    // Capture the host here because it can change once we
+    // leave the main thread
+    TemporaryHost* host = _selectedHost;
+    
+    if ([host.appList count] > 0) {
+        usingCachedAppList = true;
         dispatch_async(dispatch_get_main_queue(), ^{
-            _computerNameButton.title = _selectedHost.name;
+            if (host != _selectedHost) {
+                return;
+            }
+            
+            _computerNameButton.title = host.name;
             [self.navigationController.navigationBar setNeedsLayout];
+            
+            [self updateAppsForHost:host];
+            [self hideLoadingFrame];
         });
-        HttpManager* hMan = [[HttpManager alloc] initWithHost:_selectedHost.address uniqueId:_uniqueId deviceName:deviceName cert:_cert];
+    }
+    Log(LOG_I, @"Using cached app list: %d", usingCachedAppList);
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        HttpManager* hMan = [[HttpManager alloc] initWithHost:host.activeAddress uniqueId:_uniqueId deviceName:deviceName cert:_cert];
         
-        AppListResponse* appListResp = [[AppListResponse alloc] init];
+        // Exempt this host from discovery while handling the applist query
-        [hMan executeRequestSynchronously:[HttpRequest requestForResponse:appListResp withUrlRequest:[hMan newAppListRequest]]];
+        [_discMan removeHostFromDiscovery:host];
-        if (appListResp == nil || ![appListResp isStatusOk]) {
-            Log(LOG_W, @"Failed to get applist: %@", appListResp.statusMessage);
-        } else {
-            appList = [appListResp getAppList];
-            if (appList == nil) {
-                Log(LOG_W, @"Failed to parse applist");
-            } else {
-                dispatch_async(dispatch_get_main_queue(), ^{
-                    [self updateApps];
-                });
         
-                [_appManager stopRetrieving];
+        // Try up to 5 times to get the app list
-                [_appManager retrieveAssets:appList fromHost:_selectedHost];
+        AppListResponse* appListResp;
+        for (int i = 0; i < 5; i++) {
+            appListResp = [[AppListResponse alloc] init];
+            [hMan executeRequestSynchronously:[HttpRequest requestForResponse:appListResp withUrlRequest:[hMan newAppListRequest]]];
+            if (appListResp == nil || ![appListResp isStatusOk] || [appListResp getAppList] == nil) {
+                Log(LOG_W, @"Failed to get applist on try %d: %@", i, appListResp.statusMessage);
+                
+                // Wait for one second then retry
+                [NSThread sleepForTimeInterval:1];
+            }
+            else {
+                Log(LOG_I, @"App list successfully retreived - took %d tries", i);
+                break;
             }
         }
-        [self hideLoadingFrame];
+        
+        [_discMan addHostToDiscovery:host];
+
+        if (appListResp == nil || ![appListResp isStatusOk] || [appListResp getAppList] == nil) {
+            Log(LOG_W, @"Failed to get applist: %@", appListResp.statusMessage);
+            dispatch_async(dispatch_get_main_queue(), ^{
+                [self hideLoadingFrame];
+                
+                if (host != _selectedHost) {
+                    return;
+                }
+                
+                UIAlertController* applistAlert = [UIAlertController alertControllerWithTitle:@"Fetching App List Failed"
+                                                                                      message:@"The connection to the PC was interrupted."
+                                                                               preferredStyle:UIAlertControllerStyleAlert];
+                [applistAlert addAction:[UIAlertAction actionWithTitle:@"Ok" style:UIAlertActionStyleDestructive handler:nil]];
+                [self presentViewController:applistAlert animated:YES completion:nil];
+                host.online = NO;
+                [self showHostSelectionView];
+            });
+        } else {
+            dispatch_async(dispatch_get_main_queue(), ^{
+                [self updateApplist:[appListResp getAppList] forHost:host];
+
+                if (host != _selectedHost) {
+                    return;
+                }
+                
+                _computerNameButton.title = host.name;
+                [self.navigationController.navigationBar setNeedsLayout];
+                
+                [self updateAppsForHost:host];
+                [_appManager stopRetrieving];
+                [_appManager retrieveAssetsFromHost:host];
+                [self hideLoadingFrame];
+            });
+        }
     });
 }
 
+- (void) updateApplist:(NSSet*) newList forHost:(TemporaryHost*)host {
+    DataManager* database = [[DataManager alloc] init];
+    
+    for (TemporaryApp* app in newList) {
+        BOOL appAlreadyInList = NO;
+        for (TemporaryApp* savedApp in host.appList) {
+            if ([app.id isEqualToString:savedApp.id]) {
+                savedApp.name = app.name;
+                savedApp.isRunning = app.isRunning;
+                appAlreadyInList = YES;
+                break;
+            }
+        }
+        if (!appAlreadyInList) {
+            app.host = host;
+            [host.appList addObject:app];
+        }
+    }
+    
+    BOOL appWasRemoved;
+    do {
+        appWasRemoved = NO;
+        
+        for (TemporaryApp* app in host.appList) {
+            appWasRemoved = YES;
+            for (TemporaryApp* mergedApp in newList) {
+                if ([mergedApp.id isEqualToString:app.id]) {
+                    appWasRemoved = NO;
+                    break;
+                }
+            }
+            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.
+                
+                [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;
+            }
+        }
+        
+        // Keep looping until the list is no longer being mutated
+    } while (appWasRemoved);
+
+    [database updateAppsForExistingHost:host];
+}
+
 - (void)showHostSelectionView {
-    appList = [[NSArray alloc] init];
     [_appManager stopRetrieving];
+    _selectedHost = nil;
     _computerNameButton.title = @"No Host Selected";
     [self.collectionView reloadData];
     [self.view addSubview:hostScrollView];
 }
 
-- (void) receivedAssetForApp:(App*)app {
+- (void) receivedAssetForApp:(TemporaryApp*)app {
-    [self.collectionView reloadData];
+    // 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];
+    });
 }
 
 - (void)displayDnsFailedDialog {
@@ -115,17 +239,56 @@ static NSArray* appList;
     [self presentViewController:alert animated:YES completion:nil];
 }
 
-- (void) hostClicked:(Host *)host {
+- (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
+    // code path.
+    if (!host.online && view != nil) {
+        [self hostLongClicked:host view:view];
+        return;
+    }
+    
     Log(LOG_D, @"Clicked host: %@", host.name);
-    [self showLoadingFrame];
     _selectedHost = host;
+    [self disableNavigation];
+    
+    // If we are online, paired, and have a cached app list, skip straight
+    // to the app grid without a loading frame. This is the fast path that users
+    // should hit most.
+    if (host.online && host.pairState == PairStatePaired && host.appList.count > 0) {
+        [self alreadyPaired];
+        return;
+    }
+    
+    [self showLoadingFrame];
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-        HttpManager* hMan = [[HttpManager alloc] initWithHost:host.address uniqueId:_uniqueId deviceName:deviceName cert:_cert];
+        HttpManager* hMan = [[HttpManager alloc] initWithHost:host.activeAddress uniqueId:_uniqueId deviceName:deviceName cert:_cert];
         ServerInfoResponse* serverInfoResp = [[ServerInfoResponse alloc] init];
-        [hMan executeRequestSynchronously:[HttpRequest requestForResponse:serverInfoResp withUrlRequest:[hMan newServerInfoRequest]]];
+        
+        // Exempt this host from discovery while handling the serverinfo request
+        [_discMan removeHostFromDiscovery:host];
+        [hMan executeRequestSynchronously:[HttpRequest requestForResponse:serverInfoResp withUrlRequest:[hMan newServerInfoRequest]
+                                           fallbackError:401 fallbackRequest:[hMan newHttpServerInfoRequest]]];
+        [_discMan addHostToDiscovery:host];
+        
         if (serverInfoResp == nil || ![serverInfoResp isStatusOk]) {
             Log(LOG_W, @"Failed to get server info: %@", serverInfoResp.statusMessage);
-            [self hideLoadingFrame];
+            dispatch_async(dispatch_get_main_queue(), ^{
+                [self hideLoadingFrame];
+                
+                if (host != _selectedHost) {
+                    return;
+                }
+                
+                UIAlertController* applistAlert = [UIAlertController alertControllerWithTitle:@"Fetching Server Info Failed"
+                                                                                      message:@"The connection to the PC was interrupted."
+                                                                               preferredStyle:UIAlertControllerStyleAlert];
+                [applistAlert addAction:[UIAlertAction actionWithTitle:@"Ok" style:UIAlertActionStyleDestructive handler:nil]];
+                [self presentViewController:applistAlert animated:YES completion:nil];
+                host.online = NO;
+                [self showHostSelectionView];
+            });
         } else {
             Log(LOG_D, @"server info pair status: %@", [serverInfoResp getStringTag:@"PairStatus"]);
             if ([[serverInfoResp getStringTag:@"PairStatus"] isEqualToString:@"1"]) {
@@ -142,17 +305,10 @@ static NSArray* appList;
     });
 }
 
-- (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) {
+    if (!host.online) {
-        [longClickAlert addAction:[UIAlertAction actionWithTitle:@"Unpair" style:UIAlertActionStyleDefault handler:^(UIAlertAction* action){
-            dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-                HttpManager* hMan = [[HttpManager alloc] initWithHost:host.address uniqueId:_uniqueId deviceName:deviceName cert:_cert];
-                [hMan executeRequest:[HttpRequest requestWithUrlRequest:[hMan newUnpairRequest]]];
-            });
-        }]];
-    } else {
         [longClickAlert addAction:[UIAlertAction actionWithTitle:@"Wake" style:UIAlertActionStyleDefault handler:^(UIAlertAction* action){
             UIAlertController* wolAlert = [UIAlertController alertControllerWithTitle:@"Wake On Lan" message:@"" preferredStyle:UIAlertControllerStyleAlert];
             [wolAlert addAction:[UIAlertAction actionWithTitle:@"OK" style:UIAlertActionStyleDefault handler:nil]];
@@ -175,8 +331,8 @@ static NSArray* appList;
         [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]];
@@ -198,10 +354,8 @@ static NSArray* appList;
     [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 saveHosts];
                     dispatch_async(dispatch_get_main_queue(), ^{
                         @synchronized(hostList) {
                             [hostList addObject:host];
@@ -222,19 +376,14 @@ static NSArray* appList;
     [self presentViewController:alertController animated:YES completion:nil];
 }
 
-- (void) appClicked:(App *)app {
+- (void) appClicked:(TemporaryApp *)app {
-    Log(LOG_D, @"Clicked app: %@", app.appName);
+    Log(LOG_D, @"Clicked app: %@", app.name);
     _streamConfig = [[StreamConfiguration alloc] init];
-    _streamConfig.host = _selectedHost.address;
+    _streamConfig.host = app.host.activeAddress;
-    _streamConfig.hostAddr = [Utils resolveHost:_selectedHost.address];
+    _streamConfig.appID = app.id;
-    _streamConfig.appID = app.appId;
-    if (_streamConfig.hostAddr == 0) {
-        [self displayDnsFailedDialog];
-        return;
-    }
     
     DataManager* dataMan = [[DataManager alloc] init];
-    Settings* streamSettings = [dataMan retrieveSettings];
+    TemporarySettings* streamSettings = [dataMan getSettings];
     
     _streamConfig.frameRate = [streamSettings.framerate intValue];
     _streamConfig.bitRate = [streamSettings.bitrate intValue];
@@ -247,30 +396,63 @@ static NSArray* appList;
         [[self revealViewController] revealToggle:self];
     }
     
-    App* currentApp = [self findRunningApp];
+    TemporaryApp* currentApp = [self findRunningApp:app.host];
     if (currentApp != nil) {
         UIAlertController* alertController = [UIAlertController
-                                              alertControllerWithTitle: app.appName
+                                              alertControllerWithTitle: app.name
-                                              message: [app.appId isEqualToString:currentApp.appId] ? @"" : [NSString stringWithFormat:@"%@ is currently running", currentApp.appName]preferredStyle:UIAlertControllerStyleAlert];
+                                              message: [app.id isEqualToString:currentApp.id] ? @"" : [NSString stringWithFormat:@"%@ is currently running", currentApp.name]preferredStyle:UIAlertControllerStyleAlert];
         [alertController addAction:[UIAlertAction
-                                    actionWithTitle:[app.appId isEqualToString:currentApp.appId] ? @"Resume App" : @"Resume Running App" style:UIAlertActionStyleDefault handler:^(UIAlertAction* action){
+                                    actionWithTitle:[app.id isEqualToString:currentApp.id] ? @"Resume App" : @"Resume Running App" style:UIAlertActionStyleDefault handler:^(UIAlertAction* action){
-                                        Log(LOG_I, @"Resuming application: %@", currentApp.appName);
+                                        Log(LOG_I, @"Resuming application: %@", currentApp.name);
                                         [self performSegueWithIdentifier:@"createStreamFrame" sender:nil];
                                     }]];
         [alertController addAction:[UIAlertAction actionWithTitle:
-                                    [app.appId isEqualToString:currentApp.appId] ? @"Quit App" : @"Quit Running App and Start" style:UIAlertActionStyleDestructive handler:^(UIAlertAction* action){
+                                    [app.id isEqualToString:currentApp.id] ? @"Quit App" : @"Quit Running App and Start" style:UIAlertActionStyleDestructive handler:^(UIAlertAction* action){
-                                        Log(LOG_I, @"Quitting application: %@", currentApp.appName);
+                                        Log(LOG_I, @"Quitting application: %@", currentApp.name);
                                         dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-                                            HttpManager* hMan = [[HttpManager alloc] initWithHost:_selectedHost.address uniqueId:_uniqueId deviceName:deviceName cert:_cert];
+                                            HttpManager* hMan = [[HttpManager alloc] initWithHost:app.host.activeAddress uniqueId:_uniqueId deviceName:deviceName cert:_cert];
-                                            [hMan executeRequestSynchronously:[HttpRequest requestWithUrlRequest:[hMan newQuitAppRequest]]];
+                                            HttpResponse* quitResponse = [[HttpResponse alloc] init];
-                                            // TODO: handle failure to quit app
+                                            HttpRequest* quitRequest = [HttpRequest requestForResponse: quitResponse withUrlRequest:[hMan newQuitAppRequest]];
-                                            currentApp.isRunning = NO;
+                                            
+                                            // Exempt this host from discovery while handling the quit operation
+                                            [_discMan removeHostFromDiscovery:app.host];
+                                            [hMan executeRequestSynchronously:quitRequest];
+                                            [_discMan addHostToDiscovery:app.host];
+                                            
+                                            UIAlertController* alert;
+                                            
+                                            // If it fails, display an error and stop the current operation
+                                            if (quitResponse.statusCode != 200) {
+                                               alert = [UIAlertController alertControllerWithTitle:@"Quitting App Failed"
+                                                                                      message:@"Failed to quit app. If this app was started by "
+                                                        "another device, you'll need to quit from that device."
+                                                                               preferredStyle:UIAlertControllerStyleAlert];
+                                            }
+                                            // If it succeeds and we're to start streaming, segue to the stream and return
+                                            else if (![app.id isEqualToString:currentApp.id]) {
+                                                currentApp.isRunning = NO;
                                                 
-                                            if (![app.appId isEqualToString:currentApp.appId]) {
                                                 dispatch_async(dispatch_get_main_queue(), ^{
+                                                    [self updateAppsForHost:app.host];
                                                     [self performSegueWithIdentifier:@"createStreamFrame" sender:nil];
                                                 });
+                                                
+                                                return;
                                             }
+                                            // Otherwise, display a dialog to notify the user that the app was quit
+                                            else {
+                                                currentApp.isRunning = NO;
+                                                
+                                                alert = [UIAlertController alertControllerWithTitle:@"Quitting App"
+                                                                                            message:@"The app was quit successfully."
+                                                                                     preferredStyle:UIAlertControllerStyleAlert];
+                                            }
+                                            
+                                            [alert addAction:[UIAlertAction actionWithTitle:@"Ok" style:UIAlertActionStyleDestructive handler:nil]];
+                                            dispatch_async(dispatch_get_main_queue(), ^{
+                                                [self updateAppsForHost:app.host];
+                                                [self presentViewController:alert animated:YES completion:nil];
+                                            });
                                         });
                                     }]];
         [alertController addAction:[UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel handler:nil]];
@@ -280,8 +462,8 @@ static NSArray* appList;
     }
 }
 
-- (App*) findRunningApp {
+- (TemporaryApp*) findRunningApp:(TemporaryHost*)host {
-    for (App* app in appList) {
+    for (TemporaryApp* app in host.appList) {
         if (app.isRunning) {
             return app;
         }
@@ -311,6 +493,7 @@ static NSArray* appList;
 
 - (void) hideLoadingFrame {
     [self dismissViewControllerAnimated:YES completion:nil];
+    [self enableNavigation];
 }
 
 - (void)viewDidLoad
@@ -335,7 +518,7 @@ static NSArray* appList;
     
     // Set up crypto
     [CryptoManager generateKeyPairUsingSSl];
-    _uniqueId = [CryptoManager getUniqueID];
+    _uniqueId = [IdManager getUniqueId];
     _cert = [CryptoManager readCertFromFile];
 
     _appManager = [[AppAssetManager alloc] initWithCallback:self];
@@ -346,19 +529,54 @@ static NSArray* appList;
         hostList = [[NSMutableSet alloc] init];
     }
     
+    _boxArtCache = [[NSCache alloc] init];
+    
     [self setAutomaticallyAdjustsScrollViewInsets:NO];
     
-    hostScrollView = [[UIScrollView alloc] init];
+    hostScrollView = [[ComputerScrollView alloc] init];
     hostScrollView.frame = CGRectMake(0, self.navigationController.navigationBar.frame.origin.y + self.navigationController.navigationBar.frame.size.height, self.view.frame.size.width, self.view.frame.size.height / 2);
     [hostScrollView setShowsHorizontalScrollIndicator:NO];
+    hostScrollView.delaysContentTouches = NO;
+    
+    UIButton* pullArrow = [[UIButton alloc] init];
+    [pullArrow setImage:[UIImage imageNamed:@"PullArrow"] forState:UIControlStateNormal];
+    [pullArrow sizeToFit];
+    pullArrow.frame = CGRectMake(0,
+                                 self.collectionView.frame.size.height / 2 - pullArrow.frame.size.height / 2 - self.navigationController.navigationBar.frame.size.height,
+                                 pullArrow.frame.size.width,
+                                 pullArrow.frame.size.height);
+    [self.view addSubview:pullArrow];
+    
+    
+    self.collectionView.delaysContentTouches = NO;
+    self.collectionView.allowsMultipleSelection = NO;
+    self.collectionView.multipleTouchEnabled = NO;
     
     [self retrieveSavedHosts];
     _discMan = [[DiscoveryManager alloc] initWithHosts:[hostList allObjects] andCallback:self];
     
+    [[NSNotificationCenter defaultCenter] addObserver: self
+                                             selector: @selector(handleReturnToForeground)
+                                                 name: UIApplicationWillEnterForegroundNotification
+                                               object: nil];
+    
     [self updateHosts];
     [self.view addSubview:hostScrollView];
 }
 
+-(void)dealloc
+{
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
+
+-(void)handleReturnToForeground
+{
+    // This will refresh the applist
+    if (_selectedHost != nil) {
+        [self hostClicked:_selectedHost view:nil];
+    }
+}
+
 - (void)viewDidAppear:(BOOL)animated
 {
     [super viewDidAppear:animated];
@@ -371,10 +589,7 @@ static NSArray* appList;
     
     [_discMan startDiscovery];
     
-    // This will refresh the applist
+    [self handleReturnToForeground];
-    if (_selectedHost != nil) {
-        [self hostClicked:_selectedHost];
-    }
 }
 
 - (void)viewDidDisappear:(BOOL)animated
@@ -383,23 +598,36 @@ static NSArray* appList;
     // when discovery stops, we must create a new instance because you cannot restart an NSOperation when it is finished
     [_discMan stopDiscovery];
     
-    // In case the host objects were updated in the background
+    // Purge the box art cache
-    [[[DataManager alloc] init] saveHosts];
+    [_boxArtCache removeAllObjects];
 }
 
 - (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 (TemporaryHost* host in hostList) {
+            if (host.activeAddress == nil) {
+                host.activeAddress = host.localAddress;
+            }
+            if (host.activeAddress == nil) {
+                host.activeAddress = host.externalAddress;
+            }
+            if (host.activeAddress == nil) {
+                host.activeAddress = host.address;
+            }
+        }
     }
 }
 
 - (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}", host.name, host.address, host.localAddress, host.externalAddress, host.uuid, host.mac, host.pairState, host.online);
+            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) {
             [hostList removeAllObjects];
@@ -416,13 +644,16 @@ static NSArray* appList;
     UIComputerView* compView;
     float prevEdge = -1;
     @synchronized (hostList) {
-        for (Host* comp in hostList) {
+        // Sort the host list in alphabetical order
+        NSArray* sortedHostList = [[hostList allObjects] sortedArrayUsingSelector:@selector(compareName:)];
+        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;
             [hostScrollView addSubview:compView];
         }
     }
+    
     prevEdge = [self getCompViewX:addComp addComp:addComp prevEdge:prevEdge];
     addComp.center = CGPointMake(prevEdge, hostScrollView.frame.size.height / 2);
     
@@ -438,7 +669,66 @@ static NSArray* appList;
     }
 }
 
-- (void) updateApps {
+// This function forces immediate decoding of the UIImage, rather
+// than the default lazy decoding that results in janky scrolling.
++ (UIImage*) loadBoxArtForCaching:(TemporaryApp*)app {
+    
+    CGImageSourceRef source = CGImageSourceCreateWithData((__bridge CFDataRef)app.image, NULL);
+    CGImageRef cgImage = CGImageSourceCreateImageAtIndex(source, 0, (__bridge CFDictionaryRef)@{(id)kCGImageSourceShouldCacheImmediately: (id)kCFBooleanTrue});
+    
+    UIImage *boxArt = [UIImage imageWithCGImage:cgImage];
+    
+    CGImageRelease(cgImage);
+    CFRelease(source);
+    
+    return boxArt;
+}
+
+- (void) updateBoxArtCacheForApp:(TemporaryApp*)app {
+    if (app.image == nil) {
+        [_boxArtCache removeObjectForKey:app];
+    }
+    else if ([_boxArtCache objectForKey:app] == nil) {
+        [_boxArtCache setObject:[MainFrameViewController loadBoxArtForCaching:app] forKey:app];
+    }
+}
+
+- (void) updateAppsForHost:(TemporaryHost*)host {
+    if (host != _selectedHost) {
+        Log(LOG_W, @"Mismatched host during app update");
+        return;
+    }
+    
+    _sortedAppList = [host.appList allObjects];
+    _sortedAppList = [_sortedAppList sortedArrayUsingSelector:@selector(compareName:)];
+    
+    // Split the sorted array in half to allow 2 jobs to process app assets at once
+    NSArray *firstHalf;
+    NSArray *secondHalf;
+    NSRange range;
+    
+    range.location = 0;
+    range.length = [_sortedAppList count] / 2;
+    
+    firstHalf = [_sortedAppList subarrayWithRange:range];
+    
+    range.location = range.length;
+    range.length = [_sortedAppList count] - range.length;
+    
+    secondHalf = [_sortedAppList subarrayWithRange:range];
+    
+    // Start 2 jobs
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        for (TemporaryApp* app in firstHalf) {
+            [self updateBoxArtCacheForApp:app];
+        }
+    });
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        for (TemporaryApp* app in secondHalf) {
+            [self updateBoxArtCacheForApp:app];
+        }
+    });
+    
     [hostScrollView removeFromSuperview];
     [self.collectionView reloadData];
 }
@@ -446,8 +736,8 @@ static NSArray* appList;
 - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath {
     UICollectionViewCell* cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"AppCell" forIndexPath:indexPath];
     
-    App* app = appList[indexPath.row];
+    TemporaryApp* app = _sortedAppList[indexPath.row];
-    UIAppView* appView = [[UIAppView alloc] initWithApp:app andCallback:self];
+    UIAppView* appView = [[UIAppView alloc] initWithApp:app cache:_boxArtCache andCallback:self];
     [appView updateAppImage];
     
     if (appView.bounds.size.width > 10.0) {
@@ -459,6 +749,18 @@ static NSArray* appList;
     [cell.subviews.firstObject removeFromSuperview]; // Remove a view that was previously added
     [cell addSubview:appView];
 
+    
+    UIBezierPath *shadowPath = [UIBezierPath bezierPathWithRect:cell.bounds];
+    cell.layer.masksToBounds = NO;
+    cell.layer.shadowColor = [UIColor blackColor].CGColor;
+    cell.layer.shadowOffset = CGSizeMake(1.0f, 5.0f);
+    cell.layer.shadowOpacity = 0.5f;
+    cell.layer.shadowPath = shadowPath.CGPath;
+    
+    cell.layer.borderColor = [[UIColor colorWithRed:0 green:0 blue:0 alpha:0.3f] CGColor];
+    cell.layer.borderWidth = 1;
+    cell.exclusiveTouch = YES;
+
     return cell;
 }
 
@@ -467,7 +769,12 @@ static NSArray* appList;
 }
 
 - (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section {
-    return appList.count;
+    if (_selectedHost != nil) {
+        return _selectedHost.appList.count;
+    }
+    else {
+        return 0;
+    }
 }
 
 - (void)didReceiveMemoryWarning
@@ -489,4 +796,12 @@ static NSArray* appList;
     return YES;
 }
 
+- (void) disableNavigation {
+    self.navigationController.navigationBar.topItem.rightBarButtonItem.enabled = NO;
+}
+
+- (void) enableNavigation {
+    self.navigationController.navigationBar.topItem.rightBarButtonItem.enabled = YES;
+}
+
 @end