Changeset 470 for apps/iphone/superbook/trunk/Classes/NaptrViewController.m

Timestamp:

07/27/09 16:15:47 (4 years ago)

Author:

henri

Message:

Fix to centralize proper filtering of .tel domains

Files:

• apps/iphone/superbook/trunk/Classes/NaptrViewController.m (modified) (2 diffs)

apps/iphone/superbook/trunk/Classes/NaptrViewController.m

@@ -71 +71 @@
         txtFont = [UIFont boldSystemFontOfSize:kTextFontSize];
 
-        self.title = [self telFromQueryString:telName];
+        self.title = [[FriendsData sharedInstance] telFromQueryString:telName];
         if (!self.title)
                 return FALSE;
@@ -473 +473 @@
 
 #pragma mark ------ Custom Data Methods
-
-- (NSString *)telFromQueryString:(NSString *)query {
-        if (!query)
-                return nil;
-        NSMutableString *qry = [NSMutableString stringWithString:query];
-        if ([qry length] == 0)
-                return nil;
-        if ([qry hasPrefix:@"http://"]) {
-                [qry deleteCharactersInRange:NSMakeRange(0, [@"http://" length])];
-        } else if ([qry hasPrefix:@"https://"]) {
-                [qry deleteCharactersInRange:NSMakeRange(0, [@"https://" length])];
-        }
-        if ([qry hasPrefix:@"www."]) {
-                [qry deleteCharactersInRange:NSMakeRange(0, [@"www." length])];
-        }
-        if ([qry hasPrefix:@"+"]) {
-                // Check if it's a phone number, try the sip version
-                BOOL isValidNumber = YES;
-                NSMutableString *enumStr = [NSMutableString stringWithCapacity:30];
-                NSRange prefixR = NSMakeRange(0, 0);
-                for (int i = 1; i < [qry length]; i++) {
-                        unichar aChar = [qry characterAtIndex:i];
-                        if ((aChar < 47) || (aChar > 58)) {     // Not in range of Unicode digits 0-9
-                                isValidNumber = NO;
-                                break;
-                        }
-                        [enumStr replaceCharactersInRange:prefixR withString:[NSString stringWithFormat:@"%c.", aChar]];
-                }
-                if (isValidNumber) {
-                        [enumStr appendString:@"e164.arpa"];
-                        qry = enumStr;
-                }
-        } else if ([qry hasSuffix:@".tel"]) {
-                // .tel domain, do nothing
-        } else if ([qry hasSuffix:@".e164.arpa"]) {
-                // ENUM domain, let's add support for it, why not!
-                // Superbook will be the best ENUM client too! :)
-        } else {
-                qry = [NSString stringWithFormat:@"%@.tel", qry];
-        }
-        return qry;
-}
 
 - (void)getNaptrForTel:(NSString *)telName {