Changeset 442 for apps/iphone/superbook/trunk

Timestamp:

07/07/09 16:22:41 (4 years ago)

Author:

henri

Message:

Centralized parsing .tel query string, and fixed "www" prefix removal.

Location:

apps/iphone/superbook/trunk/Classes

Files:

• FriendsData.m (modified) (1 diff)
• LocateThem_ViewController.m (modified) (2 diffs)
• NaptrViewController.h (modified) (1 diff)
• NaptrViewController.m (modified) (3 diffs)

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

@@ -371 +371 @@
         if (shouldRelease) {
                 CFRelease(recordRef);
-                //CFRelease(theBook); // TODO: why is this crashing?
         }
         if (foundUrl) {
-                NSMutableString *cleanTelUrl = [NSMutableString stringWithString:(NSString *)telUrl];
+                NSString *returnedTelUrl = [NSString stringWithString:(NSString *)telUrl];
                 CFRelease(telUrl);
-                if ([cleanTelUrl hasSuffix:@".tel/"]) {
-                        // Remove the trailing slash
-                        [cleanTelUrl deleteCharactersInRange:NSMakeRange([cleanTelUrl length]-1, 1)];
-                }
-                if ([cleanTelUrl hasPrefix:@"http://"]) {
-                        NSString *retStr = [cleanTelUrl substringFromIndex:[@"http://" length]];
-                        return retStr;
-                } else if ([(NSString *)telUrl hasPrefix:@"https://"]) {
-                        NSString *retStr = [cleanTelUrl substringFromIndex:[@"https://" length]];
-                        return retStr;
-                } else {
-                        return cleanTelUrl;
-                }
+                return returnedTelUrl;
         }
         

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

@@ -233 +233 @@
         NaptrViewController *nVC = [[[NaptrViewController alloc] initWithNibName:@"TelView" bundle:[NSBundle mainBundle]] autorelease];
         if (aPersonId) {
-                [nVC setupWithPersonId:aPersonId];
+                if (![nVC setupWithPersonId:aPersonId])
+                        return;
         } else if (aTel) {
-                [nVC setupWithTel:aTel];
+                if (![nVC setupWithTel:aTel])
+                        return;
         } else {
                 return;
@@ -299 +301 @@
 
 - (void)searchBarSearchButtonClicked:(UISearchBar *)searchBar {
-        NSMutableString *qry = [NSMutableString stringWithString:telSearch.text];
+        //Must grab the text before resigning first responder
+        NSString *query = [NSString stringWithString:searchBar.text];
     [searchBar resignFirstResponder];
-        if ([qry length] == 0)
-                return;
-        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];
-        }
-        [self launchNavControllerForTel:qry personId:nil];
+        [self launchNavControllerForTel:query personId:nil];
 }
 

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

@@ -77 +77 @@
 }
 
-- (void)setupWithPersonId:(NSNumber *)personId;
-- (void)setupWithTel:(NSString *)telName;
+- (BOOL)setupWithPersonId:(NSNumber *)personId;
+- (BOOL)setupWithTel:(NSString *)telName;
+- (NSString *)telFromQueryString:(NSString *)query;
 - (void)getNaptrForTel:(NSString *)telName;
 - (void)getTxtForTel:(NSString *)telName;

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

@@ -60 +60 @@
 
 
-- (void)setupWithPersonId:(NSNumber *)personId {
+- (BOOL)setupWithPersonId:(NSNumber *)personId {
         NSString *telName = [[FriendsData sharedInstance] getTelForABRecordId:personId withABRecordRef:nil];
-        [self setupWithTel:telName];
         self.abId = personId;
-}
-
-- (void) setupWithTel:(NSString *)telName {
+        return [self setupWithTel:telName];
+}
+
+- (BOOL) setupWithTel:(NSString *)telName {
         
         headerFont = [UIFont boldSystemFontOfSize:kHeaderTextFontSize];
         txtFont = [UIFont boldSystemFontOfSize:kTextFontSize];
 
-        self.title = telName;
+        self.title = [self telFromQueryString:telName];
+        if (!self.title)
+                return FALSE;
         self.abId = [NSNumber numberWithInt:NSUIntegerMax];
         self.cleanTelName = [NSMutableString stringWithString:self.title];
@@ -108 +110 @@
         [self performSelectorInBackground:@selector(getTxtInBackgroundForTel:) withObject:self.title];
         [self performSelectorInBackground:@selector(getLocInBackgroundForTel:) withObject:self.title];
+        return TRUE;
 }
 
@@ -469 +472 @@
 
 #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 {