Changeset 625 for apps

Timestamp:

01/11/10 10:29:58 (3 years ago)

Author:

henri

Message:

Added correct handling of unsupported NAPTR types.
Removed obsolete xib files

Location:

apps/iphone/my.tel/trunk

Files:

• Classes/RecordViewController.m (modified) (6 diffs)
• English.lproj/TabNaptr.xib (deleted)
• English.lproj/TabStatus.xib (deleted)
• VIP.tel.xcodeproj/project.pbxproj (modified) (6 diffs)

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

@@ -33 +33 @@
 
 + (RecordViewController *)controllerWithDelegate:(id <TelControllerDelegate>)aDelegate preload:(BOOL)preload {
-        RecordViewController *theC = [[[RecordViewController alloc] initWithNibName:@"TabNaptr" bundle:nil] autorelease];
+        RecordViewController *theC = [[[RecordViewController alloc] initWithStyle:UITableViewStyleGrouped] autorelease];
         theC.delegate = aDelegate;
         theC.skeysDict = [NSMutableDictionary dictionaryWithContentsOfFile:
@@ -156 +156 @@
    }
         NSMutableDictionary *uiItem = [[uiArray objectAtIndex:indexPath.row] retain];
+        if ([[uiItem objectForKey:@"isSupported"] integerValue] == 0) {
+                cell.accessoryType = UITableViewCellAccessoryNone;
+        } else {
+                cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
+        }
+        
         [cell.labelService setText:[NSString stringWithFormat:@"%@", [uiItem objectForKey:@"service"]]];
         [cell.labelLabel setText:[NSString stringWithFormat:@"%@", [uiItem objectForKey:@"longLabel"]]];
@@ -174 +180 @@
         if ([tableView cellForRowAtIndexPath:indexPath].editingStyle == UITableViewCellEditingStyleDelete) {
                 // Do not go into the record edit view when the table is in editing mode
+                return nil;
+        }
+        // Do not edit an unsupported NAPTR record
+        NSDictionary *uiItem = [uiArray objectAtIndex:indexPath.row];
+        if ([[uiItem objectForKey:@"isSupported"] integerValue] == 0) {
                 return nil;
         }
@@ -330 +341 @@
         //      locations: ["x-home", "x-mobile"], editable: true,
         //  longLabel: "Some text to describe my home number"}
+        //
+        // we also add the parameter "isSupported": we don't support
+        // editing of custom records where the serviceType doesn't exist
 #ifdef DEBUG
         NSLog(@"Naptr Rec in JSON: %@", [jsonItem descriptionInStringsFileFormat]);
@@ -340 +354 @@
         uiItem = [NSMutableDictionary dictionaryWithCapacity:7];
         
+        // default to item supporting editing
+        [uiItem setObject:@"1" forKey:@"isSupported"];
+
         // set apiId
         [uiItem setObject:(NSString *)[jsonItem objectForKey:@"apiId"] forKey:@"apiId"];
@@ -376 +393 @@
         if ([jsonItem objectForKey:@"serviceKeys"]) {
                 NSUInteger i, count = [[jsonItem objectForKey:@"serviceKeys"] count];
-                for (i = 0; i < count; i++) {
-                        NSString *anS = [[jsonItem objectForKey:@"serviceKeys"] objectAtIndex:i];
-                        if (i == 0) {
-                                // set the icon image to the first service key
-                                if ([imageMappings objectForKey:anS]) {
-                                        [uiItem setObject:[[RecordViewController imageMappings] objectForKey:anS] forKey:@"imageName"];
+                if (count == 0) {
+                        [sPart setString:@"<unsupported>"];
+                        [uiItem setObject:@"0" forKey:@"isSupported"];
+                } else {
+                        for (i = 0; i < count; i++) {
+                                NSString *anS = [[jsonItem objectForKey:@"serviceKeys"] objectAtIndex:i];
+                                if (i == 0) {
+                                        // set the icon image to the first service key
+                                        if ([imageMappings objectForKey:anS]) {
+                                                [uiItem setObject:[[RecordViewController imageMappings] objectForKey:anS] forKey:@"imageName"];
+                                        } else {
+                                                [uiItem setObject:[[RecordViewController imageMappings] objectForKey:@"unknown"] forKey:@"imageName"];
+                                        }
+                                        // Check for mobile phones (yes mobile phones SHOULD have been their own
+                                        // type, but blame the IETF for this ridiculous state of things)
+                                        if ([anS isEqualToString:@"voice"])
+                                                couldbeMobilePhone = YES; // Could be a mobile. see below
                                 } else {
-                                        [uiItem setObject:[[RecordViewController imageMappings] objectForKey:@"unknown"] forKey:@"imageName"];
+                                        [sPart appendString:@" & "];
                                 }
-                                // Check for mobile phones (yes mobile phones SHOULD have been their own
-                                // type, but blame the IETF for this ridiculous state of things)
-                                if ([anS isEqualToString:@"voice"])
-                                        couldbeMobilePhone = YES; // Could be a mobile. see below
-                        } else {
-                                [sPart appendString:@" & "];
-                        }
-                        if ([self.skeysDict objectForKey:anS]) {
-                                [sPart appendString:[self.skeysDict objectForKey:anS]];
-                        } else {
-                                [sPart appendString:anS];
-                        }
+                                if ([self.skeysDict objectForKey:anS]) {
+                                        [sPart appendString:[self.skeysDict objectForKey:anS]];
+                                } else {
+                                        [sPart appendString:anS];
+                                }
+                        }                       
                 }
-        }
+        } else {
+                [sPart setString:@"<unsupported>"];
+                [uiItem setObject:@"0" forKey:@"isSupported"];
+        }
+
         if ([jsonItem objectForKey:@"locations"]) {
                 NSUInteger i, count = [[jsonItem objectForKey:@"locations"] count];

apps/iphone/my.tel/trunk/VIP.tel.xcodeproj/project.pbxproj

@@ -138 +138 @@
                 38B96AF10F30B1BA006772B4 /* button-set-tel.png in Resources */ = {isa = PBXBuildFile; fileRef = 38B96AF00F30B1BA006772B4 /* button-set-tel.png */; };
                 38D9CFF610CFB65100EC529B /* AccountEditCells.xib in Resources */ = {isa = PBXBuildFile; fileRef = 38D9CFF510CFB65100EC529B /* AccountEditCells.xib */; };
-                38D9D34210CFFB8000EC529B /* TabNaptr.xib in Resources */ = {isa = PBXBuildFile; fileRef = 38D9D34110CFFB8000EC529B /* TabNaptr.xib */; };
                 38D9D34410CFFB9A00EC529B /* TabLoc.xib in Resources */ = {isa = PBXBuildFile; fileRef = 38D9D34310CFFB9A00EC529B /* TabLoc.xib */; };
-                38D9D34810CFFBB200EC529B /* TabStatus.xib in Resources */ = {isa = PBXBuildFile; fileRef = 38D9D34710CFFBB200EC529B /* TabStatus.xib */; };
                 38DA3A4C107A30C600C4DF56 /* MapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 38DA3A4B107A30C600C4DF56 /* MapKit.framework */; };
                 38DA3A55107A326900C4DF56 /* TelMapAnnotation.m in Sources */ = {isa = PBXBuildFile; fileRef = 38DA3A54107A326900C4DF56 /* TelMapAnnotation.m */; };
@@ -334 +332 @@
                 38D4C1810EF6967C00A190A1 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = English; path = English.lproj/ServiceTypes.plist; plistStructureDefinitionIdentifier = "<none>"; sourceTree = "<group>"; };
                 38D9CFF510CFB65100EC529B /* AccountEditCells.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = AccountEditCells.xib; sourceTree = "<group>"; };
-                38D9D33110CFF80900EC529B /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/TabNaptr.xib; sourceTree = "<group>"; };
                 38D9D33210CFF80900EC529B /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/TabLoc.xib; sourceTree = "<group>"; };
-                38D9D33410CFF80900EC529B /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/TabStatus.xib; sourceTree = "<group>"; };
                 38DA3A4B107A30C600C4DF56 /* MapKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MapKit.framework; path = System/Library/Frameworks/MapKit.framework; sourceTree = SDKROOT; };
                 38DA3A53107A326900C4DF56 /* TelMapAnnotation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TelMapAnnotation.h; sourceTree = "<group>"; };
@@ -679 +675 @@
                                 38ACC4400F9A2B26004B5A31 /* MainWindow.xib */,
                                 38ACC4420F9A2B26004B5A31 /* AboutView.xib */,
-                                38D9D34110CFFB8000EC529B /* TabNaptr.xib */,
                                 38D9D34310CFFB9A00EC529B /* TabLoc.xib */,
-                                38D9D34710CFFBB200EC529B /* TabStatus.xib */,
                                 38A33B06108F168A0067C20A /* ProfileRecords.xib */,
                                 38ACC4460F9A2B26004B5A31 /* Keyword Group Views.xib */,
@@ -865 +859 @@
                                 382CC3D510CE5E9B00DFCF93 /* button-bg-black.png in Resources */,
                                 38D9CFF610CFB65100EC529B /* AccountEditCells.xib in Resources */,
-                                38D9D34210CFFB8000EC529B /* TabNaptr.xib in Resources */,
                                 38D9D34410CFFB9A00EC529B /* TabLoc.xib in Resources */,
-                                38D9D34810CFFBB200EC529B /* TabStatus.xib in Resources */,
                                 385F284A10F6136A00BCBB14 /* KeywordTypesLongNames.plist in Resources */,
                         );
@@ -1055 +1047 @@
                         sourceTree = "<group>";
                 };
-                38D9D34110CFFB8000EC529B /* TabNaptr.xib */ = {
-                        isa = PBXVariantGroup;
-                        children = (
-                                38D9D33110CFF80900EC529B /* English */,
-                        );
-                        name = TabNaptr.xib;
-                        sourceTree = "<group>";
-                };
                 38D9D34310CFFB9A00EC529B /* TabLoc.xib */ = {
                         isa = PBXVariantGroup;
@@ -1069 +1053 @@
                         );
                         name = TabLoc.xib;
-                        sourceTree = "<group>";
-                };
-                38D9D34710CFFBB200EC529B /* TabStatus.xib */ = {
-                        isa = PBXVariantGroup;
-                        children = (
-                                38D9D33410CFF80900EC529B /* English */,
-                        );
-                        name = TabStatus.xib;
                         sourceTree = "<group>";
                 };