Added label guard for nil values courtesy of Chris Ozenne

This commit is contained in:
Erica Sadun
2013-03-08 11:34:17 -07:00
parent d16b186ad8
commit 9cebfe2ba6
15 changed files with 35 additions and 13 deletions

Binary file not shown.

View File

@@ -433,7 +433,10 @@
for (int i = 0; i < ABMultiValueGetCount(theProperty); i++)
{
NSString *label = (__bridge_transfer NSString *)ABMultiValueCopyLabelAtIndex(theProperty, i);
[labels addObject:label];
if (label)
[labels addObject:label];
else
[labels addObject:@""];
}
CFRelease(theProperty);
return labels;

Binary file not shown.

View File

@@ -428,17 +428,21 @@
{
CFTypeRef theProperty = ABRecordCopyValue(_record, anID);
if (!theProperty) return nil;
NSMutableArray *labels = [NSMutableArray array];
for (int i = 0; i < ABMultiValueGetCount(theProperty); i++)
{
NSString *label = (__bridge_transfer NSString *)ABMultiValueCopyLabelAtIndex(theProperty, i);
[labels addObject:label];
if (label)
[labels addObject:label];
else
[labels addObject:@""];
}
CFRelease(theProperty);
return labels;
}
- (NSArray *) emailArray {return [self arrayForProperty:kABPersonEmailProperty];}
- (NSArray *) emailLabels {return [self labelsForProperty:kABPersonEmailProperty];}

Binary file not shown.

View File

@@ -428,12 +428,15 @@
{
CFTypeRef theProperty = ABRecordCopyValue(_record, anID);
if (!theProperty) return nil;
NSMutableArray *labels = [NSMutableArray array];
for (int i = 0; i < ABMultiValueGetCount(theProperty); i++)
{
NSString *label = (__bridge_transfer NSString *)ABMultiValueCopyLabelAtIndex(theProperty, i);
[labels addObject:label];
if (label)
[labels addObject:label];
else
[labels addObject:@""];
}
CFRelease(theProperty);
return labels;

Binary file not shown.

View File

@@ -428,12 +428,15 @@
{
CFTypeRef theProperty = ABRecordCopyValue(_record, anID);
if (!theProperty) return nil;
NSMutableArray *labels = [NSMutableArray array];
for (int i = 0; i < ABMultiValueGetCount(theProperty); i++)
{
NSString *label = (__bridge_transfer NSString *)ABMultiValueCopyLabelAtIndex(theProperty, i);
[labels addObject:label];
if (label)
[labels addObject:label];
else
[labels addObject:@""];
}
CFRelease(theProperty);
return labels;

Binary file not shown.

View File

@@ -428,12 +428,15 @@
{
CFTypeRef theProperty = ABRecordCopyValue(_record, anID);
if (!theProperty) return nil;
NSMutableArray *labels = [NSMutableArray array];
for (int i = 0; i < ABMultiValueGetCount(theProperty); i++)
{
NSString *label = (__bridge_transfer NSString *)ABMultiValueCopyLabelAtIndex(theProperty, i);
[labels addObject:label];
if (label)
[labels addObject:label];
else
[labels addObject:@""];
}
CFRelease(theProperty);
return labels;

Binary file not shown.

View File

@@ -428,12 +428,15 @@
{
CFTypeRef theProperty = ABRecordCopyValue(_record, anID);
if (!theProperty) return nil;
NSMutableArray *labels = [NSMutableArray array];
for (int i = 0; i < ABMultiValueGetCount(theProperty); i++)
{
NSString *label = (__bridge_transfer NSString *)ABMultiValueCopyLabelAtIndex(theProperty, i);
[labels addObject:label];
if (label)
[labels addObject:label];
else
[labels addObject:@""];
}
CFRelease(theProperty);
return labels;

Binary file not shown.

View File

@@ -428,12 +428,15 @@
{
CFTypeRef theProperty = ABRecordCopyValue(_record, anID);
if (!theProperty) return nil;
NSMutableArray *labels = [NSMutableArray array];
for (int i = 0; i < ABMultiValueGetCount(theProperty); i++)
{
NSString *label = (__bridge_transfer NSString *)ABMultiValueCopyLabelAtIndex(theProperty, i);
[labels addObject:label];
if (label)
[labels addObject:label];
else
[labels addObject:@""];
}
CFRelease(theProperty);
return labels;