new ui is almost fully functional

- add hosts
- pair to host
- get app list
- launch app
- resume app

Limelight/Network/AppManager.h

@@ -0,0 +1,23 @@
+//
+//  AppManager.h
+//  Limelight
+//
+//  Created by Diego Waxemberg on 10/25/14.
+//  Copyright (c) 2014 Limelight Stream. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "App.h"
+#import "HttpManager.h"
+
+@protocol AppAssetCallback <NSObject>
+
+- (void) receivedAssetForApp:(App*)app;
+
+@end
+
+@interface AppManager : NSObject
+
++ (void) retrieveAppAssets:(NSArray*)apps withManager:(HttpManager*)hMan andCallback:(id<AppAssetCallback>)callback;
+
+@end

Limelight/Network/AppManager.m

@@ -0,0 +1,45 @@
+//
+//  AppManager.m
+//  Limelight
+//
+//  Created by Diego Waxemberg on 10/25/14.
+//  Copyright (c) 2014 Limelight Stream. All rights reserved.
+//
+
+#import "AppManager.h"
+
+@implementation AppManager {
+    App* _app;
+    HttpManager* _hMan;
+    id<AppAssetCallback> _callback;
+}
+
++ (void) retrieveAppAssets:(NSArray*)apps withManager:(HttpManager*)hMan andCallback:(id<AppAssetCallback>)callback {
+    for (App* app in apps) {
+        AppManager* manager = [[AppManager alloc] initWithApp:app httpManager:hMan andCallback:callback];
+        [manager retrieveAsset];
+    }
+    
+}
+
+- (id) initWithApp:(App*)app httpManager:(HttpManager*)hMan andCallback:(id<AppAssetCallback>)callback {
+    self = [super init];
+    _app = app;
+    _hMan = hMan;
+    _callback = callback;
+    return self;
+}
+
+- (void) retrieveAsset {
+    NSData* appAsset = [_hMan executeRequestSynchronously:[_hMan newAppAssetRequestWithAppId:_app.appId]];
+    UIImage* appImage = [UIImage imageWithData:appAsset];
+    _app.appImage = appImage;
+    NSLog(@"App Name: %@ id:%@ image: %@", _app.appName, _app.appId, _app.appImage);
+    [self performSelectorOnMainThread:@selector(sendCallBack) withObject:self waitUntilDone:NO];
+}
+
+- (void) sendCallBack {
+    [_callback receivedAssetForApp:_app];
+}
+
+@end

Limelight/Network/HttpManager.h

@@ -10,6 +10,7 @@
 
 @interface HttpManager : NSObject <NSURLConnectionDelegate, NSURLConnectionDataDelegate>
 
++ (NSArray*) getAppListFromXML:(NSData*)xml;
 + (NSString*) getStringFromXML:(NSData*)xml tag:(NSString*)tag;
 + (NSString*) getStatusStringFromXML:(NSData*)xml;
 
@@ -24,6 +25,7 @@
 - (NSURLRequest*) newServerInfoRequest;
 - (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*) newAppAssetRequestWithAppId:(NSString*)appId;
 - (NSData*) executeRequestSynchronously:(NSURLRequest*)request;
 @end
 

Limelight/Network/HttpManager.m

@@ -8,6 +8,7 @@
 
 #import "HttpManager.h"
 #import "CryptoManager.h"
+#import "App.h"
 
 #include <libxml2/libxml/xmlreader.h>
 #include <string.h>
@@ -25,6 +26,60 @@
 
 static const NSString* PORT = @"47984";
 
++ (NSArray*) getAppListFromXML:(NSData*)xml {
+    xmlDocPtr docPtr = xmlParseMemory([xml bytes], (int)[xml length]);
+    
+    if (docPtr == NULL) {
+        NSLog(@"ERROR: An error occured trying to parse xml.");
+        return NULL;
+    }
+
+    xmlNodePtr node;
+    xmlNodePtr rootNode = node = xmlDocGetRootElement(docPtr);
+    
+    // Check root status_code
+    if (![HttpManager verifyStatus: rootNode]) {
+        NSLog(@"ERROR: Request returned with failure status");
+        return NULL;
+    }
+    
+    // Skip the root node
+    node = node->children;
+    
+    NSMutableArray* appList = [[NSMutableArray alloc] init];
+    
+    while (node != NULL) {
+        NSLog(@"node: %s", node->name);
+        if (!xmlStrcmp(node->name, (const xmlChar*)"App")) {
+            xmlNodePtr appInfoNode = node->xmlChildrenNode;
+            NSString* appName;
+            NSString* appId;
+            while (appInfoNode != NULL) {
+                NSLog(@"appInfoNode: %s", appInfoNode->name);
+                if (!xmlStrcmp(appInfoNode->name, (const xmlChar*)"AppTitle")) {
+                    xmlChar* nodeVal = xmlNodeListGetString(docPtr, appInfoNode->xmlChildrenNode, 1);
+                    appName = [[NSString alloc] initWithCString:(const char*)nodeVal encoding:NSUTF8StringEncoding];
+                    xmlFree(nodeVal);
+                } else if (!xmlStrcmp(appInfoNode->name, (const xmlChar*)"ID")) {
+                    xmlChar* nodeVal = xmlNodeListGetString(docPtr, appInfoNode->xmlChildrenNode, 1);
+                    appId = [[NSString alloc] initWithCString:(const char*)nodeVal encoding:NSUTF8StringEncoding];
+                    xmlFree(nodeVal);
+                }
+                appInfoNode = appInfoNode->next;
+            }
+            App* app = [[App alloc] init];
+            app.appName = appName;
+            app.appId = appId;
+            [appList addObject:app];
+        }
+        node = node->next;
+    }
+    xmlFree(rootNode);
+    xmlFree(docPtr);
+    
+    return appList;
+}
+
 + (NSString*) getStatusStringFromXML:(NSData*)xml {
     xmlDocPtr docPtr = xmlParseMemory([xml bytes], (int)[xml length]);
     
@@ -198,6 +253,11 @@ static const NSString* PORT = @"47984";
     return [self createRequestFromString:urlString enableTimeout:FALSE];
 }
 
+- (NSURLRequest*) newAppAssetRequestWithAppId:(NSString *)appId {
+    NSString* urlString = [NSString stringWithFormat:@"%@/appasset?uniqueid=%@&appid=%@&AssetType=2&AssetIdx=0", _baseURL, _uniqueId, appId];
+    return [self createRequestFromString:urlString enableTimeout:FALSE];
+}
+
 - (NSString*) bytesToHex:(NSData*)data {
     const unsigned char* bytes = [data bytes];
     NSMutableString *hex = [[NSMutableString alloc] init];
@@ -217,7 +277,11 @@ static const NSString* PORT = @"47984";
 }
 
 - (void)connectionDidFinishLoading:(NSURLConnection *)connection {
-    _requestResp = [HttpManager fixXmlVersion:_respData];
+    if ([[NSString alloc] initWithData:_respData encoding:NSUTF8StringEncoding] != nil) {
+        _requestResp = [HttpManager fixXmlVersion:_respData];
+    } else {
+        _requestResp = _respData;
+    }
     dispatch_semaphore_signal(_requestLock);
 }
 

Limelight/Network/PairManager.h

@@ -14,6 +14,7 @@
 - (void) showPIN:(NSString*)PIN;
 - (void) pairSuccessful;
 - (void) pairFailed:(NSString*)message;
+- (void) alreadyPaired;
 
 @end
 

Limelight/Network/PairManager.m

@@ -32,14 +32,13 @@
         [_callback pairFailed:@"Unable to connect to PC"];
         return;
     }
-    
     if (![[HttpManager getStringFromXML:serverInfo tag:@"currentgame"] isEqual:@"0"]) {
         [_callback pairFailed:@"You must stop streaming before attempting to pair."];
     }
     else if (![[HttpManager getStringFromXML:serverInfo tag:@"PairStatus"] isEqual:@"1"]) {
         [self initiatePair];
     } else {
-        [_callback pairFailed:@"This device is already paired."];
+        [_callback alreadyPaired];
     }
 }