Changeset 313 for apps/iphone/my.tel

Timestamp:

04/17/09 07:14:20 (4 years ago)

Author:

henri

Message:

Many updates to get to version 1.0.0, live on app store.

Location:

apps/iphone/my.tel/trunk

Files:

• Classes/DotTel_SDK/Classes/DnsResolver.h (modified) (3 diffs)
• Classes/DotTel_SDK/Classes/DnsResolver.m (modified) (9 diffs)
• Classes/DotTel_SDK/Classes/NetworkUtility.h (added)
• Classes/DotTel_SDK/Classes/NetworkUtility.m (added)
• Classes/DotTel_SDK/Classes/Reachability.h (added)
• Classes/DotTel_SDK/Classes/Reachability.m (added)
• Classes/DotTel_SDK/Classes/RecordLoc.h (modified) (1 diff)
• Classes/DotTel_SDK/Classes/RecordLoc.m (modified) (3 diffs)
• Classes/DotTel_SDK/Classes/RecordNaptr.h (modified) (1 diff)
• Classes/DotTel_SDK/Classes/RecordNaptr.m (modified) (4 diffs)
• Classes/DotTel_SDK/Classes/RecordTxt.h (modified) (1 diff)
• Classes/DotTel_SDK/Classes/RecordTxt.m (modified) (2 diffs)
• Classes/DotTel_SDK/README DotTel SDK (modified) (1 diff)
• Classes/GroupFriendsController.h (modified) (1 diff)
• Classes/GroupFriendsController.m (modified) (1 diff)
• Classes/HeaderViewController.h (modified) (1 diff)
• Classes/HeaderViewController.m (modified) (1 diff)
• Classes/JsonConnection.m (modified) (1 diff)
• Classes/KeywordViewController.m (modified) (2 diffs)
• Classes/LoginViewController.m (modified) (1 diff)
• Classes/ProfileViewController.m (modified) (1 diff)
• Classes/RecordGroupsController.m (modified) (1 diff)
• Classes/RecordViewController.m (modified) (2 diffs)
• Classes/VIPConnect.m (modified) (3 diffs)
• Classes/VIP_telAppDelegate.h (modified) (1 diff)
• Classes/VIP_telAppDelegate.m (modified) (1 diff)
• VIP.tel.xcodeproj/project.pbxproj (modified) (5 diffs)

apps/iphone/my.tel/trunk/Classes/DotTel_SDK/Classes/DnsResolver.h

@@ -4 +4 @@
 //
 //  Created by Henri Asseily on 9/14/08.
-//  Copyright 2008 Telnic Ltd. All rights reserved.
+/*
+ Copyright (c) 2008, Telnic Ltd. All rights reserved.
+ 
+ Redistribution and use in source and binary forms, with or without modification,
+ are permitted provided that the following conditions are met:
+ 
+ Redistributions of source code must retain the above copyright notice, this list of conditions
+ and the following disclaimer. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the documentation and/or other
+ materials provided with the distribution.
+ Neither the name of the Telnic Ltd. nor the names of its contributors may be used to endorse or
+ promote products derived from this software without specific prior written permission.
+ THIS DOCUMENTATION IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 //
 // 
@@ -18 +38 @@
 #import <UIKit/UIKit.h>
 #import "ldns.h"
+#import "NetworkUtility.h"
 #import "RecordNaptr.h"
 #import "RecordTxt.h"
@@ -48 +69 @@
  * 
  * @param aDom       the domain to query
- * @param naptrArray   the array to add the naptrs to
+ * @param naptrArray the array to add the naptrs to
+ * @return           the number of NAPTR records in the domain. 0 should mean error
  *
  */
-- (void)getNAPTRForTel:(NSString *)aDom inArray:(NSMutableArray *)naptrArray withError:(NSError **)error;
+- (NSUInteger)getNAPTRForTel:(NSString *)aDom inArray:(NSMutableArray *)naptrArray withError:(NSError **)error;
 
 /**

apps/iphone/my.tel/trunk/Classes/DotTel_SDK/Classes/DnsResolver.m

@@ -4 +4 @@
 //
 //  Created by Henri Asseily on 9/14/08.
-//  Copyright 2008 Telnic Ltd. All rights reserved.
+/*
+ Copyright (c) 2008, Telnic Ltd. All rights reserved.
+ 
+ Redistribution and use in source and binary forms, with or without modification,
+ are permitted provided that the following conditions are met:
+ 
+ Redistributions of source code must retain the above copyright notice, this list of conditions
+ and the following disclaimer. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the documentation and/or other
+ materials provided with the distribution.
+ Neither the name of the Telnic Ltd. nor the names of its contributors may be used to endorse or
+ promote products derived from this software without specific prior written permission.
+ THIS DOCUMENTATION IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 //
 
@@ -29 +49 @@
 }
 
-- (void)getNAPTRForTel:(NSString *)aDom inArray:(NSMutableArray *)naptrArray withError:(NSError **)error {
+- (NSUInteger)getNAPTRForTel:(NSString *)aDom inArray:(NSMutableArray *)naptrArray withError:(NSError **)error {
         [aDom retain];
         ldns_rr_list *naptrs = [self retrieveResourceRecordsOfType:LDNS_RR_TYPE_NAPTR fromDomain:aDom withError:error];
         [aDom release];
         if (!naptrs) {
-                return;
+                return 0;
         }
         
         NSDate *lookupDate = [[NSDate date] retain];
-        NSUInteger i, count = ldns_rr_list_rr_count(naptrs);
+        NSUInteger i;
+        NSUInteger count = ldns_rr_list_rr_count(naptrs);
         
         for (i = 0; i < count; i++) {
@@ -53 +74 @@
         [lookupDate release];
         
-        return;
+        return count;
         
 }
@@ -64 +85 @@
         ldns_rr_list *txts = [self retrieveResourceRecordsOfType:LDNS_RR_TYPE_TXT fromDomain:domain withError:error];
         if (!txts) {
-                _headerText = [NSMutableString stringWithString:@""];
                 return _headerText;
         }
         
         NSDate *lookupDate = [[NSDate date] retain];
-        NSUInteger i, count = ldns_rr_list_rr_count(txts);
+        NSUInteger i;
+        NSUInteger count = ldns_rr_list_rr_count(txts);
         
         for (i = 0; i < count; i++) {
@@ -78 +99 @@
                                         _headerText = [NSMutableString stringWithString:theRec.textValue];
                                 } else {
-                                        NSLog(theRec.textValue);
+                                        //NSLog(theRec.textValue);
                                         [_headerText appendFormat:@"\n %@", theRec.textValue];
                                 }
@@ -140 +161 @@
                 ldns_resolver_set_debug(resolver, TRUE);
 #endif
-                ldns_resolver_set_edns_udp_size(resolver, 8000);
+                // Set ldns defaults. Here's how it'll work:
+                
+                ldns_resolver_set_usevc(resolver, TRUE);                        // use TCP by default for now. TODO: look at UDP behavior in GPRS/EDGE
+                ldns_resolver_set_edns_udp_size(resolver, 4096);        // with a 4k max packet size when in UDP EDNS0
+                ldns_resolver_set_fallback(resolver, TRUE);                     // fallback to EDNS0 UDP, and then to TCP
+                ldns_resolver_set_fail(resolver, FALSE);                        // do not allow to fail to next nameserver
+                ldns_resolver_set_retry(resolver, 4);                           // Max number of retries
+                ldns_resolver_set_retrans(resolver, 2);                         // Seconds between retries
                 return resolver;
         } else {
@@ -158 +186 @@
                 dict = [NSDictionary dictionaryWithObject:@"DNS Error: Can't parse resolver name" forKey:NSLocalizedDescriptionKey];
                 err2 = [NSError errorWithDomain:@"org.telnic.tel.sdk" code:RESOLVER_STATUS_NO_NAME userInfo:dict];
-                *error = err2;
+                if (error)
+                        *error = err2;
                 return NULL;
         }
@@ -164 +193 @@
         ldns_pkt *p;
         
+//      @synchronized([self class]) {
+                        
         p = ldns_resolver_query(res,
                                                         ldnsdomain,
@@ -169 +200 @@
                                                         LDNS_RR_CLASS_IN,
                                                         LDNS_RD);
-        
-        if (!p)  {
-                //NSLog(@"Can't do ldns_resolver_query");
-                dict = [NSDictionary dictionaryWithObject:@"Network Error: No Internet Connection" forKey:NSLocalizedDescriptionKey];
-                err2 = [NSError errorWithDomain:@"org.telnic.tel.sdk" code:RESOLVER_STATUS_NO_CONNECTION userInfo:dict];
-                *error = err2;
-                return NULL;
-        }
-        
-        /* retrieve the records from the answer section of that
-         * packet
-         */
-        rrlist = ldns_pkt_rr_list_by_type(p,
-                                                                          rrType,
-                                                                          LDNS_SECTION_ANSWER);
-        if (!rrlist) {
-                //NSLog(@" *** invalid answer name after query\n");
-                ldns_pkt_free(p);
-                dict = [NSDictionary dictionaryWithObject:@"Data Error: Invalid DNS Answer" forKey:NSLocalizedDescriptionKey];
-                err2 = [NSError errorWithDomain:@"org.telnic.tel.sdk" code:RESOLVER_STATUS_INVALID_ANSWER userInfo:dict];
-                *error = err2;
-                return NULL;
-        }
-        
-        // Check if rrlist is really ok
-        @try {
-                ldns_rr_list_rr_count(rrlist);
-        }
-        @catch (NSException * e) {
-                dict = [NSDictionary dictionaryWithObject:@"Network Error: Bad data returned" forKey:NSLocalizedDescriptionKey];
-                err2 = [NSError errorWithDomain:@"org.telnic.tel.sdk" code:RESOLVER_STATUS_BAD_DATA userInfo:dict];
-                *error = err2;
-                rrlist = NULL;
-        }
-
-        ldns_pkt_free(p);
+
+        ldns_rdf_free(ldnsdomain);
+
+        // Have to play the switch game to encapsulate everything in one potentially synchronized block, with one return statement
+        switch (1) {
+                case 1: // always check for existence of p
+                        if (!p)  {
+                                //NSLog(@"Can't do ldns_resolver_query");
+                                dict = [NSDictionary dictionaryWithObject:@"Network Error: Could not connect to server" forKey:NSLocalizedDescriptionKey];
+                                err2 = [NSError errorWithDomain:@"org.telnic.tel.sdk" code:RESOLVER_STATUS_NO_CONNECTION userInfo:dict];
+                                if (error)
+                                        *error = err2;
+                                // recreate a resolver for later
+                                ldns_resolver_deep_free(res);
+                                res = [self createLdnsResolver];
+                                rrlist = NULL;
+                                break;
+                        }
+                case 2: // p exists, check for existence of rrlist answer
+                        /* retrieve the records from the answer section of that
+                         * packet
+                         */
+                        rrlist = ldns_pkt_rr_list_by_type(p,
+                                                                                          rrType,
+                                                                                          LDNS_SECTION_ANSWER);
+                        if (!rrlist) {
+                                //NSLog(@" *** invalid answer name after query\n");
+                                ldns_pkt_free(p);
+                                dict = [NSDictionary dictionaryWithObject:@"Data Error: Invalid DNS Answer" forKey:NSLocalizedDescriptionKey];
+                                err2 = [NSError errorWithDomain:@"org.telnic.tel.sdk" code:RESOLVER_STATUS_INVALID_ANSWER userInfo:dict];
+                                if (error)
+                                        *error = err2;
+                                rrlist = NULL;
+                                break;
+                        }
+                case 3: // rrlist exists, make sure it's ok
+                        @try {
+                                ldns_rr_list_rr_count(rrlist);
+                        }
+                        @catch (NSException * e) {
+                                dict = [NSDictionary dictionaryWithObject:@"Network Error: Bad data returned" forKey:NSLocalizedDescriptionKey];
+                                err2 = [NSError errorWithDomain:@"org.telnic.tel.sdk" code:RESOLVER_STATUS_BAD_DATA userInfo:dict];
+                                if (error)
+                                        *error = err2;
+                                rrlist = NULL;
+                        }
+                        ldns_pkt_free(p);                       
+                        break;
+                default:
+                        break;
+        }
+//      } // end @synchronized
+                
         return rrlist;
 }

apps/iphone/my.tel/trunk/Classes/DotTel_SDK/Classes/RecordLoc.h

@@ -4 +4 @@
 //
 //  Created by Henri Asseily on 9/13/08.
-//  Copyright 2008 Telnic Ltd. All rights reserved.
+/*
+ Copyright (c) 2008, Telnic Ltd. All rights reserved.
+ 
+ Redistribution and use in source and binary forms, with or without modification,
+ are permitted provided that the following conditions are met:
+ 
+ Redistributions of source code must retain the above copyright notice, this list of conditions
+ and the following disclaimer. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the documentation and/or other
+ materials provided with the distribution.
+ Neither the name of the Telnic Ltd. nor the names of its contributors may be used to endorse or
+ promote products derived from this software without specific prior written permission.
+ THIS DOCUMENTATION IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 //
 

apps/iphone/my.tel/trunk/Classes/DotTel_SDK/Classes/RecordLoc.m

@@ -4 +4 @@
 //
 //  Created by Henri Asseily on 9/13/08.
-//  Copyright 2008 Telnic Ltd. All rights reserved.
+/*
+ Copyright (c) 2008, Telnic Ltd. All rights reserved.
+ 
+ Redistribution and use in source and binary forms, with or without modification,
+ are permitted provided that the following conditions are met:
+ 
+ Redistributions of source code must retain the above copyright notice, this list of conditions
+ and the following disclaimer. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the documentation and/or other
+ materials provided with the distribution.
+ Neither the name of the Telnic Ltd. nor the names of its contributors may be used to endorse or
+ promote products derived from this software without specific prior written permission.
+ THIS DOCUMENTATION IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 //
 
@@ -58 +78 @@
         }
         
-        uint8_t size;
+        // uint8_t size;
         uint32_t horizontal_precision;
         uint32_t vertical_precision;
@@ -70 +90 @@
         uint32_t equator = (uint32_t) ldns_power(2, 31);
         
-        size = ldns_rdf_data(rdf)[1]; // CLLocation doesn't use it
+        // size = ldns_rdf_data(rdf)[1]; // CLLocation doesn't use it
         horizontal_precision = ldns_rdf_data(rdf)[2];
         vertical_precision = ldns_rdf_data(rdf)[3];

apps/iphone/my.tel/trunk/Classes/DotTel_SDK/Classes/RecordNaptr.h

@@ -4 +4 @@
 //
 //  Created by Henri Asseily on 9/12/08.
-//  Copyright 2008 Telnic Ltd. All rights reserved.
+/*
+ Copyright (c) 2008, Telnic Ltd. All rights reserved.
+ 
+ Redistribution and use in source and binary forms, with or without modification,
+ are permitted provided that the following conditions are met:
+ 
+ Redistributions of source code must retain the above copyright notice, this list of conditions
+ and the following disclaimer. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the documentation and/or other
+ materials provided with the distribution.
+ Neither the name of the Telnic Ltd. nor the names of its contributors may be used to endorse or
+ promote products derived from this software without specific prior written permission.
+ THIS DOCUMENTATION IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 //
 

apps/iphone/my.tel/trunk/Classes/DotTel_SDK/Classes/RecordNaptr.m

@@ -4 +4 @@
 //
 //  Created by Henri Asseily on 9/12/08.
-//  Copyright 2008 Telnic Ltd. All rights reserved.
+/*
+ Copyright (c) 2008, Telnic Ltd. All rights reserved.
+ 
+ Redistribution and use in source and binary forms, with or without modification,
+ are permitted provided that the following conditions are met:
+ 
+ Redistributions of source code must retain the above copyright notice, this list of conditions
+ and the following disclaimer. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the documentation and/or other
+ materials provided with the distribution.
+ Neither the name of the Telnic Ltd. nor the names of its contributors may be used to endorse or
+ promote products derived from this software without specific prior written permission.
+ THIS DOCUMENTATION IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 //
 
@@ -99 +119 @@
                 } else {
                         // Clean Regexp (don't bother with regex, just assume it's a full overwrite)
-                        NSArray *regexParts = [regexp componentsSeparatedByString:@"!"];
-                        uriContent = [[NSString stringWithString:[regexParts objectAtIndex:2]] retain];
-                }
+                        NSString *regexSeparator = [regexp substringToIndex:1];
+                        NSArray *regexParts = [regexp componentsSeparatedByString:regexSeparator];
+                        if ([regexParts count] == 4) {
+                                // looks like a regex
+                                // TODO: Should check that index 3 is empty or the flag "i"
+                                // http://www.ietf.org/rfc/rfc2915.txt
+                                uriContent = [NSString stringWithString:[regexParts objectAtIndex:2]];
+                        } else {        // Not valid
+                                return self;
+                        }
+                }
+                labelDescription = [[self generateLabelDescription] retain];
                 
         } else if ([flags isEqualToString:@""]) { // Non-terminal naptr
                 isTerminal = NO;
                 replacement = [self stringFromDnameRdf:ldns_rr_rdf(rr,5)];
-                uriContent = [replacement retain];
+                labelDescription = [[[replacement stringByReplacingOccurrencesOfString:@"-" withString:@" "] capitalizedString] retain];
+                uriContent = replacement;
                 
         } else { // Not valid
@@ -113 +143 @@
         
         serviceDescription = [[self generateServiceDescription] retain];
-        labelDescription = [[self generateLabelDescription] retain];
-        
+        [uriContent retain];    
         isValid = YES;
         return self;
@@ -179 +208 @@
         }
 
+        i = 0;
         for (aPart in serviceTypeArray) {
                 NSMutableString *strVal = [NSMutableString stringWithString:LocTelStr(aPart)];

apps/iphone/my.tel/trunk/Classes/DotTel_SDK/Classes/RecordTxt.h

@@ -4 +4 @@
 //
 //  Created by Henri Asseily on 9/13/08.
-//  Copyright 2008 Telnic Ltd. All rights reserved.
+/*
+ Copyright (c) 2008, Telnic Ltd. All rights reserved.
+ 
+ Redistribution and use in source and binary forms, with or without modification,
+ are permitted provided that the following conditions are met:
+ 
+ Redistributions of source code must retain the above copyright notice, this list of conditions
+ and the following disclaimer. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the documentation and/or other
+ materials provided with the distribution.
+ Neither the name of the Telnic Ltd. nor the names of its contributors may be used to endorse or
+ promote products derived from this software without specific prior written permission.
+ THIS DOCUMENTATION IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 //
 

apps/iphone/my.tel/trunk/Classes/DotTel_SDK/Classes/RecordTxt.m

@@ -4 +4 @@
 //
 //  Created by Henri Asseily on 9/13/08.
-//  Copyright 2008 Telnic Ltd. All rights reserved.
+/*
+ Copyright (c) 2008, Telnic Ltd. All rights reserved.
+ 
+ Redistribution and use in source and binary forms, with or without modification,
+ are permitted provided that the following conditions are met:
+ 
+ Redistributions of source code must retain the above copyright notice, this list of conditions
+ and the following disclaimer. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the documentation and/or other
+ materials provided with the distribution.
+ Neither the name of the Telnic Ltd. nor the names of its contributors may be used to endorse or
+ promote products derived from this software without specific prior written permission.
+ THIS DOCUMENTATION IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 //
 
@@ -75 +95 @@
                 }
 
-                textValue = [[stringComponents componentsJoinedByString:@", "] retain];
+                textValue = [stringComponents componentsJoinedByString:@", "];
                 isValid = YES;
         }

apps/iphone/my.tel/trunk/Classes/DotTel_SDK/README DotTel SDK

@@ -15 +15 @@
 - Allocate and initialize an instance of DnsResolver
 - Create empty mutable arrays to hold NAPTR, TXT and LOC records
-- Call the DnsResolver methods getNaptrForTel:inArray: and related
+- Call the DnsResolver methods getNaptrForTel:inArray:withError: and related
 
 You now have easy access to all relevant .tel data for a domain.

apps/iphone/my.tel/trunk/Classes/GroupFriendsController.h

@@ -27 +27 @@
         NSMutableArray *allFriendsArray; // array with all the friends (raw JSON of getgroupfriends on allfriends group)
         NSMutableArray *selectedFriends;        // 0/1 flags for each object of allFriendsArray to say if they're selected or not
-        NSMutableArray *tableData;              // actual table datasource
         NSString *newGroupName;
         UIButton *renameButton;

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

@@ -531 +531 @@
                 NSMutableIndexSet *indexes = [NSMutableIndexSet indexSet];
                 for (i = 0; i < count; i++) {
-                        NSLog(@"working on index: %d", i);
                         if ([selectedFriends objectAtIndex:i] == nFalse) {
                                 [indexes addIndex:i];

apps/iphone/my.tel/trunk/Classes/HeaderViewController.h

@@ -27 +27 @@
         NSString *previousHeaderString;
         // Below for keyboard notification
-        UIView *activeField;
         BOOL keyboardShown;
 }

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

@@ -215 +215 @@
 
         NSMutableDictionary *requestData = [[NSMutableDictionary dictionaryWithCapacity:2] retain];
-        NSLog([[VIPConnect sharedInstance].selectedDomain description]);
         [requestData setObject:[VIPConnect sharedInstance].selectedDomain forKey:@"domainName"];
         [requestData setObject:[VIPConnect sharedInstance].selectedProfileId forKey:@"profileId"];

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

@@ -164 +164 @@
                 }
                 NSString *theJSONResult;
-                theJSONResult = [[NSString alloc] initWithData:reqResults encoding:NSUTF8StringEncoding];
+                theJSONResult = [[[NSString alloc] initWithData:reqResults encoding:NSUTF8StringEncoding] autorelease];
 
 #ifdef JSONDEBUG

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

@@ -231 +231 @@
         NSMutableDictionary *uiItem;
         if (!jsonItem) {
-                return uiItem;
+                return NULL;
         }
         uiItem = [NSMutableDictionary dictionaryWithCapacity:7];
@@ -365 +365 @@
                 return;
 
-        NSString *newId;
+        NSString *newId = NULL;
         if ([[aRec objectForKey:@"primaryKeywordId"] integerValue] == 0) {
                 // new keyword

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

@@ -170 +170 @@
         if (!aDomain)
                 return nil;
-        // activate a connection
-        NSMutableURLRequest *urlReq = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:@"http://www.google.com"]];
-        [urlReq setHTTPMethod:@"HEAD"];
-        [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:YES];
-        NSURLConnection *theConnection=[[NSURLConnection alloc] initWithRequest:urlReq delegate:self startImmediately:YES];
-        if (!theConnection) {
-                [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:NO];
-                NSDictionary *dict = [NSDictionary dictionaryWithObject:@"Network Error: No Internet Connection" forKey:NSLocalizedDescriptionKey];
-                NSError *err2;
-                err2 = [NSError errorWithDomain:@"org.telnic.my.tel" code:666 userInfo:dict];
-                *error = err2;
-                return nil;
-        }               
-        // Data connection activation is now started
+        if ([aDomain hasSuffix:@".vip.tel"]) {
+                return @"https://demo.vip.tel/g2/json";
+        }
         // try to autoprovision apiRootUrl
         NSMutableArray *naptrArray = [[NSMutableArray arrayWithCapacity:1] retain];

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

@@ -350 +350 @@
 //      };
         
-        NSDecimalNumber *newProfileId;
+        NSDecimalNumber *newProfileId = NULL;
         if (!aProfName) {
-                return newProfileId;
+                return NULL;
         }
         [aProfName retain];

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

@@ -236 +236 @@
         }
         [tableView deselectRowAtIndexPath:indexPath animated:YES];
-        NSLog(@"GROUP COUNT: %d\n", ctGroups);
 }
 

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

@@ -263 +263 @@
         [aiV startAnimating];
         UIBarButtonItem *savingButton = [[UIBarButtonItem alloc] initWithCustomView:aiV];
+        [aiV release];
         self.navigationItem.rightBarButtonItem = savingButton;
         [self orderRecords];
@@ -340 +341 @@
         NSMutableDictionary *uiItem;
         if (!jsonItem) {
-                return uiItem;
+                return NULL;
         }
         uiItem = [NSMutableDictionary dictionaryWithCapacity:7];

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

@@ -40 +40 @@
         
         NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+        NSString *aaa = [defaults stringForKey:@"apiRootUrl"];
+        if ((!aaa) || (![aaa hasPrefix:@"http"])) {
+                return;
+        }
         NSDictionary *loginInfo = [NSDictionary dictionaryWithObjectsAndKeys:
                                                            [defaults stringForKey:@"loginName"], @"userName",
@@ -52 +56 @@
         NSURL *theUrl = [NSURL URLWithString:loginString];
         
-        JsonConnection *conn = [[[JsonConnection alloc] init] retain];
+        JsonConnection *conn = [[[JsonConnection alloc] init] autorelease];
         if ([conn.delegate offlineMode]) {
                 // auto-login in offline debugging mode
@@ -90 +94 @@
 
 - (void)retrieveProfiles {
-        Profile *conn = [[[Profile alloc] init] retain];
+        Profile *conn = [[[Profile alloc] init] autorelease];
         [conn setTheDelegate:self];
         [conn setActionSel:@selector(doNothing:)];

apps/iphone/my.tel/trunk/Classes/VIP_telAppDelegate.h

@@ -10 +10 @@
 #import "VIPConnect.h"
 #import "LoginViewController.h"
+#import "NetworkUtility.h"
 
 @interface VIP_telAppDelegate : NSObject <UIApplicationDelegate, UITabBarControllerDelegate, JsonConnectionDelegate> {

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

@@ -27 +27 @@
                 }
         }
+        if (!offlineMode) {
+                // Start the networking by opening a write stream
+                NetworkUtility *nUtil = [NetworkUtility sharedInstance];
+                if ([nUtil startNetwork] == NotReachable) {
+                        NSDictionary *dict = [NSDictionary dictionaryWithObject:@"Network Error: No Internet Connection" forKey:NSLocalizedDescriptionKey];
+                        NSError *error;
+                        error = [NSError errorWithDomain:@"org.telnic.my.tel" code:666 userInfo:dict];
+                        UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:@""
+                                                                                                                                                message:[error localizedDescription]
+                                                                                                                                           delegate:nil
+                                                                                                                          cancelButtonTitle:NSLocalizedString(@"OK", nil)
+                                                                                                                          otherButtonTitles:nil];
+                        [alertView show];
+                        [alertView release];
+                }
+        }               
         
         [window addSubview:loginController.view];

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

@@ -164 +164 @@
                 389604F30ECF2A99003F8B10 /* APILocRecord.plist in Resources */ = {isa = PBXBuildFile; fileRef = 389604F00ECF2A99003F8B10 /* APILocRecord.plist */; };
                 389604F40ECF2A99003F8B10 /* APINaptrRecord.plist in Resources */ = {isa = PBXBuildFile; fileRef = 389604F10ECF2A99003F8B10 /* APINaptrRecord.plist */; };
+                389AC2AF0F8D3C2200400977 /* NetworkUtility.m in Sources */ = {isa = PBXBuildFile; fileRef = 389AC2AB0F8D3C2200400977 /* NetworkUtility.m */; };
+                389AC2B00F8D3C2200400977 /* Reachability.m in Sources */ = {isa = PBXBuildFile; fileRef = 389AC2AC0F8D3C2200400977 /* Reachability.m */; };
                 38B8E7D90F6349F000373333 /* RecordGroupsController.m in Sources */ = {isa = PBXBuildFile; fileRef = 38B8E7D80F6349F000373333 /* RecordGroupsController.m */; };
                 38B8E7DD0F634B0800373333 /* RecordGroups.xib in Resources */ = {isa = PBXBuildFile; fileRef = 38B8E7DC0F634B0800373333 /* RecordGroups.xib */; };
@@ -409 +411 @@
                 389604F00ECF2A99003F8B10 /* APILocRecord.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = APILocRecord.plist; sourceTree = "<group>"; };
                 389604F10ECF2A99003F8B10 /* APINaptrRecord.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = APINaptrRecord.plist; sourceTree = "<group>"; };
+                389AC2AB0F8D3C2200400977 /* NetworkUtility.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NetworkUtility.m; sourceTree = "<group>"; };
+                389AC2AC0F8D3C2200400977 /* Reachability.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Reachability.m; sourceTree = "<group>"; };
+                389AC2AD0F8D3C2200400977 /* Reachability.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Reachability.h; sourceTree = "<group>"; };
+                389AC2AE0F8D3C2200400977 /* NetworkUtility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkUtility.h; sourceTree = "<group>"; };
                 38B8E7D70F6349F000373333 /* RecordGroupsController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RecordGroupsController.h; sourceTree = "<group>"; };
                 38B8E7D80F6349F000373333 /* RecordGroupsController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RecordGroupsController.m; sourceTree = "<group>"; };
@@ -568 +574 @@
                                 383FE4710F333380008A9342 /* DnsResolver.h */,
                                 383FE4720F333380008A9342 /* DnsResolver.m */,
+                                389AC2AB0F8D3C2200400977 /* NetworkUtility.m */,
+                                389AC2AC0F8D3C2200400977 /* Reachability.m */,
+                                389AC2AD0F8D3C2200400977 /* Reachability.h */,
+                                389AC2AE0F8D3C2200400977 /* NetworkUtility.h */,
                                 383FE4730F333380008A9342 /* RecordLoc.h */,
                                 383FE4740F333380008A9342 /* RecordLoc.m */,
@@ -1096 +1106 @@
                                 382FDD450F3C547E0021A935 /* GroupFriendsController.m in Sources */,
                                 38B8E7D90F6349F000373333 /* RecordGroupsController.m in Sources */,
+                                389AC2AF0F8D3C2200400977 /* NetworkUtility.m in Sources */,
+                                389AC2B00F8D3C2200400977 /* Reachability.m in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -1156 +1168 @@
                                 GCC_WARN_UNUSED_VARIABLE = YES;
                                 PREBINDING = NO;
+                                PROVISIONING_PROFILE = "DC881623-4681-45BB-B714-179F016CBFD9";
                                 SDKROOT = iphoneos2.1;
                         };