App lists are now persisted in the database

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 {
-    Host* oldHost = _host;
-    _host = host;
-    BOOL useCache = [oldHost.uuid isEqualToString:_host.uuid];
-    Log(LOG_I, @"Using cached app images: %d", useCache);
-    if (!useCache) {
-        [_imageCache removeAllObjects];
-    }
     for (App* app in appList) {
-        AppAssetRetriever* retriever = [[AppAssetRetriever alloc] init];
-        retriever.app = app;
-        retriever.host = _host;
-        retriever.callback = _callback;
-        retriever.cache = _imageCache;
-        retriever.useCache = useCache;
-        [_opQueue addOperation:retriever];
+        if (app.image == nil) {
+            AppAssetRetriever* retriever = [[AppAssetRetriever alloc] init];
+            retriever.app = app;
+            retriever.host = host;
+            retriever.callback = _callback;
+            
+            [_opQueue addOperation:retriever];
+        }
     }
 }
 

Limelight/Network/AppAssetRetriever.h

@@ -15,8 +15,6 @@
 
 @property (nonatomic) Host* host;
 @property (nonatomic) App* app;
-@property (nonatomic) NSMutableDictionary* cache;
 @property (nonatomic) id<AppAssetCallback> callback;
-@property (nonatomic) BOOL useCache;
 
 @end

Limelight/Network/AppAssetRetriever.m

@@ -16,34 +16,18 @@
 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.activeAddress 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];
-            self.app.appImage = appImage;
-            if (appImage != nil) {
-                @synchronized(self.cache) {
-                    [self.cache setObject:appImage forKey:self.app.appId];
-                }
-            }
-        }
-
+        
+        HttpManager* hMan = [[HttpManager alloc] initWithHost:_host.activeAddress uniqueId:[CryptoManager getUniqueID] deviceName:deviceName cert:[CryptoManager readCertFromFile]];
+        AppAssetResponse* appAssetResp = [[AppAssetResponse alloc] init];
+        [hMan executeRequestSynchronously:[HttpRequest requestForResponse:appAssetResp withUrlRequest:[hMan newAppAssetRequestWithAppId:self.app.id]]];
+        
+        appImage = [UIImage imageWithData:appAssetResp.data];
+        self.app.image = UIImagePNGRepresentation(appImage);
+        
         [NSThread sleepForTimeInterval:RETRY_DELAY];
     }
     [self performSelectorOnMainThread:@selector(sendCallbackForApp:) withObject:self.app waitUntilDone:NO];

Limelight/Network/AppListResponse.m

@@ -8,6 +8,7 @@
 
 #import "AppListResponse.h"
 #import "App.h"
+#import "DataManager.h"
 #import <libxml2/libxml/xmlreader.h>
 
 @implementation AppListResponse {
@@ -59,6 +60,7 @@ static const char* TAG_APP_IS_RUNNING = "IsRunning";
     self.statusMessage = statusMsg;
     
     node = node->children;
+    DataManager* dataMan = [[DataManager alloc] init];
     
     while (node != NULL) {
         //Log(LOG_D, @"node: %s", node->name);
@@ -93,11 +95,11 @@ static const char* TAG_APP_IS_RUNNING = "IsRunning";
                 }
                 appInfoNode = appInfoNode->next;
             }
-            App* app = [[App alloc] init];
-            app.appName = appName;
-            app.appId = appId;
+            App* app = [dataMan createApp];
+            app.name = appName;
+            app.id = appId;
             app.isRunning = appIsRunning;
-            if (app.appId != nil) {
+            if (app.id != nil) {
                 [_appList addObject:app];
             }
         }