Changeset 546 for apps

Timestamp:

11/03/09 21:43:56 (4 years ago)

Author:

henri

Message:

Significant update to 1.4.
Long labels, subdomain IDNs, Google MapKit?. Required OS Version 3.0.

Location:

apps/iphone/superbook/trunk

Files:

• ABMapperSelectors.plist (modified) (1 diff)
• Classes/DotTelABDelegate.h (modified) (3 diffs)
• Classes/DotTelABDelegate.m (modified) (7 diffs)
• Classes/DotTelABMapper.h (modified) (1 diff)
• Classes/DotTelABMapper.m (modified) (5 diffs)
• Classes/FriendsData.m (modified) (5 diffs)
• Classes/FriendsMapViewController.h (modified) (4 diffs)
• Classes/FriendsMapViewController.m (modified) (11 diffs)
• Classes/LocateThem_ViewController.m (modified) (3 diffs)
• Classes/LocTableViewCell.h (deleted)
• Classes/LocTableViewCell.m (deleted)
• Classes/NaptrCell.h (added)
• Classes/NaptrCell.m (added)
• Classes/NaptrViewController.h (modified) (5 diffs)
• Classes/NaptrViewController.m (modified) (20 diffs)
• Classes/NSString+UITableViewHelper.m (modified) (1 diff)
• Classes/NTNaptrCell.h (added)
• Classes/NTNaptrCell.m (added)
• Classes/TelMapAnnotation.h (added)
• Classes/TelMapAnnotation.m (added)
• DotTel_SDK/Classes/DnsResolver.h (modified) (3 diffs)
• DotTel_SDK/Classes/DnsResolver.m (modified) (3 diffs)
• DotTel_SDK/Classes/RecordNaptr.h (modified) (3 diffs)
• DotTel_SDK/Classes/RecordNaptr.m (modified) (4 diffs)
• DotTel_SDK/Classes/RecordTxt.h (modified) (3 diffs)
• DotTel_SDK/Classes/RecordTxt.m (modified) (7 diffs)
• DotTel_SDK/README DotTel SDK (modified) (2 diffs)
• English.lproj/About.html (modified) (2 diffs)
• English.lproj/Localizable.strings (modified) (1 diff)
• FMapView.xib (modified) (9 diffs)
• French.lproj/About.html (modified) (2 diffs)
• French.lproj/Localizable.strings (modified) (2 diffs)
• German.lproj/Localizable.strings (modified) (1 diff)
• idna.h (added)
• Info.plist (modified) (1 diff)
• libidn.a (added)
• LocateThem.xcodeproj/project.pbxproj (modified) (25 diffs)
• Russian.lproj/About.html (modified) (2 diffs)
• Russian.lproj/Localizable.strings (modified) (1 diff)

apps/iphone/superbook/trunk/ABMapperSelectors.plist

@@ -57 +57 @@
                 <key>x-im:skype</key>
                 <string>setNaptrIM:</string>
+                <key>x-photo:http</key>
+                <string>setNaptrPhoto:</string>
+                <key>x-photo:https</key>
+                <string>setNaptrPhoto:</string>
+                <key>x-img:http</key>
+                <string>setNaptrPhoto:</string>
+                <key>x-img:https</key>
+                <string>setNaptrPhoto:</string>
         </dict>
         <key>txt</key>

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

@@ -38 +38 @@
 #import "DotTelABMapper.h"
 
-@interface DotTelABDelegate : NSObject <ABPersonViewControllerDelegate, ABUnknownPersonViewControllerDelegate, UIActionSheetDelegate> {
+@interface DotTelABDelegate : NSObject <ABPersonViewControllerDelegate,
+ABNewPersonViewControllerDelegate, ABPeoplePickerNavigationControllerDelegate, UIActionSheetDelegate> {
         
         ABAddressBookRef addressBook;
@@ -49 +50 @@
         NSUInteger saveToExistingButtonIndex;
         NSUInteger saveToNewButtonIndex;
+        NSUInteger saveToOtherButtonIndex;
         ABRecordRef recordForActionSheet;
 }
@@ -64 +66 @@
 - (NSError *)saveRecord;
 - (NSError *)saveRecordWithRecordId:(ABRecordID)_recordId;
-- (NSError *)saveUnknownRecord;
 - (IBAction)didPressSaveButton:(id)sender;
 

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

@@ -32 +32 @@
 @interface DotTelABDelegate (PrivateMethods)
 
-- (NSError *)updateRecord:(ABRecordRef)_recordRef;
+- (void)pickABRecordForSaving;
+- (NSError *)saveNewABRecord;
+- (NSError *)updateABRecord:(ABRecordRef)_recordRef;
 
 //      Merges .tel info into an existing record
@@ -76 +78 @@
 - (NSError *)saveRecordWithRecordId:(ABRecordID)_recordId {
         // If there's a valid record, we will show a UIActionSheet to ask if the user wants to save to
-        // this existing record, another record, or cancel altogether
-        // If there's no valid record, we show the ABUnknownPersonViewController directly
-        
+        // this existing record, another existing record, a new record, or cancel altogether
+        
+        ABRecordRef aRecord = NULL;
+        NSString *saveExistingButtonLabel = nil;
         if (_recordId != kABRecordInvalidID) {
                 // Record id is known. Pick up ABRecordRef and update the record
                 // if no ABRecordRef, go to the unknown version
-                ABRecordRef aRecord = ABAddressBookGetPersonWithRecordID(addressBook, _recordId);
+                aRecord = ABAddressBookGetPersonWithRecordID(addressBook, _recordId);
                 NSString *personName = (NSString *)ABRecordCopyCompositeName(aRecord);
                 if (!personName) {
                         personName = telName;
                 }
-                NSString *saveExistingButtonLabel = [NSString stringWithFormat:NSLocalizedString(@"UpdateExisting", @"Save to existing"), personName];
+                saveExistingButtonLabel = [NSString stringWithFormat:NSLocalizedString(@"UpdateExisting", @"Update %@"), personName];
                 [personName release];
-                if (aRecord != NULL) {
-                        // We've got an existing ABRecord
-                        recordForActionSheet = aRecord;
-                        UIActionSheet *actionSheet = [[UIActionSheet alloc] initWithTitle:NSLocalizedString(@"Save To Address Book", @"Save To Address Book")
-                                                                                                                                         delegate:self
-                                                                                                                        cancelButtonTitle:nil
-                                                                                                           destructiveButtonTitle:nil
-                                                                                                                        otherButtonTitles:nil];
-                        saveToExistingButtonIndex = [actionSheet addButtonWithTitle:saveExistingButtonLabel];
-                        saveToNewButtonIndex = [actionSheet addButtonWithTitle:NSLocalizedString(@"Save to another contact", @"Save to another contact")];
-                        actionSheet.cancelButtonIndex = [actionSheet addButtonWithTitle:NSLocalizedString(@"Cancel", @"Cancel")];
-                        [actionSheet showInView:topViewController.view];
-                        [actionSheet release];
-                        //CFRelease(aRecord);
-                        return NULL;
-                }
-        }
-        return [self saveUnknownRecord];
-}
-
-
-- (NSError *)saveUnknownRecord {
-        // Unknown or missing recordId
-        // Show ABUnknownPersonViewController
-        
-        ABRecordRef aRecord = ABPersonCreate();
-        ABUnknownPersonViewController *pVC = [[[ABUnknownPersonViewController alloc] init] autorelease];
-        pVC.unknownPersonViewDelegate = self;
+        }
+        recordForActionSheet = aRecord;
+        UIActionSheet *actionSheet = [[UIActionSheet alloc] initWithTitle:NSLocalizedString(@"Save To Address Book", @"Save To Address Book")
+                                                                                                                         delegate:self
+                                                                                                        cancelButtonTitle:nil
+                                                                                           destructiveButtonTitle:nil
+                                                                                                        otherButtonTitles:nil];
+        if (saveExistingButtonLabel != nil) {
+                saveToExistingButtonIndex = [actionSheet addButtonWithTitle:saveExistingButtonLabel];
+        }
+        saveToNewButtonIndex = [actionSheet addButtonWithTitle:NSLocalizedString(@"CreateNewContact", @"Create new contact")];
+        saveToOtherButtonIndex = [actionSheet addButtonWithTitle:NSLocalizedString(@"Save to another contact", @"Save to another contact")];
+        actionSheet.cancelButtonIndex = [actionSheet addButtonWithTitle:NSLocalizedString(@"Cancel", @"Cancel")];
+        [actionSheet showInView:topViewController.view];
+        [actionSheet release];
+        return NULL;
+}
+
+
+#pragma mark -
+#pragma mark Private & actionSheet methods
+
+
+- (void)pickABRecordForSaving {
+        // Use ABPeoplePickerNavigationController
+        
+        ABPeoplePickerNavigationController *aPNC = [[[ABPeoplePickerNavigationController alloc] init] autorelease];
+        aPNC.peoplePickerDelegate = self;
+        aPNC.addressBook = addressBook;
+        [topViewController presentModalViewController:aPNC animated:YES];
+        return;
+}
+
+- (NSError *)saveNewABRecord {
+        ABNewPersonViewController *pVC = [[[ABNewPersonViewController alloc] init] autorelease];
+        pVC.displayedPerson = ABPersonCreate();
+        pVC.newPersonViewDelegate = self;
         pVC.addressBook = addressBook;
-        pVC.allowsAddingToAddressBook = YES;
-        pVC.allowsActions = NO;
-        pVC.displayedPerson = aRecord;
-        
-        NSError *err = [self mergeTelInfoIntoRecordRef:aRecord updatedProperties:nil];
+        NSMutableArray *properties = [[[NSMutableArray alloc] initWithCapacity:1] autorelease]; 
+        NSError *err = [self mergeTelInfoIntoRecordRef:pVC.displayedPerson updatedProperties:properties];       
         if (!err) {
                 //setup properties to display
@@ -128 +137 @@
                 [topViewController presentModalViewController:navC animated:YES];
         }
-        CFRelease(aRecord);
-
-        return err;     
-}
-
-
-#pragma mark ------ private methods
-
-- (NSError *)updateRecord:(ABRecordRef)_recordRef {
+        return err;
+}
+
+- (NSError *)updateABRecord:(ABRecordRef)_recordRef {
         // Load a ABPersonViewController and merge the data in it, then display it
         
         if (_recordRef == NULL)
-                return NULL;
+                return nil;
         
         ABPersonViewController *pVC = [[[ABPersonViewController alloc] init] autorelease];
+        pVC.displayedPerson = _recordRef;
         pVC.personViewDelegate = self;
         pVC.addressBook = addressBook;
         pVC.allowsEditing = YES;
-        pVC.displayedPerson = _recordRef;
         NSMutableArray *properties = [[NSMutableArray alloc] initWithCapacity:1];
         
@@ -162 +166 @@
         }
         //pVC.displayedProperties = properties; // NOTE: We'll display everything, it makes more sense
-        pVC.displayedProperties = NULL;
+        pVC.displayedProperties = nil;
         if (!err) {
-                //setup properties to display
                 UINavigationController *navC = [[[UINavigationController alloc] initWithRootViewController:pVC] autorelease];
                 navC.navigationBar.topItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemSave
                                                                                                                                                                                                          target:self
                                                                                                                                                                                                          action:@selector(didPressSaveButton:)]; 
-                [topViewController presentModalViewController:navC animated:YES];
+                if (topViewController.modalViewController) {
+                        // This is if the ABPickerController was used. Both will be dismissed upon save
+                        [topViewController.modalViewController presentModalViewController:navC animated:YES];
+                } else {
+                        [topViewController presentModalViewController:navC animated:YES];
+                }
+
         }
         return err;
@@ -206 +215 @@
 }
 
-#pragma mark ------ ABPersonViewControllerDelegate methods
+#pragma mark -
+#pragma mark delegates
+
+#pragma mark ABPeoplePickerNavigationControllerDelegate methods
+
+- (BOOL)peoplePickerNavigationController:(ABPeoplePickerNavigationController *)peoplePicker
+          shouldContinueAfterSelectingPerson:(ABRecordRef)person {
+        // Don't dismiss the modal controller. Add the Person one on top of it, and have both be dismissed together.
+        // Otherwise, dismissing and adding a modalviewcontroller within a short period crashes the OS...
+        [self updateABRecord:person];
+        return NO;
+}
+
+- (BOOL)peoplePickerNavigationController:(ABPeoplePickerNavigationController *)peoplePicker
+          shouldContinueAfterSelectingPerson:(ABRecordRef)person
+                                                                property:(ABPropertyID)property
+                                                          identifier:(ABMultiValueIdentifier)identifier {
+        return NO;
+}
+
+- (void)peoplePickerNavigationControllerDidCancel:(ABPeoplePickerNavigationController *)peoplePicker {
+        [topViewController dismissModalViewControllerAnimated:YES];
+}
+
+#pragma mark ABPersonViewControllerDelegate methods
 
 - (BOOL)personViewController:(ABPersonViewController *)personViewController
@@ -222 +255 @@
 }
 
-#pragma mark ------ ABUnknownPersonViewControllerDelegate methods
-
-- (void)unknownPersonViewController:(ABUnknownPersonViewController *)unknownPersonView
-                                 didResolveToPerson:(ABRecordRef)person {
+#pragma mark ABNewPersonViewControllerDelegate methods
+
+- (void)newPersonViewController:(ABNewPersonViewController *)newPersonViewController
+           didCompleteWithNewPerson:(ABRecordRef)person {
         [topViewController dismissModalViewControllerAnimated:YES];
 }
 
-#pragma mark ------ UIActionSheetDelegate methods
+#pragma mark UIActionSheetDelegate methods
 
 - (void)actionSheet:(UIActionSheet *)actionSheet clickedButtonAtIndex:(NSInteger)buttonIndex {
@@ -238 +271 @@
         NSError *err = nil;
     if (buttonIndex == saveToExistingButtonIndex) {             
-                err = [self updateRecord:recordForActionSheet];
+                err = [self updateABRecord:recordForActionSheet];
         } else if (buttonIndex == saveToNewButtonIndex) {
-                err = [self saveUnknownRecord];
+                err = [self saveNewABRecord];
+    } else if (buttonIndex == saveToOtherButtonIndex) {
+                [self pickABRecordForSaving];
     }
         if (err) {

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

@@ -45 +45 @@
         ABRecordRef abRecord;
         NSMutableArray *updatedProperties;              // All updated properties for a record
+        BOOL didSetPhoto;                                               // Set to true if the photo has been set in this run
 }
 
 @property (readonly, retain) NSMutableArray *updatedProperties;
+@property (nonatomic) BOOL didSetPhoto;
 
 - (DotTelABMapper *)initWithABRecord:(ABRecordRef)rec;

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

@@ -81 +81 @@
 
 @synthesize updatedProperties;
+@synthesize didSetPhoto;
 
 #pragma mark ---- designated initializer ----
@@ -96 +97 @@
         }
         updatedProperties = [[NSMutableArray array] retain];
+        didSetPhoto = NO;
         
         NSDictionary *selectorsMapper = [NSDictionary dictionaryWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"ABMapperSelectors"
@@ -211 +213 @@
 }
 
+- (NSError *)setNaptrPhoto:(RecordNaptr *)rec {
+        NSError *err = nil;
+        if (didSetPhoto) {
+                // Photo was already set once this run, we won't override
+                return err;
+        }
+        CFErrorRef cferr = (CFErrorRef)err;
+        NSString *photoUrl = [rec uriContent];
+        if (photoUrl == nil) return err;
+        NSData *photoData = [NSData     dataWithContentsOfURL:[NSURL URLWithString:photoUrl]];
+        BOOL res = ABPersonSetImageData(abRecord, (CFDataRef)photoData, &cferr);
+        if (res) {
+                didSetPhoto = YES;
+                return nil;
+        }
+        return err;
+}
+
 - (NSError *)setNaptrPhone:(RecordNaptr *)rec {
         SETNAPTR_INITIALIZATION;
@@ -345 +365 @@
 
 - (NSError *)setNaptrIM:(RecordNaptr *)rec {
-        // NOTE: The simulator does NOT support IM fields. It silently discards them.
         // IM fields are dictionaries, not strings. They need special handling.
         SETNAPTR_INITIALIZATION;
@@ -397 +416 @@
                 CFDictionaryRef existingIM = (CFDictionaryRef)ABMultiValueCopyValueAtIndex(allupdated, i);
                 if (existingIM) {
-                        if (CFDictionaryGetValue(anIM, kABPersonInstantMessageServiceKey) == CFDictionaryGetValue(existingIM, kABPersonInstantMessageServiceKey)) {
+                        CFStringRef anIMService = CFDictionaryGetValue(anIM, kABPersonInstantMessageServiceKey);
+                        CFStringRef existingIMService = CFDictionaryGetValue(existingIM, kABPersonInstantMessageServiceKey);
+                        if (CFStringCompare(anIMService, existingIMService, 0) == kCFCompareEqualTo) {
                                 // Found a matching IM service type
                                 CFStringRef existingLabel = (CFStringRef)ABMultiValueCopyLabelAtIndex(allupdated, i);

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

@@ -141 +141 @@
 //                      CFRelease(allGroups);
                 
+//              CFRelease(theBook);     // Releasing the book crashes the app! OS bug?
+                
                 if (prefsSorting == 0) {        // alpha sorting on composite name
                         self.sortedPeopleArray = [peopleCurrentList keysSortedByValueUsingSelector:@selector(compositeNameSortAlgorithm:)];
@@ -384 +386 @@
                 return [personInfoRow objectAtIndex:5];
 
-        BOOL shouldRelease = NO;
+        ABMultiValueRef allUrls;
+        BOOL foundUrl = NO;
         if (!recordRef) {
-                shouldRelease = YES;
-                recordRef = ABAddressBookGetPersonWithRecordID(book, (ABRecordID)[theId intValue]);
-        }
+                ABRecordRef newRecordRef = ABAddressBookGetPersonWithRecordID(book, (ABRecordID)[theId intValue]);
+                allUrls = ABRecordCopyValue(newRecordRef, kABPersonURLProperty);
+//              CFRelease(newRecordRef);
+        } else {
+                allUrls = ABRecordCopyValue(recordRef, kABPersonURLProperty);
+        }
+        
         CFStringRef telUrl;
-        BOOL foundUrl = NO;
-        
-        ABMultiValueRef allUrls = ABRecordCopyValue(recordRef, kABPersonURLProperty);
-        
         for (CFIndex j = 0; j < ABMultiValueGetCount(allUrls); j++) {
                 telUrl = ABMultiValueCopyValueAtIndex(allUrls, j);
@@ -410 +413 @@
 //      }
         CFRelease(allUrls);
-
-        
-        if (shouldRelease) {
-                CFRelease(recordRef);
-        }
+        
         if (foundUrl) {
                 NSString *returnedTelUrl = [[FriendsData sharedInstance] telFromQueryString:(NSString *)telUrl];
@@ -428 +427 @@
 - (NSInteger) getTelIndexForABRecordId:(NSNumber *)theId withABRecordRef:(ABRecordRef)recordRef {
         
-        
-        BOOL shouldRelease = NO;
+        ABMultiValueRef allUrls;
         if (!recordRef) {
-                shouldRelease = YES;
-                recordRef = ABAddressBookGetPersonWithRecordID(book, (ABRecordID)[theId intValue]);
-        }
+                ABRecordRef newRecordRef = ABAddressBookGetPersonWithRecordID(book, (ABRecordID)[theId intValue]);
+                allUrls = ABRecordCopyValue(newRecordRef, kABPersonURLProperty);
+//              CFRelease(newRecordRef);
+        } else {
+                allUrls = ABRecordCopyValue(recordRef, kABPersonURLProperty);
+        }
+
+        NSInteger telIndex = -1; //  Return value for nonexistent
         CFStringRef telUrlValue;
-        ABMultiValueRef allUrls = ABRecordCopyValue(recordRef, kABPersonURLProperty);
-        NSInteger telIndex = -1; //  Return value for nonexistent
-        
         for (CFIndex j = 0; j < ABMultiValueGetCount(allUrls); j++) {
                 telUrlValue = ABMultiValueCopyValueAtIndex(allUrls, j);
@@ -448 +448 @@
         }
         CFRelease(allUrls);
-        if (shouldRelease) {
-                CFRelease(recordRef);
-        }
         return telIndex;
 }

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

@@ -29 +29 @@
 
 #import <UIKit/UIKit.h>
-#import "MapView/RMMapView.h"
-#import "MapView/RMMarker.h"
-#import "MapView/RMMarkerManager.h"
-#import "MapView/RMOpenStreetMapsSource.h"
-#import "MapView/RMVirtualEarthSource.h"
-#import "MapView/RMCloudMadeMapSource.h"
+#import "TelMapAnnotation.h"
 #import <CoreLocation/CoreLocation.h>
 #import "MyCLController.h"
@@ -40 +35 @@
 #define VIEW_GPS_TIME_DESC_LABEL_TAG 101
 
-@interface FriendsMapViewController : UIViewController <RMMapViewDelegate, MyCLControllerDelegate, UIActionSheetDelegate>{      
+@interface FriendsMapViewController : UIViewController <MKMapViewDelegate, MyCLControllerDelegate, UIActionSheetDelegate> {     
         IBOutlet UILabel *labelGpsLastUpdateDate;
         IBOutlet UIToolbar *actionBar;
         IBOutlet UIBarButtonItem *buttonMoveTo;
-        IBOutlet RMMapView *theMap;
+        IBOutlet MKMapView *theMap;
         CLLocation *initialLoc;
-        UIImage *markerGpsImage;
-        UIImage *markerRedImage;
-        UIImage *markerBlueImage;
-        RMMarker *markerGps;
+        TelMapAnnotation *markerGps;
 @private
         BOOL gpsLocIsAvailable;
@@ -59 +51 @@
 + (FriendsMapViewController *)sharedInstance;
 
-- (void) setMarkers:(NSDictionary *)peopleList;
-- (void) setMarkerWithABRecordId:(NSNumber *)theId
-                                                   title:(NSString *)title
-                                                 telname:(NSString *)telname
-                                                location:(CLLocation *)loc;
+- (void)recenterMap;
+- (void)setMarkers:(NSDictionary *)peopleList;
+- (void)setMarkerWithABRecordId:(NSNumber *)theId
+                                                  title:(NSString *)title
+                                                telname:(NSString *)telname
+                                           location:(CLLocation *)loc;
 
 - (IBAction)didPressCenterGps:(id)sender;
@@ -72 +65 @@
 @property (nonatomic, retain) IBOutlet UIToolbar *actionBar;
 @property (nonatomic, retain) IBOutlet UIBarButtonItem *buttonMoveTo;
-@property (nonatomic, retain) IBOutlet RMMapView *theMap;
+@property (nonatomic, retain) IBOutlet MKMapView *theMap;
 @property (nonatomic, copy) CLLocation *initialLoc;
-@property (nonatomic, retain) UIImage *markerGpsImage;
-@property (nonatomic, retain) UIImage *markerRedImage;
-@property (nonatomic, retain) UIImage *markerBlueImage;
-@property (nonatomic, retain) RMMarker *markerGps;
-@property double zoomLevel;
+@property (nonatomic, retain) TelMapAnnotation *markerGps;
 
 @end

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

@@ -36 +36 @@
 @synthesize theMap;
 @synthesize initialLoc;
-@synthesize markerGpsImage, markerBlueImage, markerRedImage;
 @synthesize markerGps;
-
-#define kIphoneCoolCloudMadeStyleNumber 1818
 
 // This is a singleton class, see below
@@ -48 +45 @@
 - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
     if (self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]) {
-        self.markerGpsImage = [UIImage imageWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"marker-gps" ofType:@"png"]]; 
-        self.markerBlueImage = [UIImage imageWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"marker-blue" ofType:@"png"]]; 
-        self.markerRedImage = [UIImage imageWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"marker-red" ofType:@"png"]]; 
                 uniqueMarkers = [[NSMutableDictionary dictionaryWithCapacity:20] retain];
                 firstMarkers = [[NSMutableArray arrayWithCapacity:5] retain];
-                self.markerGps = [[RMMarker alloc] initWithUIImage:self.markerGpsImage];
-                markerGps.anchorPoint = CGPointMake(0.5, 1);
     }
     return self;
@@ -63 +55 @@
         self.title = NSLocalizedString(@"Map", @"Title for Map View");
         gpsLocIsAvailable = NO;
-        [RMMapView class];      // Make IB happy that the RMMapView symbol exists in the code
-        id myTilesource = [[[RMCloudMadeMapSource alloc] initWithAccessKey:@"ac2ada56343a5386a1958f7024b248d9"
-                                                                                                                   styleNumber:kIphoneCoolCloudMadeStyleNumber] autorelease];
-        // have to initialize the RMMapContents object explicitly if we want it to use a particular tilesource
-        [[[RMMapContents alloc] initWithView:theMap 
-                                                          tilesource:myTilesource] autorelease];
-
-//      theMap.contents.tileSource = [[[RMCloudMadeMapSource alloc] initWithAccessKey:@"ac2ada56343a5386a1958f7024b248d9"
-//                                                                                                                                        styleNumber:kIphoneCoolCloudMadeStyleNumber] retain];
+        theMap.delegate = self;
+
         // Now put in the markers that are pending
-        RMMarker *aMarker;
-        for (aMarker in firstMarkers) {
-                [theMap.markerManager addMarker:aMarker AtLatLong:((CLLocation *)aMarker.data).coordinate];
-        }
+        [theMap addAnnotations:firstMarkers];
         [firstMarkers removeAllObjects];
-        CLLocationCoordinate2D zeroPoint = {0,0};
-        [theMap.markerManager addMarker:self.markerGps AtLatLong:zeroPoint];
-        // Put GPS marker above all markers
-        self.markerGps.zPosition = 1.0;
-        self.markerGps.hidden = YES;
 }
 
@@ -93 +70 @@
                         initialLoc = [MyCLController sharedInstance].myCurrentLoc;
                 }
-                [theMap moveToLatLong:initialLoc.coordinate];
+                [theMap setCenterCoordinate:initialLoc.coordinate];
         }
 }
@@ -100 +77 @@
 - (void)viewDidAppear:(BOOL)animated {
         [super viewDidAppear:animated];
+        self.theMap.showsUserLocation = YES;
         self.navigationController.navigationBarHidden = NO;
 }
@@ -108 +86 @@
 }
 
-- (void)didReceiveMemoryWarning {
-        // due to a bug, RMMapView should never be released, as it causes the application to crash
-    //[super didReceiveMemoryWarning]; // Releases the view if it doesn't have a superview
-        [theMap.contents didReceiveMemoryWarning];
-}
-
-
 - (void)dealloc {
+        [firstMarkers release];
         [uniqueMarkers release];
     [super dealloc];
@@ -122 +94 @@
 # pragma mark ---- Methods ----
 
+- (void)recenterMap {
+        // Center and zoom the map so it has all the annotations in it
+        NSArray *coordinates = [self.theMap valueForKeyPath:@"annotations.coordinate"];
+        CLLocationCoordinate2D maxCoord = {-90.0f, -180.0f};
+        CLLocationCoordinate2D minCoord = {90.0f, 180.0f};
+        for (NSValue *value in coordinates) {
+                CLLocationCoordinate2D coord = {0.0f, 0.0f};
+                [value getValue:&coord];
+                if(coord.longitude > maxCoord.longitude) {
+                        maxCoord.longitude = coord.longitude;
+                }
+                if(coord.latitude > maxCoord.latitude) {
+                        maxCoord.latitude = coord.latitude;
+                }
+                if(coord.longitude < minCoord.longitude) {
+                        minCoord.longitude = coord.longitude;
+                }
+                if(coord.latitude < minCoord.latitude) {
+                        minCoord.latitude = coord.latitude;
+                }
+        }
+        MKCoordinateRegion region = {{0.0f, 0.0f}, {0.0f, 0.0f}};
+        region.center.longitude = (minCoord.longitude + maxCoord.longitude) / 2.0;
+        region.center.latitude = (minCoord.latitude + maxCoord.latitude) / 2.0;
+        region.span.longitudeDelta = 1.3 * (maxCoord.longitude - minCoord.longitude);   // make the region 30% bigger than necessary
+        region.span.latitudeDelta = 1.3 * (maxCoord.latitude - minCoord.latitude);              // make the region 30% bigger than necessary
+        [theMap setRegion:[theMap regionThatFits:region] animated:YES];
+}
+
 - (IBAction)didPressCenterGps:(id)sender {
-        [theMap moveToLatLong:[[[MyCLController sharedInstance] myCurrentLoc] coordinate]];
+        [theMap setCenterCoordinate:[[[MyCLController sharedInstance] myCurrentLoc] coordinate] animated:YES];
 }
 
@@ -152 +153 @@
 
 - (void) setMarkers:(NSDictionary *)peopleList {
-
-        //[theMap.markerManager removeMarkers];
         // the people list has for each personid: name, type of status, location, location timestamp, distance from user and telname
         id personId;
@@ -177 +176 @@
                 return;
         }
-        RMMarker *theMarker;
-        BOOL markerExists = NO;
+        TelMapAnnotation *theMarker;
         if ([theId integerValue] == UINT_MAX) {
                 // just a domain we navigated to
-                theMarker = [[RMMarker alloc] initWithUIImage:self.markerRedImage];
-                theMarker.anchorPoint = CGPointMake(0.5, 1);
-                [theMarker changeLabelUsingText:[NSString stringWithString:telname]];
-                theMarker.zPosition = 0.1;
+                theMarker = [TelMapAnnotation annotationWithCoordinate:loc.coordinate];
+                theMarker.type = TelMapAnnotationTypeOther;
+                theMarker.title = title;
+                theMarker.subtitle = telname;
+                if ([self isViewLoaded]) {
+                        [theMap addAnnotation:theMarker];
+                } else {
+                        [firstMarkers addObject:theMarker];
+                }
         } else {
                 // is a friend
                 theMarker = [uniqueMarkers objectForKey:theId];
                 if (theMarker) {
-                        markerExists = YES;
-                        [theMarker retain];
+                        theMarker.coordinate = loc.coordinate;
                 } else {
-                        theMarker = [[RMMarker alloc] initWithUIImage:self.markerBlueImage];
-                        theMarker.anchorPoint = CGPointMake(0.5, 1);
-                        [theMarker changeLabelUsingText:[NSString stringWithString:title]];
+                        theMarker = [TelMapAnnotation annotationWithCoordinate:loc.coordinate];
+                        theMarker.type = TelMapAnnotationTypeABRecord;
+                        theMarker.title = title;
+                        theMarker.subtitle = telname;
                         [uniqueMarkers setObject:theMarker forKey:theId];                       
-                        theMarker.zPosition = 0.2;
-                }
-        }
-        theMarker.data = [loc copy];
-
-//      NSArray *mapMarkerNib = [[NSBundle mainBundle] loadNibNamed:@"MapMarker" owner:self options:nil];
-//      [uniqueMarkers setObject:[mapMarkerNib objectAtIndex:0] forKey:theId];
-//      theMarker.labelView = [uniqueMarkers objectForKey:theId];
-//      [(UILabel *)[theMarker.labelView viewWithTag:1] setText:title]; // Title of the marker
-//      [(UILabel *)[theMarker.labelView viewWithTag:2] setText:telname]; // .tel value
-//      [(UILabel *)[theMarker.labelView viewWithTag:3] setText:[theId stringValue]]; // personId value
-//      [theMarker showLabel];
-        
-        // Now add the marker, but put it in a temporary array if the map view isn't yet loaded
-        if (theMap.markerManager) {
-                if (!markerExists) {
-                        [theMap.markerManager addMarker:theMarker AtLatLong:((CLLocation *)theMarker.data).coordinate];
-                } else {
-                        [theMap.markerManager moveMarker:theMarker AtLatLon:((CLLocation *)theMarker.data).coordinate];
-                }
-        } else {
-                if (!markerExists) {
-                        [firstMarkers addObject:theMarker];
-                }
-        }
-        [theMarker release];
-        return;
-}
-
-#pragma mark ---- Zoom accessors ----
-
-- (double)zoomLevel {
-        return theMap.contents.zoom;
-}
-
-- (void)setZoomLevel:(double)zoom {
-        theMap.contents.zoom = zoom;
-}
-
-#pragma mark ---- RMMapView delegate methods ----
-
-- (BOOL)mapView:(RMMapView *)map shouldDragMarker:(RMMarker *)marker withEvent:(UIEvent *)event {
-        return NO;
-}
-
+                        if ([self isViewLoaded]) {
+                                [theMap addAnnotation:theMarker];
+                        } else {
+                                [firstMarkers addObject:theMarker];
+                        }
+                }
+        }
+        return;
+}
+
+#pragma mark ------ MKMapViewDelegate Methods
+
+- (MKAnnotationView *)mapView:(MKMapView *)mapView viewForAnnotation:(id <MKAnnotation>)annotation {
+        if ([annotation isMemberOfClass:[MKUserLocation class]]) return nil;
+        static NSString *annotationViewIdentifier = @"standardAnnotationView";
+        MKPinAnnotationView *aView;
+        aView = (MKPinAnnotationView *)[theMap dequeueReusableAnnotationViewWithIdentifier:annotationViewIdentifier];
+        if (aView == nil) {
+                aView = [[[MKPinAnnotationView alloc] initWithAnnotation:annotation
+                                                                                                reuseIdentifier:annotationViewIdentifier] autorelease];
+                aView.animatesDrop = YES;
+                aView.enabled = YES;
+                aView.canShowCallout = YES;
+        }
+        switch (((TelMapAnnotation *)annotation).type) {
+                case TelMapAnnotationTypeABRecord:
+                        aView.pinColor = MKPinAnnotationColorPurple;
+                        break;
+                case TelMapAnnotationTypeOther:
+                        aView.pinColor = MKPinAnnotationColorRed;
+                        break;
+                default:
+                        aView.pinColor = MKPinAnnotationColorGreen;
+                        break;
+        }
+        return aView;
+}
+
+- (void)mapView:(MKMapView *)mapView didAddAnnotationViews:(NSArray *)views {
+        // enable the below to zoom to local
+//      MKAnnotationView *aV;
+//      for (aV in views) {
+//              if (aV.annotation == theMap.userLocation) {
+//                      [theMap setCenterCoordinate:theMap.userLocation.location.coordinate animated:YES];
+//                      // zoom in (even if it's updating)
+//                      CLLocation *theLoc = [MyCLController sharedInstance].myCurrentLoc;
+//                      CLLocationDistance radiusAccuracy = 1000;
+//                      if (theLoc.horizontalAccuracy > 0.9 * radiusAccuracy)
+//                              radiusAccuracy = theLoc.horizontalAccuracy / 0.9;
+//                      MKCoordinateRegion aR = MKCoordinateRegionMakeWithDistance(theMap.userLocation.location.coordinate, radiusAccuracy, radiusAccuracy);
+//                      [theMap setRegion:[theMap regionThatFits:aR] animated:YES];
+//              }
+//      }
+}
         
 #pragma mark ---- MyCLController delegate methods ----
@@ -248 +260 @@
                 [self.labelGpsLastUpdateDate setText:NSLocalizedString(@"LatLongUnavailable", @"Latitude/Longitude unavailable")];
                 [self.labelGpsLastUpdateDate setNeedsDisplay];
-                self.markerGps.hidden = NO;
                 gpsLocIsAvailable = NO;
                 return;
@@ -259 +270 @@
         [dateFormatter release];
         
-        [theMap.markerManager moveMarker:markerGps AtLatLon:aLoc.coordinate];   
-        self.markerGps.hidden = NO;
         gpsLocIsAvailable = YES;
         return;

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

@@ -229 +229 @@
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
         
-        mapViewController.zoomLevel = 14.0;
         NSNumber *personId = [[FriendsData sharedInstance] getABRecordIdForIndexPath:indexPath];
         [tableView deselectRowAtIndexPath:indexPath animated:YES];
@@ -373 +372 @@
         [alertView show];
         [alertView release];
-        if (alertMessage)
-                [alertMessage release];
 }       
 
@@ -400 +397 @@
         // Do data setup
         [mapViewController didPressCenterGps:nil];
-        mapViewController.zoomLevel = 6.0;
         [self.navigationController pushViewController:mapViewController animated:YES];
 }

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

@@ -29 +29 @@
 #import <UIKit/UIKit.h>
 #import "NSString+UITableViewHelper.h"
+#import "NaptrCell.h"
+#import "NTNaptrCell.h"
 #import "FriendsData.h"
 #import "FriendsMapViewController.h"
@@ -38 +40 @@
 enum table_sections {
         SECTION_HEADER = 0,
-        SECTION_NAPTR = 1,
-        SECTION_TXT = 2,
-        SECTION_LOC = 3,
+        SECTION_NAPTR,
+        SECTION_TXT,
+        SECTION_LOC,
+        SECTION_TOTAL
 };
-
-#define NAPTRCELL_SERVICETYPE_TAG 1
-#define NAPTRCELL_LABEL_TAG 2
-#define NAPTRCELL_VALUE_TAG 3
 
 #define TXTCELL_DESCRIPTION_TAG 1
@@ -60 +59 @@
         NSString *headerText;
         NSMutableArray *naptrArray;
-        NSMutableArray *txtArray;
+        NSMutableArray *txtArray;               // only keywords
+        NSMutableArray *allTxtArray;    // all txt records
         NSMutableArray *locArray;
         NSString *country;
@@ -82 +82 @@
 - (void)getTxtForTel:(NSString *)telName;
 - (void)getLocForTel:(NSString *)telName;
-- (void)getNaptrInBackgroundForTel:(NSString *)telName;
-- (void)getTxtInBackgroundForTel:(NSString *)telName;
+- (void)getNaptrAndTxtInBackgroundForTel:(NSString *)telName;
 - (void)getLocInBackgroundForTel:(NSString *)telName;
 - (void)getCountryAndTimeZoneForLoc:(CLLocation *)aLoc;
@@ -95 +94 @@
 @property (nonatomic, retain) NSMutableArray *naptrArray;
 @property (nonatomic, retain) NSMutableArray *txtArray;
+@property (nonatomic, retain) NSMutableArray *allTxtArray;
 @property (nonatomic, retain) NSMutableArray *locArray;
 @property (nonatomic, retain) NSString *country;

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

@@ -30 +30 @@
 
 static UIFont *headerFont;
+static UIFont *naptrLabelFont;
 static UIFont *txtFont;
 
@@ -35 +36 @@
 
 - (void)decrementLoadingCount;
+- (void)refreshTableNaptrAndTxt;
+- (void)refreshTableLoc;
 - (void)showError:(NSError *)error;
 @end
@@ -46 +49 @@
 @synthesize naptrArray;
 @synthesize txtArray;
+@synthesize allTxtArray;
 @synthesize locArray;
 @synthesize country;
@@ -56 +60 @@
 
 #define kHeaderTextFontSize 14.0
+#define kNaptrLabelTextFontSize 12.0
 #define kTextFontSize 14.0
 
@@ -70 +75 @@
         
         headerFont = [UIFont boldSystemFontOfSize:kHeaderTextFontSize];
+        naptrLabelFont = [UIFont systemFontOfSize:kNaptrLabelTextFontSize];
         txtFont = [UIFont boldSystemFontOfSize:kTextFontSize];
 
@@ -94 +100 @@
         self.naptrArray = [NSMutableArray arrayWithCapacity:10];
         self.txtArray = [NSMutableArray arrayWithCapacity:10];
+        self.allTxtArray = [NSMutableArray arrayWithCapacity:20];
         self.locArray = [NSMutableArray arrayWithCapacity:1];
 
@@ -109 +116 @@
         [self.theTable reloadData];
         loadingCount = 3;
-        [self performSelectorInBackground:@selector(getNaptrInBackgroundForTel:) withObject:self.title];
-        [self performSelectorInBackground:@selector(getTxtInBackgroundForTel:) withObject:self.title];
+        [self performSelectorInBackground:@selector(getNaptrAndTxtInBackgroundForTel:) withObject:self.title];
         [self performSelectorInBackground:@selector(getLocInBackgroundForTel:) withObject:self.title];
         return TRUE;
@@ -147 +153 @@
 }
 
-#pragma mark ------ set up loading stuff
+#pragma mark -
+#pragma mark UI updates
 
 - (NSUInteger)loadingCount {
@@ -171 +178 @@
 }
 
-#pragma mark ------ tableView datasource methods
+- (void)refreshTableNaptrAndTxt {
+        // Must call this on main thread, because it has UI needs and is called from background threads
+        if (![NSThread isMainThread]) {
+                [self performSelectorOnMainThread:_cmd
+                                                           withObject:nil
+                                                        waitUntilDone:YES];
+                return;
+        }
+        [self.theTable reloadData];
+}
+
+- (void)refreshTableLoc {
+        // Must call this on main thread, because it has UI needs and is called from background threads
+        if (![NSThread isMainThread]) {
+                [self performSelectorOnMainThread:_cmd
+                                                           withObject:nil
+                                                        waitUntilDone:YES];
+                return;
+        }
+//      NSIndexSet *sections = [NSIndexSet indexSetWithIndex:SECTION_LOC];
+//      [self.theTable reloadSections:sections withRowAnimation:UITableViewRowAnimationFade];
+        [self.theTable reloadData];
+}
+
+#pragma mark -
+#pragma mark tableView datasource methods
 
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
-        return SECTION_LOC+1;
+        return SECTION_TOTAL;
 }
 
@@ -229 +261 @@
                         UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:MyIdentifier];
                         if (cell == nil) {
-                                cell = [[[UITableViewCell alloc] initWithFrame:CGRectZero reuseIdentifier:MyIdentifier] autorelease];
+                                cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:MyIdentifier] autorelease];
                         }
                         //Working with a resizable cell
@@ -246 +278 @@
                 case SECTION_NAPTR:
                 {
-                        static NSString *MyIdentifier = @"naptrCells";
+                        static NSString *NaptrCellId = @"naptrCells";
+                        static NSString *NTNaptrCellId = @"ntnaptrCells";
                         
                         RecordNaptr *theRec = [self.naptrArray objectAtIndex:indexPath.row];
                         
-                        UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:MyIdentifier];
-                        if (cell == nil) {
-                                NSArray *naptrCellNib = [[NSBundle mainBundle] loadNibNamed:@"NaptrTableViewCell" owner:self options:nil];
-                                cell = (UITableViewCell *)[naptrCellNib objectAtIndex:0];
-                        }
-                        
-                        [(UILabel *)[cell viewWithTag:NAPTRCELL_SERVICETYPE_TAG] setText:theRec.serviceDescription];
-                        
-                        // 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
+                        NaptrCell *cell;
                         if (theRec.isTerminal) {
-                                [(UILabel *)[cell viewWithTag:NAPTRCELL_LABEL_TAG] setText:theRec.labelDescription];
-                                [(UILabel *)[cell viewWithTag:NAPTRCELL_VALUE_TAG] setText:theRec.uriContent];
+                                cell = (NaptrCell *)[tableView dequeueReusableCellWithIdentifier:NaptrCellId];
+                                if (cell == nil) {
+                                        cell = [[[NaptrCell alloc] initWithStyle:UITableViewStylePlain reuseIdentifier:NaptrCellId] autorelease];
+                                }
                         } else {
-                                [(UILabel *)[cell viewWithTag:NAPTRCELL_LABEL_TAG] setText:@""];
-                                [(UILabel *)[cell viewWithTag:NAPTRCELL_VALUE_TAG] setText:theRec.labelDescription];
+                                cell = (NTNaptrCell *)[tableView dequeueReusableCellWithIdentifier:NTNaptrCellId];
+                                if (cell == nil) {
+                                        cell = [[[NTNaptrCell alloc] initWithStyle:UITableViewStylePlain reuseIdentifier:NTNaptrCellId] autorelease];
+                                }                               
+                        }
+
+                        cell.serviceText = theRec.serviceDescription;
+                        cell.labelText = theRec.labelDescription;
+                        cell.uriText = theRec.uriContent;
+                        cell.iconImage = nil;
+
+                        // Check if it's a ntnaptr. If so, remove the trailing part of the string if it is a subdomain of the current domain
+                        if ((! theRec.isTerminal) && ([theRec.labelDescription length] == 0)) {
                                 // If NTN points within domain, shorten text to only display the subdomain of this domain
-                                if ([[theRec.labelDescription lowercaseString] hasSuffix:[self.cleanTelName lowercaseString]]) {
-                                        NSInteger suffixIndex = [theRec.labelDescription length] - [self.cleanTelName length] - 1;
+                                NSLog(@"URI: %@, CLEAN NAME: %@", theRec.uriContent, self.cleanTelName);
+                                if ([[theRec.uriContent lowercaseString] hasSuffix:[self.cleanTelName lowercaseString]]) {
+                                        NSInteger suffixIndex = [theRec.uriContent length] - [self.cleanTelName length] - 1;
                                         if (suffixIndex > 0) {
-                                                [(UILabel *)[cell viewWithTag:NAPTRCELL_VALUE_TAG] setText:[theRec.labelDescription substringToIndex:suffixIndex]];
+                                                cell.labelText = [theRec.uriContent substringToIndex:suffixIndex];
                                         }
                                 }
-                                [cell setAccessoryType:UITableViewCellAccessoryDisclosureIndicator];
                         }
                         
@@ -420 +457 @@
                                 fMVC.initialLoc = loc;
                                 if ([abId integerValue] == NSUIntegerMax) {     // not one of our address book .tel domains
-                                        [fMVC setMarkerWithABRecordId:self.abId title:nil telname:self.title location:loc];
+                                        if (self.displayName) {
+                                                [fMVC setMarkerWithABRecordId:self.abId title:self.displayName telname:self.title location:loc];
+                                        } else {
+                                                [fMVC setMarkerWithABRecordId:self.abId title:self.cleanTelName telname:self.title location:loc];
+                                        }
+
                                 } else {
                                         NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
@@ -445 +487 @@
                         return [headerText cellHeightForFont:headerFont paddingWidth:10.0f Height:10.0f];
                 }
+                case SECTION_NAPTR:
+                {
+                        RecordNaptr *theRec = [self.naptrArray objectAtIndex:indexPath.row];
+                        // padding takes into consideration the static size of the servicetype row and uricontent row
+                        return [theRec.labelDescription cellHeightForFont:naptrLabelFont paddingWidth:10.0f Height:20.0f];
+                }
                 case SECTION_TXT:
                 {
@@ -494 +542 @@
         [[NetworkUtility sharedInstance] networkwillActivate:NO];
         [self decrementLoadingCount];
-        [self.theTable performSelectorOnMainThread:@selector(reloadData) withObject:nil waitUntilDone:YES];
         if (error) {
                 // Show all errors unless the answer is invalid, which generally means there aren't any NAPTRs
@@ -507 +554 @@
         [[NetworkUtility sharedInstance] networkwillActivate:YES];
         DnsResolver *res = [[DnsResolver alloc] init];
-        NSMutableArray *alltxtArray = [[[NSMutableArray alloc] initWithCapacity:20] autorelease];
-        NSUInteger txtCount = [res getTXTForTel:telName inArray:alltxtArray withError:&error];
+        NSUInteger txtCount = [res getTXTForTel:telName inArray:allTxtArray withError:&error];
         if (txtCount == 0) {
 #ifdef DEBUG
@@ -520 +566 @@
         RecordTxt *theRec;
         NSMutableString *_headerText = nil;
-        for (theRec in alltxtArray) {
+        for (theRec in allTxtArray) {
                 if (theRec.subType == RecordTxtSubTypeKeyword) {
                         // It's a keyword, let's add it to the array in the txt section
@@ -544 +590 @@
         }
         self.headerText = _headerText;
-        [self.theTable performSelectorOnMainThread:@selector(reloadData) withObject:nil waitUntilDone:YES];
 }
 
@@ -558 +603 @@
                 //NSLog(@"Warning: %d LOC records in domain %@", locCount, telName);
         }
-        [self.theTable performSelectorOnMainThread:@selector(reloadData) withObject:nil waitUntilDone:YES];
         if (locCount > 0) {
                 if (prefsReverseGeo) {
@@ -565 +609 @@
                         [self getCountryAndTimeZoneForLoc:(RecordLoc *)[self.locArray objectAtIndex:0]];
                         [[NetworkUtility sharedInstance] networkwillActivate:NO];
-                        [self.theTable performSelectorOnMainThread:@selector(reloadData) withObject:nil waitUntilDone:YES];
-                }
-        }
-}
-
-- (void) getNaptrInBackgroundForTel:(NSString *)telName {
-        NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-        [self getNaptrForTel:telName];
-        [pool release];
-}
-
-- (void) getTxtInBackgroundForTel:(NSString *)telName {
+                }
+        }
+}
+
+- (void)getNaptrAndTxtInBackgroundForTel:(NSString *)telName {
         NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
         [self getTxtForTel:telName];
+        [self getNaptrForTel:telName];
+        // merge the txt labels into the naptrs
+        DnsResolver *res = [[DnsResolver alloc] init];
+        [res updateNaptrArray:self.naptrArray withTxtArray:self.allTxtArray];
+        [res release];
+        [self refreshTableNaptrAndTxt];
         [pool release];
 }
 
-- (void) getLocInBackgroundForTel:(NSString *)telName {
+- (void)getLocInBackgroundForTel:(NSString *)telName {
         NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
         [self getLocForTel:telName];
+        [self refreshTableLoc];
         [pool release];
 }
@@ -695 +739 @@
         }
         if (err) {
-                NSLog([err localizedDescription]);
+                [self showError:err];
         }
 }

apps/iphone/superbook/trunk/Classes/NSString+UITableViewHelper.m

@@ -57 +57 @@
     cellLabel.textAlignment = UITextAlignmentLeft;
         cellLabel.font = font;
-    cellLabel.text = self; 
+    cellLabel.text = self;
     cellLabel.numberOfLines = 0; 
     [cellLabel sizeToFit];

apps/iphone/superbook/trunk/DotTel_SDK/Classes/DnsResolver.h

@@ -39 +39 @@
 #import <ldns/ldns.h>
 #import "NetworkUtility.h"
+#import "idna.h"
 #import "RecordNaptr.h"
 #import "RecordTxt.h"
@@ -71 +72 @@
  * @param aDom       the domain to query
  * @param naptrArray the array to add the naptrs to
+ *
  * @return           the number of NAPTR records in the domain. 0 should mean error
  *
@@ -104 +106 @@
 - (NSUInteger)getLOCForTel:(NSString *)domain inArray:(NSMutableArray *)locArray withError:(NSError **)error;
 
+/**
+ * Updates naptr records given an array of txt records
+ * At this time the only items that this method will use are labels (.tlb)
+ * .tlb records will be matched to their respective naptr records and will be
+ * used to modify the naptr records' label property
+ * Returns an array of int indexes of all modified naptr records in naptrArray
+ * 
+ * @param naptrArray    the array of naptrs to be updated
+ * @param txtArray              the array of txt records from which to extract the additional info
+ *
+ * @return           a set of indexes of NAPTR records modified
+ *
+ */
+- (NSIndexSet *)updateNaptrArray:(NSMutableArray *)naptrArray withTxtArray:(NSArray *)txtArray;
+
+/**
+ * Converts a fully qualified domain name into its IDN equivalent
+ * The output may be an unmodified string
+ * On error, returns the unmodified string (i.e. silently discards errors)
+ *
+ * @param domain        the domain to convert
+ *
+ * @return          the IDN string
+ *
+ */
+- (NSString *)idnStringFromDomain:(NSString *)domain;
 @end

apps/iphone/superbook/trunk/DotTel_SDK/Classes/DnsResolver.m

@@ -136 +136 @@
 }
 
+- (NSIndexSet *)updateNaptrArray:(NSMutableArray *)naptrArray withTxtArray:(NSArray *)txtArray {
+#ifdef DEBUG
+        NSLog(@"Updating NAPTR array with TXT array");
+#endif
+        NSMutableIndexSet *updatedNaptrs = [NSMutableIndexSet indexSet];
+        if ((naptrArray == nil) || (txtArray == nil)) return updatedNaptrs;
+        if (([naptrArray count] == 0) || ([txtArray count] == 0)) return updatedNaptrs;
+        RecordNaptr *aN;
+        RecordTxt *aT;
+        
+        // Create a dictionary to map order+prefs of txt
+        // We're doing the mapping on the txt array because we'll need to iterate
+        // on the naptr array to populate the index set
+        NSMutableDictionary *txtDict = [NSMutableDictionary dictionaryWithCapacity:[txtArray count]];
+        for (aT in txtArray) {
+                if (aT.subType == RecordTxtSubTypeLabel) {
+                        NSString *key = [NSString stringWithFormat:@"%d_%d", aT.order, aT.preference];
+                        [txtDict setObject:aT forKey:key];
+                }
+        }
+        
+        NSUInteger i, count = [naptrArray count];
+        for (i = 0; i < count; i++) {
+                aN = [naptrArray objectAtIndex:i];
+                NSString *key = [NSString stringWithFormat:@"%d_%d", [aN.order intValue], [aN.preference intValue]];
+                aT = [txtDict objectForKey:key];
+                if (aT != nil) {
+                        aN.labelDescription = aT.textValue;
+                        [updatedNaptrs addIndex:i];
+                }
+        }
+        return updatedNaptrs;
+}
 
 #pragma mark ------------ private methods -------------------
@@ -174 +207 @@
         
         ldns_rr_list *rrlist;   
-        ldns_rdf *ldnsdomain = ldns_dname_new_frm_str([domain UTF8String]);
-        NSError *err2;  
+        ldns_rdf *ldnsdomain = ldns_dname_new_frm_str([[self idnStringFromDomain:domain] UTF8String]);
+        NSError *err2;
         NSDictionary *dict;
         
@@ -271 +304 @@
 }
 
+#pragma mark -
+#pragma mark IDN methods
+
+- (NSString *)idnStringFromDomain:(NSString *)domain {
+        if (domain == nil) return nil;
+        char *p;
+        int rc;
+        rc = idna_to_ascii_8z([domain UTF8String], &p, 0);
+        if (rc != IDNA_SUCCESS) {
+                NSLog(@"idnStringFromDomain failed (%d): %s\n", rc, idna_strerror (rc));
+                return domain;
+    }
+        NSString *idnString = [NSString stringWithCString:p encoding:NSASCIIStringEncoding];
+        free(p);
+        return idnString;
+}
+
 @end

apps/iphone/superbook/trunk/DotTel_SDK/Classes/RecordNaptr.h

@@ -29 +29 @@
 #import <UIKit/UIKit.h>
 #import <ldns/ldns.h>
+#import "idna.h"
 
 // Shorthand for getting localized strings
@@ -98 +99 @@
 - (NSComparisonResult)comparator:(RecordNaptr *)aNaptr;
 
+/**
+ * Converts an IDN string into a domain name
+ * If the IDN string doesn't have the "xn--" prefix, the method returns
+ * a string that is the exact same as the input
+ * On error, returns the unmodified string (i.e. silently discards errors)
+ *
+ * @param domain        the IDN string
+ *
+ * @return          the domain to convert
+ *
+ */
+- (NSString *)domainFromIdnString:(NSString *)idnString;
+
 @property (readonly) BOOL isTerminal;
 @property (readonly) BOOL isPrivate;
@@ -111 +125 @@
 @property (readonly, nonatomic, retain) NSNumber *preference; 
 @property (readonly, nonatomic, retain) NSString *serviceDescription;
-@property (readonly, nonatomic, retain) NSString *labelDescription;
+@property (nonatomic, copy) NSString *labelDescription;
 @property (readonly, nonatomic, retain) NSString *uriContent;
 @property (readonly, nonatomic, retain) NSDate *expiryDate;

apps/iphone/superbook/trunk/DotTel_SDK/Classes/RecordNaptr.m

@@ -149 +149 @@
                         NSURL *telUrl = [NSURL URLWithString:uriContent];
                         if ([telUrl host]) {
-                                replacement = [NSString stringWithString:[telUrl host]];
+                                replacement = [self domainFromIdnString:[telUrl host]];
                                 uriContent = replacement;
                                 isTerminal = NO;
-                                labelDescription = [[[replacement stringByReplacingOccurrencesOfString:@"-" withString:@" "] capitalizedString] retain];
                         }
                 }
                 
         } else if ([flags isEqualToString:@""]) { // Non-terminal naptr
+                NSString *idnString = [self stringFromDnameRdf:ldns_rr_rdf(rr,5)];
+                replacement = [self domainFromIdnString:idnString];
+                uriContent = replacement;
                 isTerminal = NO;
-                replacement = [self stringFromDnameRdf:ldns_rr_rdf(rr,5)];
-                labelDescription = [[[replacement stringByReplacingOccurrencesOfString:@"-" withString:@" "] capitalizedString] retain];
-                uriContent = replacement;
+                labelDescription = @"";         // no short labels here
                 
         } else { // Not valid
@@ -286 +286 @@
                                                                 options:NSLiteralSearch
                                                                   range:NSMakeRange(0, [theDesc length])];
-        // cut off max label
-//      if ([theDesc length] > 20) {
-//              [theDesc deleteCharactersInRange:NSMakeRange(20, [theDesc length] - 20)];
-//      }
         return theDesc;
 }
@@ -318 +314 @@
 }       
 
-# pragma mark ------------- Utility functions for parsing record data fields ------------
+#pragma mark -
+#pragma mark Utility functions for parsing record data fields
 
 - (NSString *)stringFromStringRdf:(const ldns_rdf *)rdf {
@@ -382 +379 @@
 }
 
-#pragma mark ---- cleanup ----
+#pragma mark -
+#pragma mark IDN methods
+
+- (NSString *)domainFromIdnString:(NSString *)idnString {
+        if (idnString == nil) return nil;
+        char *p;
+        int rc;
+        rc = idna_to_unicode_8z8z([idnString UTF8String], &p, 0);
+        if (rc != IDNA_SUCCESS) {
+                NSLog(@"domainFromIdnString failed (%d): %s\n", rc, idna_strerror (rc));
+                return idnString;
+    }
+        NSString *domain = [NSString stringWithUTF8String:p];
+        free(p);
+        return domain;
+}
+
+#pragma mark -
+#pragma mark cleanup
 
 - (void)dealloc {

apps/iphone/superbook/trunk/DotTel_SDK/Classes/RecordTxt.h

@@ -39 +39 @@
         RecordTxtSubTypeOtherTSM                = 3,    // other .tel system message
         RecordTxtSubTypeAdvert                  = 4,    // .tad advert
+        RecordTxtSubTypeLabel                   = 5,    // .tlb record label
 };
 
@@ -52 +53 @@
         NSMutableArray *keysAndValues;          // all keys and values of the TXT record (including primary key/value)
         NSDate *expiryDate;                                     // Expiry date of the record, based on time-to-live
-
+        NSInteger order;
+        NSInteger preference;
 }
 
@@ -89 +91 @@
 @property (readonly, nonatomic, retain) NSMutableArray *keysAndValues;
 @property (readonly, nonatomic, retain) NSDate *expiryDate;
+@property (readonly) NSInteger order;
+@property (readonly) NSInteger preference;
 
 @end

apps/iphone/superbook/trunk/DotTel_SDK/Classes/RecordTxt.m

@@ -34 +34 @@
 
 - (BOOL)parseDisplayStringFromRecord:(const ldns_rr *)rr;
+- (BOOL)parseLabelFromRecord:(const ldns_rr *)rr;
 - (BOOL)parseKeywordsFromRecord:(const ldns_rr *)rr;
 
@@ -50 +51 @@
 @synthesize textValue;
 @synthesize keysAndValues;
+@synthesize order;
+@synthesize preference;
 
 + (id)recordWithRr:(ldns_rr *)rr {
@@ -75 +78 @@
         trimCharacterSet = [[NSCharacterSet whitespaceCharacterSet] retain];
         isValid = NO;
-
+        order = preference = 0;
+        
         if (ldns_rr_get_type(rr) != LDNS_RR_TYPE_TXT)
                 return self;
-
+        
         NSTimeInterval ttl = (NSTimeInterval)ldns_rr_ttl(rr);
         expiryDate = [lookupDate addTimeInterval:ttl];
@@ -105 +109 @@
                 subType = RecordTxtSubTypeAdvert;
                 return self;
+        } else if ([firstString isEqualToString:@".tlb"]) {
+                // record label
+                subType = RecordTxtSubTypeLabel;
+                isValid = [self parseLabelFromRecord:rr];
+                return self;
         } else {
                 // header
@@ -115 +124 @@
                         [stringComponents addObject:[self stringFromStringRdf:ldns_rr_rdf(rr,i)]];
                 }
-
+                
                 textValue = [stringComponents componentsJoinedByString:@" "];
                 isValid = YES;
@@ -135 +144 @@
         textValue = nil;
         return FALSE;
+}
+
+- (BOOL)parseLabelFromRecord:(const ldns_rr *)rr {
+        // Labels always start with ".lbl" and have an order and preference to map them to records
+        // ".tlb", "1", "100", "101", "This is a label"
+        
+        // Check version
+        if ([[self stringFromStringRdf:ldns_rr_rdf(rr,1)] isEqualToString:@"1"]) {
+                // Version 1
+                order = [[self stringFromStringRdf:ldns_rr_rdf(rr,2)] integerValue];
+                preference = [[self stringFromStringRdf:ldns_rr_rdf(rr,3)] integerValue];
+                textValue = [[self stringFromStringRdf:ldns_rr_rdf(rr,4)] retain];
+                return TRUE;
+        } else {
+                // Unknown version
+                textValue = nil;
+                return FALSE;
+        }
 }
 
@@ -208 +235 @@
 - (void)dealloc {
         [trimCharacterSet release];
-//      [primaryDescription release];
-//      [primaryValue release];
-//      [textValue release];
-//      [keysAndValues release];
-//      [expiryDate release];
+        //      [primaryDescription release];
+        //      [primaryValue release];
+        //      [textValue release];
+        //      [keysAndValues release];
+        //      [expiryDate release];
         [super dealloc];
 }

apps/iphone/superbook/trunk/DotTel_SDK/README DotTel SDK

@@ -1 +1 @@
 Welcome to the .tel iPhone SDK.
-Version 1.1 for iPhone OS 2.0 and above
+Version 1.2 for iPhone OS 2.0 and above
 
 The main purpose of this SDK is to enable quick development of iPhone
@@ -57 +57 @@
 CHANGE NOTES:
 
+- 1.2 Oct 30, 2009
+  Added .tlb support
+
 - 1.1 Sept 20, 2008
   Added expiryDate based on TTL.

apps/iphone/superbook/trunk/English.lproj/About.html

@@ -8 +8 @@
 
 <body  style="font-family: verdana; font-size: small;">
-<p align="right">Version 1.3 by Henri Asseily, <a href="http://henri.tel">henri.tel</a><br />
+<p align="right">Version 1.4 by Henri Asseily, <a href="http://henri.tel">henri.tel</a><br />
 Copyright 2009 Telnic Ltd., <a href="http://dev.telnic.org/pages/legal.html">License Agreement</a><br />
 Report issues in the <a href="http://dev.telnic.org/trac/discussion">.tel Community Forum</a></p>
@@ -30 +30 @@
 </ul>
 <p>Henri Asseily, Beirut, Lebanon, June 2009.</p>
+<p>Updated November 2009</p>
 </body>
 </html>

apps/iphone/superbook/trunk/English.lproj/Localizable.strings

@@ -122 +122 @@
 "UpdateExisting" = "Update %@";
 
+/* Create a new contact */
+"CreateNewContact" = "Create new contact";
 
 

apps/iphone/superbook/trunk/FMapView.xib

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.03">
+<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
         <data>
-                <int key="IBDocument.SystemTarget">528</int>
-                <string key="IBDocument.SystemVersion">9J61</string>
-                <string key="IBDocument.InterfaceBuilderVersion">677</string>
-                <string key="IBDocument.AppKitVersion">949.46</string>
-                <string key="IBDocument.HIToolboxVersion">353.00</string>
-                <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
-                        <bool key="EncodedWithXMLCoder">YES</bool>
-                        <integer value="4"/>
-                </object>
-                <object class="NSArray" key="IBDocument.PluginDependencies">
-                        <bool key="EncodedWithXMLCoder">YES</bool>
+                <int key="IBDocument.SystemTarget">768</int>
+                <string key="IBDocument.SystemVersion">10B504</string>
+                <string key="IBDocument.InterfaceBuilderVersion">732</string>
+                <string key="IBDocument.AppKitVersion">1038.2</string>
+                <string key="IBDocument.HIToolboxVersion">437.00</string>
+                <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+                        <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                        <string key="NS.object.0">62</string>
+                </object>
+                <array class="NSMutableArray" key="IBDocument.EditedObjectIDs">
+                        <integer value="57"/>
+                </array>
+                <array key="IBDocument.PluginDependencies">
                         <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                </object>
-                <object class="NSMutableDictionary" key="IBDocument.Metadata">
-                        <bool key="EncodedWithXMLCoder">YES</bool>
-                        <object class="NSArray" key="dict.sortedKeys">
-                                <bool key="EncodedWithXMLCoder">YES</bool>
-                        </object>
-                        <object class="NSMutableArray" key="dict.values">
-                                <bool key="EncodedWithXMLCoder">YES</bool>
-                        </object>
-                </object>
-                <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
-                        <bool key="EncodedWithXMLCoder">YES</bool>
+                </array>
+                <dictionary class="NSMutableDictionary" key="IBDocument.Metadata"/>
+                <array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
                         <object class="IBProxyObject" id="372490531">
                                 <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
@@ -35 +28 @@
                                 <reference key="NSNextResponder"/>
                                 <int key="NSvFlags">274</int>
-                                <object class="NSMutableArray" key="NSSubviews">
-                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                        <object class="IBUIView" id="129435978">
-                                                <reference key="NSNextResponder" ref="313343111"/>
-                                                <int key="NSvFlags">274</int>
-                                                <object class="NSMutableArray" key="NSSubviews">
-                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                        <object class="IBUIToolbar" id="139092493">
-                                                                <reference key="NSNextResponder" ref="129435978"/>
-                                                                <int key="NSvFlags">266</int>
-                                                                <string key="NSFrame">{{0, 372}, {320, 44}}</string>
-                                                                <reference key="NSSuperview" ref="129435978"/>
-                                                                <bool key="IBUIOpaque">NO</bool>
-                                                                <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
-                                                                <int key="IBUIBarStyle">2</int>
-                                                                <object class="NSMutableArray" key="IBUIItems">
-                                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                                        <object class="IBUIBarButtonItem" id="144500120">
-                                                                                <int key="IBUIStyle">1</int>
-                                                                                <reference key="IBUIToolbar" ref="139092493"/>
-                                                                                <int key="IBUISystemItemIdentifier">9</int>
-                                                                        </object>
-                                                                </object>
-                                                                <object class="NSColor" key="IBUITintColor">
-                                                                        <int key="NSColorSpace">1</int>
-                                                                        <bytes key="NSRGB">MCAwLjI1MDk4MDQxIDAuNTAxOTYwODEAA</bytes>
-                                                                </object>
+                                <array class="NSMutableArray" key="NSSubviews">
+                                        <object class="IBMKMapView" id="270057972">
+                                                <reference key="NSNextResponder" ref="313343111"/>
+                                                <int key="NSvFlags">268</int>
+                                                <string key="NSFrameSize">{320, 416}</string>
+                                                <reference key="NSSuperview" ref="313343111"/>
+                                                <bool key="IBUIOpaque">NO</bool>
+                                                <bool key="IBUIClipsSubviews">YES</bool>
+                                                <int key="IBUIContentMode">4</int>
+                                                <bool key="IBUIMultipleTouchEnabled">YES</bool>
+                                        </object>
+                                        <object class="IBUIToolbar" id="139092493">
+                                                <reference key="NSNextResponder" ref="313343111"/>
+                                                <int key="NSvFlags">266</int>
+                                                <string key="NSFrame">{{0, 372}, {320, 44}}</string>
+                                                <reference key="NSSuperview" ref="313343111"/>
+                                                <bool key="IBUIOpaque">NO</bool>
+                                                <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+                                                <int key="IBUIBarStyle">2</int>
+                                                <array class="NSMutableArray" key="IBUIItems">
+                                                        <object class="IBUIBarButtonItem" id="144500120">
+                                                                <int key="IBUIStyle">1</int>
+                                                                <reference key="IBUIToolbar" ref="139092493"/>
+                                                                <int key="IBUISystemItemIdentifier">9</int>
                                                         </object>
-                                                        <object class="IBUILabel" id="390972019">
-                                                                <reference key="NSNextResponder" ref="129435978"/>
-                                                                <int key="NSvFlags">269</int>
-                                                                <string key="NSFrame">{{57, 384}, {137, 21}}</string>
-                                                                <reference key="NSSuperview" ref="129435978"/>
-                                                                <bool key="IBUIOpaque">NO</bool>
-                                                                <bool key="IBUIClipsSubviews">YES</bool>
-                                                                <int key="IBUITag">101</int>
-                                                                <bool key="IBUIUserInteractionEnabled">NO</bool>
-                                                                <string key="IBUIText">GPS Last Update Time:</string>
-                                                                <object class="NSFont" key="IBUIFont">
-                                                                        <string key="NSName">Helvetica-Bold</string>
-                                                                        <double key="NSSize">1.200000e+01</double>
-                                                                        <int key="NSfFlags">16</int>
-                                                                </object>
-                                                                <object class="NSColor" key="IBUITextColor" id="693340492">
-                                                                        <int key="NSColorSpace">1</int>
-                                                                        <bytes key="NSRGB">MSAxIDEAA</bytes>
-                                                                </object>
-                                                                <nil key="IBUIHighlightedColor"/>
-                                                                <int key="IBUIBaselineAdjustment">1</int>
-                                                                <float key="IBUIMinimumFontSize">1.000000e+01</float>
-                                                                <int key="IBUITextAlignment">2</int>
-                                                        </object>
-                                                        <object class="IBUILabel" id="110319406">
-                                                                <reference key="NSNextResponder" ref="129435978"/>
-                                                                <int key="NSvFlags">269</int>
-                                                                <string key="NSFrame">{{198, 385}, {113, 19}}</string>
-                                                                <reference key="NSSuperview" ref="129435978"/>
-                                                                <bool key="IBUIOpaque">NO</bool>
-                                                                <bool key="IBUIClipsSubviews">YES</bool>
-                                                                <bool key="IBUIUserInteractionEnabled">NO</bool>
-                                                                <string key="IBUIText">unknown</string>
-                                                                <object class="NSFont" key="IBUIFont">
-                                                                        <string key="NSName">Helvetica-Oblique</string>
-                                                                        <double key="NSSize">1.200000e+01</double>
-                                                                        <int key="NSfFlags">16</int>
-                                                                </object>
-                                                                <reference key="IBUITextColor" ref="693340492"/>
-                                                                <nil key="IBUIHighlightedColor"/>
-                                                                <int key="IBUIBaselineAdjustment">1</int>
-                                                                <float key="IBUIMinimumFontSize">9.000000e+00</float>
-                                                        </object>
-                                                </object>
-                                                <string key="NSFrameSize">{320, 416}</string>
-                                                <reference key="NSSuperview" ref="313343111"/>
-                                                <reference key="IBUIBackgroundColor" ref="693340492"/>
-                                                <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
-                                                <int key="IBUIContentMode">9</int>
-                                                <bool key="IBUIMultipleTouchEnabled">YES</bool>
-                                        </object>
-                                </object>
+                                                </array>
+                                                <object class="NSColor" key="IBUITintColor">
+                                                        <int key="NSColorSpace">1</int>
+                                                        <bytes key="NSRGB">MCAwLjI1MDk4MDQxIDAuNTAxOTYwODEAA</bytes>
+                                                </object>
+                                        </object>
+                                        <object class="IBUILabel" id="110319406">
+                                                <reference key="NSNextResponder" ref="313343111"/>
+                                                <int key="NSvFlags">269</int>
+                                                <string key="NSFrame">{{197, 385}, {113, 19}}</string>
+                                                <reference key="NSSuperview" ref="313343111"/>
+                                                <bool key="IBUIOpaque">NO</bool>
+                                                <bool key="IBUIClipsSubviews">YES</bool>
+                                                <bool key="IBUIUserInteractionEnabled">NO</bool>
+                                                <string key="IBUIText">unknown</string>
+                                                <object class="NSFont" key="IBUIFont">
+                                                        <string key="NSName">Helvetica-Oblique</string>
+                                                        <double key="NSSize">12</double>
+                                                        <int key="NSfFlags">16</int>
+                                                </object>
+                                                <object class="NSColor" key="IBUITextColor" id="693340492">
+                                                        <int key="NSColorSpace">1</int>
+                                                        <bytes key="NSRGB">MSAxIDEAA</bytes>
+                                                </object>
+                                                <nil key="IBUIHighlightedColor"/>
+                                                <int key="IBUIBaselineAdjustment">1</int>
+                                                <float key="IBUIMinimumFontSize">9</float>
+                                        </object>
+                                        <object class="IBUILabel" id="390972019">
+                                                <reference key="NSNextResponder" ref="313343111"/>
+                                                <int key="NSvFlags">269</int>
+                                                <string key="NSFrame">{{54, 384}, {137, 21}}</string>
+                                                <reference key="NSSuperview" ref="313343111"/>
+                                                <bool key="IBUIOpaque">NO</bool>
+                                                <bool key="IBUIClipsSubviews">YES</bool>
+                                                <int key="IBUITag">101</int>
+                                                <bool key="IBUIUserInteractionEnabled">NO</bool>
+                                                <string key="IBUIText">GPS Last Update Time:</string>
+                                                <object class="NSFont" key="IBUIFont">
+                                                        <string key="NSName">Helvetica-Bold</string>
+                                                        <double key="NSSize">12</double>
+                                                        <int key="NSfFlags">16</int>
+                                                </object>
+                                                <reference key="IBUITextColor" ref="693340492"/>
+                                                <nil key="IBUIHighlightedColor"/>
+                                                <int key="IBUIBaselineAdjustment">1</int>
+                                                <float key="IBUIMinimumFontSize">10</float>
+                                                <int key="IBUITextAlignment">2</int>
+                                        </object>
+                                </array>
                                 <string key="NSFrameSize">{320, 416}</string>
                                 <reference key="NSSuperview"/>
@@ -129 +117 @@
                                 </object>
                         </object>
-                </object>
+                </array>
                 <object class="IBObjectContainer" key="IBDocument.Objects">
-                        <object class="NSMutableArray" key="connectionRecords">
-                                <bool key="EncodedWithXMLCoder">YES</bool>
+                        <array class="NSMutableArray" key="connectionRecords">
                                 <object class="IBConnectionRecord">
                                         <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -156 +143 @@
                                         </object>
                                         <int key="connectionID">52</int>
-                                </object>
-                                <object class="IBConnectionRecord">
-                                        <object class="IBCocoaTouchOutletConnection" key="connection">
-                                                <string key="label">theMap</string>
-                                                <reference key="source" ref="372490531"/>
-                                                <reference key="destination" ref="129435978"/>
-                                        </object>
-                                        <int key="connectionID">53</int>
                                 </object>
                                 <object class="IBConnectionRecord">
@@ -181 +160 @@
                                         <int key="connectionID">56</int>
                                 </object>
-                        </object>
+                                <object class="IBConnectionRecord">
+                                        <object class="IBCocoaTouchOutletConnection" key="connection">
+                                                <string key="label">theMap</string>
+                                                <reference key="source" ref="372490531"/>
+                                                <reference key="destination" ref="270057972"/>
+                                        </object>
+                                        <int key="connectionID">58</int>
+                                </object>
+                        </array>
                         <object class="IBMutableOrderedSet" key="objectRecords">
-                                <object class="NSArray" key="orderedObjects">
-                                        <bool key="EncodedWithXMLCoder">YES</bool>
+                                <array key="orderedObjects">
                                         <object class="IBObjectRecord">
                                                 <int key="objectID">0</int>
-                                                <object class="NSArray" key="object" id="360949347">
-                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                </object>
+                                                <array key="object" id="0"/>
                                                 <reference key="children" ref="1000"/>
                                                 <nil key="parent"/>
@@ -196 +180 @@
                                                 <int key="objectID">-1</int>
                                                 <reference key="object" ref="372490531"/>
-                                                <reference key="parent" ref="360949347"/>
-                                                <string type="base64-UTF8" key="objectName">RmlsZSdzIE93bmVyA</string>
+                                                <reference key="parent" ref="0"/>
+                                                <string key="objectName">File's Owner</string>
                                         </object>
                                         <object class="IBObjectRecord">
                                                 <int key="objectID">-2</int>
                                                 <reference key="object" ref="975951072"/>
-                                                <reference key="parent" ref="360949347"/>
+                                                <reference key="parent" ref="0"/>
                                         </object>
                                         <object class="IBObjectRecord">
                                                 <int key="objectID">3</int>
                                                 <reference key="object" ref="313343111"/>
-                                                <object class="NSMutableArray" key="children">
-                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                        <reference ref="129435978"/>
-                                                </object>
-                                                <reference key="parent" ref="360949347"/>
-                                        </object>
-                                        <object class="IBObjectRecord">
-                                                <int key="objectID">4</int>
-                                                <reference key="object" ref="129435978"/>
-                                                <object class="NSMutableArray" key="children">
-                                                        <bool key="EncodedWithXMLCoder">YES</bool>
+                                                <array class="NSMutableArray" key="children">
+                                                        <reference ref="270057972"/>
                                                         <reference ref="139092493"/>
                                                         <reference ref="390972019"/>
                                                         <reference ref="110319406"/>
-                                                </object>
+                                                </array>
+                                                <reference key="parent" ref="0"/>
+                                        </object>
+                                        <object class="IBObjectRecord">
+                                                <int key="objectID">57</int>
+                                                <reference key="object" ref="270057972"/>
+                                                <reference key="parent" ref="313343111"/>
+                                        </object>
+                                        <object class="IBObjectRecord">
+                                                <int key="objectID">5</int>
+                                                <reference key="object" ref="110319406"/>
+                                                <reference key="parent" ref="313343111"/>
+                                                <string key="objectName">labelGpsLastUpdateDate</string>
+                                        </object>
+                                        <object class="IBObjectRecord">
+                                                <int key="objectID">32</int>
+                                                <reference key="object" ref="390972019"/>
                                                 <reference key="parent" ref="313343111"/>
                                         </object>
@@ -227 +218 @@
                                                 <int key="objectID">36</int>
                                                 <reference key="object" ref="139092493"/>
-                                                <object class="NSMutableArray" key="children">
-                                                        <bool key="EncodedWithXMLCoder">YES</bool>
+                                                <array class="NSMutableArray" key="children">
                                                         <reference ref="144500120"/>
-                                                </object>
-                                                <reference key="parent" ref="129435978"/>
+                                                </array>
+                                                <reference key="parent" ref="313343111"/>
                                         </object>
                                         <object class="IBObjectRecord">
@@ -238 +228 @@
                                                 <reference key="parent" ref="139092493"/>
                                         </object>
-                                        <object class="IBObjectRecord">
-                                                <int key="objectID">32</int>
-                                                <reference key="object" ref="390972019"/>
-                                                <reference key="parent" ref="129435978"/>
-                                        </object>
-                                        <object class="IBObjectRecord">
-                                                <int key="objectID">5</int>
-                                                <reference key="object" ref="110319406"/>
-                                                <reference key="parent" ref="129435978"/>
-                                                <string key="objectName">labelGpsLastUpdateDate</string>
-                                        </object>
-                                </object>
-                        </object>
-                        <object class="NSMutableDictionary" key="flattenedProperties">
-                                <bool key="EncodedWithXMLCoder">YES</bool>
-                                <object class="NSMutableArray" key="dict.sortedKeys">
-                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                        <string>-1.CustomClassName</string>
-                                        <string>-2.CustomClassName</string>
-                                        <string>3.IBEditorWindowLastContentRect</string>
-                                        <string>3.IBPluginDependency</string>
-                                        <string>32.IBPluginDependency</string>
-                                        <string>36.IBPluginDependency</string>
-                                        <string>37.IBPluginDependency</string>
-                                        <string>4.CustomClassName</string>
-                                        <string>4.IBPluginDependency</string>
-                                        <string>5.IBPluginDependency</string>
-                                </object>
-                                <object class="NSMutableArray" key="dict.values">
-                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                        <string>FriendsMapViewController</string>
-                                        <string>UIResponder</string>
-                                        <string>{{98, 376}, {320, 480}}</string>
-                                        <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                                        <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                                        <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                                        <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                                        <string>RMMapView</string>
-                                        <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                                        <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                                </object>
-                        </object>
-                        <object class="NSMutableDictionary" key="unlocalizedProperties">
-                                <bool key="EncodedWithXMLCoder">YES</bool>
-                                <object class="NSArray" key="dict.sortedKeys">
-                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                </object>
-                                <object class="NSMutableArray" key="dict.values">
-                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                </object>
-                        </object>
+                                </array>
+                        </object>
+                        <dictionary class="NSMutableDictionary" key="flattenedProperties">
+                                <string key="-1.CustomClassName">FriendsMapViewController</string>
+                                <string key="-2.CustomClassName">UIResponder</string>
+                                <string key="3.IBEditorWindowLastContentRect">{{98, 376}, {320, 480}}</string>
+                                <string key="3.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                                <string key="32.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                                <string key="36.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                                <string key="37.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                                <string key="5.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                                <string key="57.IBEditorWindowLastContentRect">{{0, 706}, {240, 128}}</string>
+                                <string key="57.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                        </dictionary>
+                        <dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
                         <nil key="activeLocalization"/>
-                        <object class="NSMutableDictionary" key="localizations">
-                                <bool key="EncodedWithXMLCoder">YES</bool>
-                                <object class="NSArray" key="dict.sortedKeys">
-                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                </object>
-                                <object class="NSMutableArray" key="dict.values">
-                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                </object>
-                        </object>
+                        <dictionary class="NSMutableDictionary" key="localizations"/>
                         <nil key="sourceID"/>
-                        <int key="maxID">56</int>
+                        <int key="maxID">58</int>
                 </object>
                 <object class="IBClassDescriber" key="IBDocument.Classes">
-                        <object class="NSMutableArray" key="referencedPartialClassDescriptions">
-                                <bool key="EncodedWithXMLCoder">YES</bool>
+                        <array class="NSMutableArray" key="referencedPartialClassDescriptions">
                                 <object class="IBPartialClassDescription">
                                         <string key="className">FriendsMapViewController</string>
                                         <string key="superclassName">UIViewController</string>
-                                        <object class="NSMutableDictionary" key="actions">
-                                                <bool key="EncodedWithXMLCoder">YES</bool>
-                                                <object class="NSMutableArray" key="dict.sortedKeys">
-                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                        <string>didPressCenterGps:</string>
-                                                        <string>didPressMoveTo:</string>
-                                                        <string>gpsSwitchToggled:</string>
-                                                </object>
-                                                <object class="NSMutableArray" key="dict.values">
-                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                        <string>id</string>
-                                                        <string>id</string>
-                                                        <string>UISwitch</string>
-                                                </object>
-                                        </object>
-                                        <object class="NSMutableDictionary" key="outlets">
-                                                <bool key="EncodedWithXMLCoder">YES</bool>
-                                                <object class="NSMutableArray" key="dict.sortedKeys">
-                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                        <string>actionBar</string>
-                                                        <string>buttonMoveTo</string>
-                                                        <string>labelGpsLastUpdateDate</string>
-                                                        <string>theMap</string>
-                                                </object>
-                                                <object class="NSMutableArray" key="dict.values">
-                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                        <string>UIToolbar</string>
-                                                        <string>UIBarButtonItem</string>
-                                                        <string>UILabel</string>
-                                                        <string>RMMapView</string>
-                                                </object>
-                                        </object>
+                                        <dictionary class="NSMutableDictionary" key="actions">
+                                                <string key="didPressCenterGps:">id</string>
+                                                <string key="didPressMoveTo:">id</string>
+                                                <string key="gpsSwitchToggled:">UISwitch</string>
+                                        </dictionary>
+                                        <dictionary class="NSMutableDictionary" key="outlets">
+                                                <string key="actionBar">UIToolbar</string>
+                                                <string key="buttonMoveTo">UIBarButtonItem</string>
+                                                <string key="labelGpsLastUpdateDate">UILabel</string>
+                                                <string key="theMap">MKMapView</string>
+                                        </dictionary>
                                         <object class="IBClassDescriptionSource" key="sourceIdentifier">
                                                 <string key="majorKey">IBProjectSource</string>
@@ -345 +269 @@
                                         </object>
                                 </object>
-                        </object>
+                        </array>
+                        <array class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
+                                <object class="IBPartialClassDescription">
+                                        <string key="className">MKMapView</string>
+                                        <string key="superclassName">UIView</string>
+                                        <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                                <string key="majorKey">IBFrameworkSource</string>
+                                                <string key="minorKey">MapKit.framework/Headers/MKMapView.h</string>
+                                        </object>
+                                </object>
+                        </array>
                 </object>
                 <int key="IBDocument.localizationMode">0</int>
+                <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
+                        <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
+                        <integer value="768" key="NS.object.0"/>
+                </object>
+                <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+                        <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
+                        <integer value="512" key="NS.object.0"/>
+                </object>
+                <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
                 <string key="IBDocument.LastKnownRelativeProjectPath">LocateThem.xcodeproj</string>
                 <int key="IBDocument.defaultPropertyAccessControl">3</int>
-                <string key="IBCocoaTouchPluginVersion">3.0</string>
+                <string key="IBCocoaTouchPluginVersion">3.1</string>
         </data>
 </archive>

apps/iphone/superbook/trunk/French.lproj/About.html

@@ -8 +8 @@
 
 <body  style="font-family: verdana; font-size: small;">
-<p align="right">Version 1.3 par Henri Asseily, <a href="http://henri.tel">henri.tel</a><br />
+<p align="right">Version 1.4 par Henri Asseily, <a href="http://henri.tel">henri.tel</a><br />
 Copyright 2009 Telnic Ltd., <a href="http://dev.telnic.org/pages/legal.html">Mentions l&eacute;gales et conditions d'utilisation</a><br />
 Posez vos questions sur <a href="http://dev.telnic.org/trac/discussion">.tel Community Forum</a></p>
@@ -30 +30 @@
 </ul> 
 <p>Henri Asseily, Beyrouth, Liban, Juin 2009.</p>
+<p>Modifications Novembre 2009</p>
 </body>
 </html>

apps/iphone/superbook/trunk/French.lproj/Localizable.strings

@@ -146 +146 @@
 /* Save to another contact */
 /*"Save to another contact" = "Save to another contact";*/
-"Save to another contact" = "Enregistrer pour un autre contact";
+"Save to another contact" = "Mettre à jour autrui";
 
 /* Save to existing current contact */
@@ -152 +152 @@
 "UpdateExisting" = "Mettre à jour %@";
 
+/* Create a new contact */
+/*"CreateNewContact" = "Create new contact";*/
+"CreateNewContact" = "Créer un nouveau contact";
 
 

apps/iphone/superbook/trunk/German.lproj/Localizable.strings

@@ -114 +114 @@
 
 /* Save To Address Book */
-"Save To Address Book" = "im Adressbuch speichern";
+"Save To Address Book" = "Im Adressbuch speichern";
 
 /* Save to another contact */
-"Save to another contact" = "auf anderen Kontakt";
+"Save to another contact" = "Auf anderen Kontakt";
 
 /* Save to existing current contact */
 "UpdateExisting" = "Aktualisiere %@";
+
+/* Create a new contact */
+"CreateNewContact" = "Neues Kontakt";
 
 

apps/iphone/superbook/trunk/Info.plist

@@ -22 +22 @@
         <string>????</string>
         <key>CFBundleVersion</key>
-        <string>1.3.0</string>
+        <string>1.4.0</string>
         <key>LSRequiresIPhoneOS</key>
         <true/>

apps/iphone/superbook/trunk/LocateThem.xcodeproj/project.pbxproj

@@ -19 +19 @@
                 381A04760F89193500446D89 /* MainView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 381A04750F89193500446D89 /* MainView.xib */; };
                 381A88430FAF947200CD57A2 /* Entitlements.plist in Resources */ = {isa = PBXBuildFile; fileRef = 381A88420FAF947200CD57A2 /* Entitlements.plist */; };
-                382650EB0F7CFD4D0065B5B9 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 382650EA0F7CFD4D0065B5B9 /* libsqlite3.dylib */; };
                 3826516A0F7CFFAC0065B5B9 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 382651690F7CFFAC0065B5B9 /* QuartzCore.framework */; };
                 382F8C1C0F8379CB00ED53BF /* NSString+UITableViewHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 382F8C1B0F8379CB00ED53BF /* NSString+UITableViewHelper.m */; };
                 382F8CFF0F83983D00ED53BF /* TelView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 382F8CFE0F83983D00ED53BF /* TelView.xib */; };
+                3841975110A0817D00A18A20 /* NaptrCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 3841975010A0817D00A18A20 /* NaptrCell.m */; };
+                3841981610A0C6BA00A18A20 /* NTNaptrCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 3841981510A0C6BA00A18A20 /* NTNaptrCell.m */; };
+                38451057109F4630004302FF /* libidn.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 38451056109F4630004302FF /* libidn.a */; };
                 3849097B0FEA786C00F54327 /* routeme.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3849097A0FEA786C00F54327 /* routeme.plist */; };
                 38527485100A82E9005F4329 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 38527483100A82E9005F4329 /* Localizable.strings */; };
@@ -46 +48 @@
                 38976FB20FE016B5006D2DDE /* WebUrlViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 38976FB00FE016B5006D2DDE /* WebUrlViewController.m */; };
                 38976FB30FE016B5006D2DDE /* WebUrlView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 38976FB10FE016B5006D2DDE /* WebUrlView.xib */; };
-                38ACC9F70FB85589001EC74E /* MapView.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 38ACC9F60FB85589001EC74E /* MapView.framework */; };
                 38B8B9280FF11173001E59B0 /* SettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 38B8B9260FF11173001E59B0 /* SettingsViewController.m */; };
                 38B8B9290FF11173001E59B0 /* SettingsView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 38B8B9270FF11173001E59B0 /* SettingsView.xib */; };
+                38BA1DFE109C90880049D362 /* TelMapAnnotation.m in Sources */ = {isa = PBXBuildFile; fileRef = 38BA1DFD109C90880049D362 /* TelMapAnnotation.m */; };
+                38BA1E2A109C91490049D362 /* MapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 38BA1E29109C91490049D362 /* MapKit.framework */; };
                 38D1582D0F84C3C900A97E88 /* bg-main.png in Resources */ = {isa = PBXBuildFile; fileRef = 38D1582C0F84C3C800A97E88 /* bg-main.png */; };
                 38D1582F0F84C3F400A97E88 /* logo.png in Resources */ = {isa = PBXBuildFile; fileRef = 38D1582E0F84C3F400A97E88 /* logo.png */; };
@@ -54 +57 @@
                 38D163260F861E2E00A97E88 /* NetworkUtility.m in Sources */ = {isa = PBXBuildFile; fileRef = 38D163250F861E2E00A97E88 /* NetworkUtility.m */; };
                 38D164CD0F864A1000A97E88 /* Reachability.m in Sources */ = {isa = PBXBuildFile; fileRef = 38D164CC0F864A1000A97E88 /* Reachability.m */; };
-                38D166E10F8658D900A97E88 /* LocTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 38D166E00F8658D900A97E88 /* LocTableViewCell.m */; };
                 38DB6B4F0F8B943500C7AE69 /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 38DB6B4E0F8B943500C7AE69 /* Icon.png */; };
                 38DD047B0F7AE8BB000C66F6 /* loading.png in Resources */ = {isa = PBXBuildFile; fileRef = 38DD04760F7AE8BB000C66F6 /* loading.png */; };
@@ -96 +98 @@
                 381A04750F89193500446D89 /* MainView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MainView.xib; sourceTree = "<group>"; };
                 381A88420FAF947200CD57A2 /* Entitlements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Entitlements.plist; sourceTree = "<group>"; };
-                382650EA0F7CFD4D0065B5B9 /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = usr/lib/libsqlite3.dylib; sourceTree = SDKROOT; };
-                382651690F7CFFAC0065B5B9 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
+                382651690F7CFFAC0065B5B9 /* QuartzCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
                 382F8C1A0F8379CB00ED53BF /* NSString+UITableViewHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+UITableViewHelper.h"; sourceTree = "<group>"; };
                 382F8C1B0F8379CB00ED53BF /* NSString+UITableViewHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+UITableViewHelper.m"; sourceTree = "<group>"; };
@@ -106 +107 @@
                 383D3FD51043E33F0018D271 /* German */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = German; path = German.lproj/Localizable.strings; sourceTree = "<group>"; };
                 383D3FFA1043EBFA0018D271 /* German */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = German; path = German.lproj/DotTel.strings; sourceTree = "<group>"; };
+                3841974F10A0817D00A18A20 /* NaptrCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NaptrCell.h; sourceTree = "<group>"; };
+                3841975010A0817D00A18A20 /* NaptrCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NaptrCell.m; sourceTree = "<group>"; };
+                3841981410A0C6BA00A18A20 /* NTNaptrCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NTNaptrCell.h; sourceTree = "<group>"; };
+                3841981510A0C6BA00A18A20 /* NTNaptrCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NTNaptrCell.m; sourceTree = "<group>"; };
+                38451056109F4630004302FF /* libidn.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libidn.a; sourceTree = "<group>"; };
                 3849097A0FEA786C00F54327 /* routeme.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = routeme.plist; sourceTree = "<group>"; };
                 38527484100A82E9005F4329 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/Localizable.strings; sourceTree = "<group>"; };
@@ -138 +144 @@
                 38976FB00FE016B5006D2DDE /* WebUrlViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebUrlViewController.m; sourceTree = "<group>"; };
                 38976FB10FE016B5006D2DDE /* WebUrlView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = WebUrlView.xib; sourceTree = "<group>"; };
-                38ACC9F60FB85589001EC74E /* MapView.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = MapView.framework; sourceTree = "<group>"; };
                 38B8B9250FF11173001E59B0 /* SettingsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SettingsViewController.h; sourceTree = "<group>"; };
                 38B8B9260FF11173001E59B0 /* SettingsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SettingsViewController.m; sourceTree = "<group>"; };
                 38B8B9270FF11173001E59B0 /* SettingsView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SettingsView.xib; sourceTree = "<group>"; };
+                38BA1DFC109C90880049D362 /* TelMapAnnotation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TelMapAnnotation.h; sourceTree = "<group>"; };
+                38BA1DFD109C90880049D362 /* TelMapAnnotation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TelMapAnnotation.m; sourceTree = "<group>"; };
+                38BA1E29109C91490049D362 /* MapKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MapKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS3.0.sdk/System/Library/Frameworks/MapKit.framework; sourceTree = DEVELOPER_DIR; };
+                38C3325C109E954500E85FFE /* idna.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = idna.h; sourceTree = "<group>"; };
                 38D1582C0F84C3C800A97E88 /* bg-main.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "bg-main.png"; sourceTree = "<group>"; };
                 38D1582E0F84C3F400A97E88 /* logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logo.png; sourceTree = "<group>"; };
@@ -149 +158 @@
                 38D164CB0F864A1000A97E88 /* Reachability.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Reachability.h; sourceTree = "<group>"; };
                 38D164CC0F864A1000A97E88 /* Reachability.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Reachability.m; sourceTree = "<group>"; };
-                38D166DF0F8658D900A97E88 /* LocTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LocTableViewCell.h; sourceTree = "<group>"; };
-                38D166E00F8658D900A97E88 /* LocTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LocTableViewCell.m; sourceTree = "<group>"; };
                 38DB6B4E0F8B943500C7AE69 /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Icon.png; sourceTree = "<group>"; };
                 38DD04760F7AE8BB000C66F6 /* loading.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loading.png; sourceTree = "<group>"; };
@@ -199 +206 @@
                                 BB2775A40E55EB230007ECB3 /* libobjc.dylib in Frameworks */,
                                 BB2776340E55EC9E0007ECB3 /* SystemConfiguration.framework in Frameworks */,
-                                382650EB0F7CFD4D0065B5B9 /* libsqlite3.dylib in Frameworks */,
                                 3826516A0F7CFFAC0065B5B9 /* QuartzCore.framework in Frameworks */,
-                                38ACC9F70FB85589001EC74E /* MapView.framework in Frameworks */,
                                 3892642910233A060023DE3B /* ldns.framework in Frameworks */,
+                                38BA1E2A109C91490049D362 /* MapKit.framework in Frameworks */,
+                                38451057109F4630004302FF /* libidn.a in Frameworks */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -300 +307 @@
                         children = (
                                 3892642810233A060023DE3B /* ldns.framework */,
-                                38ACC9F60FB85589001EC74E /* MapView.framework */,
+                                38BA1E29109C91490049D362 /* MapKit.framework */,
                                 382651690F7CFFAC0065B5B9 /* QuartzCore.framework */,
-                                382650EA0F7CFD4D0065B5B9 /* libsqlite3.dylib */,
                                 BB2775A30E55EB230007ECB3 /* libobjc.dylib */,
                                 BB2F18030E54FD08009C75BE /* AddressBook.framework */,
@@ -329 +335 @@
                         isa = PBXGroup;
                         children = (
+                                38C3325B109E952B00E85FFE /* IDN Library */,
                                 385BD6C50EBF694500D32EB0 /* Classes */,
                                 388926160F7AD1C500855EF9 /* DotTel.strings */,
@@ -369 +376 @@
                         sourceTree = "<group>";
                 };
+                38C3325B109E952B00E85FFE /* IDN Library */ = {
+                        isa = PBXGroup;
+                        children = (
+                                38451056109F4630004302FF /* libidn.a */,
+                                38C3325C109E954500E85FFE /* idna.h */,
+                        );
+                        name = "IDN Library";
+                        path = ..;
+                        sourceTree = "<group>";
+                };
                 38FEEE3B0F873B3B003FEBAD /* Cells */ = {
                         isa = PBXGroup;
@@ -374 +391 @@
                                 BB2F182B0E5501C8009C75BE /* FriendsTableViewCell.h */,
                                 BB2F182C0E5501C8009C75BE /* FriendsTableViewCell.m */,
-                                38D166DF0F8658D900A97E88 /* LocTableViewCell.h */,
-                                38D166E00F8658D900A97E88 /* LocTableViewCell.m */,
+                                3841974F10A0817D00A18A20 /* NaptrCell.h */,
+                                3841975010A0817D00A18A20 /* NaptrCell.m */,
+                                3841981410A0C6BA00A18A20 /* NTNaptrCell.h */,
+                                3841981510A0C6BA00A18A20 /* NTNaptrCell.m */,
                         );
                         name = Cells;
@@ -411 +430 @@
                                 BB3261D90E64597E0091BF08 /* FriendsMapViewController.h */,
                                 BB3261DA0E64597E0091BF08 /* FriendsMapViewController.m */,
+                                38BA1DFC109C90880049D362 /* TelMapAnnotation.h */,
+                                38BA1DFD109C90880049D362 /* TelMapAnnotation.m */,
                         );
                         name = "All Friends Map View Controller";
@@ -440 +461 @@
                 29B97313FDCFA39411CA2CEA /* Project object */ = {
                         isa = PBXProject;
+                        attributes = {
+                                ORGANIZATIONNAME = "Telnic Limited";
+                        };
                         buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "LocateThem" */;
                         compatibilityVersion = "Xcode 3.1";
@@ -527 +551 @@
                                 38D163260F861E2E00A97E88 /* NetworkUtility.m in Sources */,
                                 38D164CD0F864A1000A97E88 /* Reachability.m in Sources */,
-                                38D166E10F8658D900A97E88 /* LocTableViewCell.m in Sources */,
                                 387680950FC9B3CD00360BD4 /* DotTelABDelegate.m in Sources */,
                                 3876822F0FCD483E00360BD4 /* DotTelABMapper.m in Sources */,
                                 38976FB20FE016B5006D2DDE /* WebUrlViewController.m in Sources */,
                                 38B8B9280FF11173001E59B0 /* SettingsViewController.m in Sources */,
+                                38BA1DFE109C90880049D362 /* TelMapAnnotation.m in Sources */,
+                                3841975110A0817D00A18A20 /* NaptrCell.m in Sources */,
+                                3841981610A0C6BA00A18A20 /* NTNaptrCell.m in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -587 +613 @@
                                 GCC_PREFIX_HEADER = LocateThem_Prefix.pch;
                                 INFOPLIST_FILE = Info.plist;
+                                LIBRARY_SEARCH_PATHS = (
+                                        "$(inherited)",
+                                        "\"$(SRCROOT)\"",
+                                );
                                 PRODUCT_NAME = Superbook;
-                                SDKROOT = iphoneos2.0;
                         };
                         name = Debug;
@@ -604 +633 @@
                                 GCC_PREFIX_HEADER = LocateThem_Prefix.pch;
                                 INFOPLIST_FILE = Info.plist;
+                                LIBRARY_SEARCH_PATHS = (
+                                        "$(inherited)",
+                                        "\"$(SRCROOT)\"",
+                                );
                                 PRODUCT_NAME = Superbook;
-                                SDKROOT = iphoneos2.0;
                         };
                         name = Release;
@@ -612 +644 @@
                         isa = XCBuildConfiguration;
                         buildSettings = {
-                                ARCHS = "$(ARCHS_STANDARD_32_BIT)";
                                 CODE_SIGN_ENTITLEMENTS = Entitlements.plist;
                                 CODE_SIGN_IDENTITY = "iPhone Distribution: Henri Asseily";
@@ -618 +649 @@
                                 GCC_WARN_ABOUT_RETURN_TYPE = YES;
                                 GCC_WARN_UNUSED_VARIABLE = YES;
+                                OTHER_LDFLAGS = "-liconv";
                                 PREBINDING = NO;
                                 PROVISIONING_PROFILE = "BBE4CD7C-3CBD-47E2-8691-8779B872D969";
-                                SDKROOT = iphoneos2.1;
+                                SDKROOT = iphoneos3.0;
                         };
                         name = "Release Apple ad-hoc";
@@ -636 +668 @@
                                 GCC_PREFIX_HEADER = LocateThem_Prefix.pch;
                                 INFOPLIST_FILE = Info.plist;
+                                LIBRARY_SEARCH_PATHS = (
+                                        "$(inherited)",
+                                        "\"$(SRCROOT)\"",
+                                );
                                 PRODUCT_NAME = Superbook;
-                                SDKROOT = iphoneos2.0;
                         };
                         name = "Release Apple ad-hoc";
@@ -644 +679 @@
                         isa = XCBuildConfiguration;
                         buildSettings = {
-                                ARCHS = "$(ARCHS_STANDARD_32_BIT)";
                                 CODE_SIGN_IDENTITY = "iPhone Distribution: Henri Asseily";
                                 GCC_C_LANGUAGE_STANDARD = c99;
                                 GCC_WARN_ABOUT_RETURN_TYPE = YES;
                                 GCC_WARN_UNUSED_VARIABLE = YES;
+                                OTHER_LDFLAGS = "-liconv";
                                 PREBINDING = NO;
                                 PROVISIONING_PROFILE = "DC881623-4681-45BB-B714-179F016CBFD9";
-                                SDKROOT = iphoneos2.1;
+                                SDKROOT = iphoneos3.0;
                         };
                         name = Distribution;
@@ -667 +702 @@
                                 GCC_PREFIX_HEADER = LocateThem_Prefix.pch;
                                 INFOPLIST_FILE = Info.plist;
+                                LIBRARY_SEARCH_PATHS = (
+                                        "$(inherited)",
+                                        "\"$(SRCROOT)\"",
+                                );
                                 PRODUCT_NAME = Superbook;
-                                SDKROOT = iphoneos2.0;
                         };
                         name = Distribution;
@@ -675 +713 @@
                         isa = XCBuildConfiguration;
                         buildSettings = {
-                                ARCHS = "$(ARCHS_STANDARD_32_BIT)";
                                 CODE_SIGN_IDENTITY = "iPhone Developer: Henri Asseily";
                                 GCC_C_LANGUAGE_STANDARD = c99;
@@ -681 +718 @@
                                 GCC_WARN_UNUSED_VARIABLE = YES;
                                 ONLY_ACTIVE_ARCH = YES;
+                                OTHER_LDFLAGS = "-liconv";
                                 PREBINDING = NO;
                                 PROVISIONING_PROFILE = "03F769C8-6A46-4229-9D24-C0B2E38DDE7C";
-                                SDKROOT = iphoneos2.1;
+                                SDKROOT = iphoneos3.0;
                         };
                         name = Debug;
@@ -690 +728 @@
                         isa = XCBuildConfiguration;
                         buildSettings = {
-                                ARCHS = "$(ARCHS_STANDARD_32_BIT)";
                                 CODE_SIGN_IDENTITY = "iPhone Developer: Henri Asseily";
                                 GCC_C_LANGUAGE_STANDARD = c99;
                                 GCC_WARN_ABOUT_RETURN_TYPE = YES;
                                 GCC_WARN_UNUSED_VARIABLE = YES;
+                                OTHER_LDFLAGS = "-liconv";
                                 PREBINDING = NO;
                                 PROVISIONING_PROFILE = "447EE44B-840F-4966-BF8B-8DE8B2B74D91";
-                                SDKROOT = iphoneos2.1;
+                                SDKROOT = iphoneos3.0;
                         };
                         name = Release;

apps/iphone/superbook/trunk/Russian.lproj/About.html

@@ -8 +8 @@
 
 <body  style="font-family: verdana; font-size: small;">
-<p align="right">Version 1.3 by Henri Asseily, <a href="http://henri.tel">henri.tel</a><br />
+<p align="right">Version 1.4 by Henri Asseily, <a href="http://henri.tel">henri.tel</a><br />
 Copyright 2009 Telnic Ltd., <a href="http://dev.telnic.org/pages/legal.html">License Agreement</a><br />
 Report issues in the <a href="http://dev.telnic.org/trac/discussion">.tel Community Forum</a></p>
@@ -30 +30 @@
 </ul>
 <p>Henri Asseily, Beirut, Lebanon, June 2009.</p>
+<p>Updated November 2009</p>
 </body>
 </html>

apps/iphone/superbook/trunk/Russian.lproj/Localizable.strings

@@ -121 +121 @@
 "UpdateExisting" = "Обновить %@";
 
+/* Create a new contact */
+"CreateNewContact" = "Сохранить в новый контакт";
+