Changeset 794 for apps/iphone/my.tel/trunk/Classes/ProfileRecordsViewController.m

Timestamp:

01/28/11 13:14:41 (2 years ago)

Author:

henri

Message:

Refactored handling of dynamic generation of localized service types, LIH and keywords.
All are now done in the background and won't impact the loading of the controllers.
They are handled by a new singleton class called CurrentAccount?. They are cached per account

Files:

• apps/iphone/my.tel/trunk/Classes/ProfileRecordsViewController.m (modified) (5 diffs)

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

@@ -9 +9 @@
 #import "ProfileRecordsViewController.h"
 #import "ProfileRecordCell.h"
+#import "CurrentAccount.h"
 
 #define kNINFOMaxLength 255             // NINFO max length
@@ -423 +424 @@
 #endif
         
+        CurrentAccount *currentAccount = [CurrentAccount sharedInstance];
         NSMutableDictionary *uiItem;
         if (!jsonItem) {
@@ -474 +476 @@
         if ([jsonItem objectForKey:@"terminal"] && [[jsonItem objectForKey:@"terminal"] integerValue] == 0) { //nonterminal
                 [uiItem setValue:@"0" forKey:@"terminal"];
-                [uiItem setObject:[self.skeysDict objectForKey:@"ntn"] forKey:@"service"];
+                [uiItem setObject:[currentAccount localizedNameForService:@"ntn"] forKey:@"service"];
                 [uiItem setObject:(NSString *)[[ProfileRecordsViewController imageMappings] objectForKey:@"ntn"] forKey:@"imageName"];
                 return uiItem;
@@ -502 +504 @@
                                 [sPart appendString:@" & "];
                         }
-                        if ([self.skeysDict objectForKey:anS]) {
-                                [sPart appendString:[self.skeysDict objectForKey:anS]];
-                        } else {
-                                [sPart appendString:anS];
-                        }
+                        [sPart appendString:[currentAccount localizedNameForService:anS]];
                 }
         }
@@ -515 +513 @@
                                 [liPart appendString:@" & "];
                         NSString *anLI = (NSString *)[[jsonItem objectForKey:@"locations"] objectAtIndex:i];
-                        [liPart appendString:[self.liDict objectForKey:anLI]];
+                        [liPart appendString:[currentAccount localizedNameForLocation:anLI]];
                         if ([anLI isEqualToString:@"x-mobile"] && couldbeMobilePhone) {
                                 [uiItem setObject:[[ProfileRecordsViewController imageMappings] objectForKey:@"mobile"] forKey:@"imageName"];