Changeset 213 for apps/iphone/my.tel

Timestamp:

01/29/09 16:18:27 (4 years ago)

Author:

henri

Message:

Allowed for cached keyword types

Location:

apps/iphone/my.tel/trunk/Classes

Files:

• KeywordViewController.h (modified) (1 diff)
• KeywordViewController.m (modified) (5 diffs)

apps/iphone/my.tel/trunk/Classes/KeywordViewController.h

@@ -37 +37 @@
 - (void)storeKeyword:(NSDictionary *)aRec;      // Could be a set of primary+secondaries
 - (void)deleteKeywords:(NSDictionary *)aRec;
-- (void)getValidKeywords;
+- (void)getValidKeywords:(BOOL)fromNetwork;
 
 @property (nonatomic, retain) NSMutableDictionary *validKeywordTypes;

apps/iphone/my.tel/trunk/Classes/KeywordViewController.m

@@ -37 +37 @@
         rowsToDelete = [[NSMutableDictionary dictionaryWithCapacity:5] retain];
         keywordTableHeight = kKRowHeight;
-        [self getValidKeywords];
+        [self getValidKeywords:FALSE];
 }
 
@@ -273 +273 @@
 
 - (void)fillValidKeywordsDict:(NSDictionary *)parsedJson {
-        if (!parsedJson)
-                return;
         if (!self.validKeywordTypes) {
                 self.validKeywordTypes = [[NSMutableDictionary dictionaryWithCapacity:20] retain];
@@ -280 +278 @@
                 [self.validKeywordTypes removeAllObjects];
         }
-        // TODO: Why do we check success here, and not in the record's fillServicesDict and fillLocationsDict?
-        if ([[parsedJson valueForKey:@"success"] integerValue] == 1) {
-                NSArray *keyTypeList = (NSArray *)[parsedJson valueForKey:@"validKeywordList"];
-                NSDictionary *aKeyType;
-                for (aKeyType in keyTypeList) {
-                        [self.validKeywordTypes setObject:(NSString *)[aKeyType objectForKey:@"displayText"]
-                         forKey:(NSString *)[aKeyType objectForKey:@"shortForm"]];
+        if (!parsedJson) {
+                // We're loading the data statically (not from the network)
+                self.validKeywordTypes = [NSMutableDictionary dictionaryWithContentsOfFile:[[[NSBundle mainBundle] resourcePath]
+                                                                                                                                                           stringByAppendingPathComponent:@"KeywordTypes.plist"]];
+        } else {
+                if ([[parsedJson valueForKey:@"success"] integerValue] == 1) {
+                        NSArray *keyTypeList = (NSArray *)[parsedJson valueForKey:@"validKeywordList"];
+                        NSDictionary *aKeyType;
+                        for (aKeyType in keyTypeList) {
+                                [self.validKeywordTypes setObject:(NSString *)[aKeyType objectForKey:@"displayText"]
+                                 forKey:(NSString *)[aKeyType objectForKey:@"shortForm"]];
+                        }
+                } else {
+                        [Keyword throwJsonErrorAlert:parsedJson];
                 }
-        } else {
-                [Keyword throwJsonErrorAlert:parsedJson];
         }
 }
@@ -452 +455 @@
 }
 
-- (void)getValidKeywords {
+- (void)getValidKeywords:(BOOL)fromNetwork {
         //      successResult = {
         //      success: true,
@@ -465 +468 @@
         //      };
         
-        Keyword *conn = [[[Keyword alloc] init] autorelease];
-        [conn setTheDelegate:[VIPConnect sharedInstance]];
-        [conn setActionSel:@selector(doNothing:)];
-        [conn setConnectionUrl:[conn urlFromAction:@"getvalidkeywords"]];
-        
-        NSMutableDictionary *requestData = [[NSMutableDictionary dictionaryWithCapacity:1] retain];
-        [requestData setObject:[VIPConnect sharedInstance].selectedDomain forKey:@"domain"];
-        
-        [conn setPayload:requestData];
-        NSDictionary *parsedJson = [conn performLookup:FALSE];
-        [self fillValidKeywordsDict:parsedJson];
-        [requestData release];
+        if (fromNetwork) {
+                Keyword *conn = [[[Keyword alloc] init] autorelease];
+                [conn setTheDelegate:[VIPConnect sharedInstance]];
+                [conn setActionSel:@selector(doNothing:)];
+                [conn setConnectionUrl:[conn urlFromAction:@"getvalidkeywords"]];
+                
+                NSMutableDictionary *requestData = [[NSMutableDictionary dictionaryWithCapacity:1] retain];
+                [requestData setObject:[VIPConnect sharedInstance].selectedDomain forKey:@"domain"];
+                
+                [conn setPayload:requestData];
+                NSDictionary *parsedJson = [conn performLookup:FALSE];
+                [self fillValidKeywordsDict:parsedJson];
+                [requestData release];
+        } else {
+                [self fillValidKeywordsDict:nil];
+        }
 }