Changeset 84

Timestamp:

10/09/08 11:26:20 (5 years ago)

Author:

henri

Message:

Changed display of NTNs not to show suffix if subdomain

Location:

apps/iphone/sampleTelApp/trunk/Classes

Files:

• sampleTelAppViewController.h (modified) (1 diff)
• sampleTelAppViewController.m (modified) (3 diffs)

apps/iphone/sampleTelApp/trunk/Classes/sampleTelAppViewController.h

@@ -25 +25 @@
         NSMutableArray *locArray;
         NSMutableArray *otherArray;
+        NSMutableString *requestedDomain;
                 
         IBOutlet UITableView *telTable;

apps/iphone/sampleTelApp/trunk/Classes/sampleTelAppViewController.m

@@ -59 +59 @@
                 locArray = [[NSMutableArray arrayWithCapacity:1] retain];
                 otherArray = [[NSMutableArray arrayWithCapacity:1] retain];
-        }       
+        }
+        requestedDomain = [[NSMutableString stringWithString:@""] retain];
 }
 
@@ -94 +95 @@
 
         // Append ".tel" if it was not provided
-        NSMutableString *requestedDomain = [NSMutableString stringWithString:domain];
+        [requestedDomain setString:domain];
         if (![requestedDomain hasSuffix:@".tel"]) {
                 [requestedDomain appendString:@".tel"];
@@ -210 +211 @@
                                 cell = (UITableViewCell *)[naptrCellNib objectAtIndex:1];
                         }
+
                         [(UILabel *)[cell viewWithTag:1] setText:theRec.serviceDescription];
                         [(UILabel *)[cell viewWithTag:2] setText:theRec.labelDescription];
-                        [(UILabel *)[cell viewWithTag:3] setText:theRec.uriContent];
+
+                        // Check if it's a nonterminal naptr. If so, add the accessory indicator
+                        // and remove the trailing part of the string if it is a subdomain of the current domain
+                        if (theRec.isTerminal) {
+                                [(UILabel *)[cell viewWithTag:3] setText:theRec.uriContent];
+                        } else {
+                                if ([[theRec.uriContent lowercaseString] hasSuffix:[requestedDomain lowercaseString]]) {
+                                        NSUInteger suffixIndex = [theRec.uriContent length] - [requestedDomain length] - 1;
+                                        [(UILabel *)[cell viewWithTag:3] setText:[theRec.uriContent substringToIndex:suffixIndex]];
+                                } else {
+                                        [(UILabel *)[cell viewWithTag:3] setText:theRec.uriContent];
+                                }
+                                [cell setAccessoryType:UITableViewCellAccessoryDisclosureIndicator];
+                        }
+                        
                         return cell;
                 }