You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by sh...@apache.org on 2014/09/15 01:16:06 UTC

git commit: CB-6374 - Fix iOS 6 deprecation warnings in Contacts

Repository: cordova-plugin-contacts
Updated Branches:
  refs/heads/master da4962413 -> d395664b0


CB-6374 - Fix iOS 6 deprecation warnings in Contacts


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-contacts/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-contacts/commit/d395664b
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-contacts/tree/d395664b
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-contacts/diff/d395664b

Branch: refs/heads/master
Commit: d395664b0c84726efc2a881b57c27904095909b5
Parents: da49624
Author: Shazron Abdullah <sh...@apache.org>
Authored: Sun Sep 14 16:15:59 2014 -0700
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Sun Sep 14 16:15:59 2014 -0700

----------------------------------------------------------------------
 src/ios/CDVContact.m | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-contacts/blob/d395664b/src/ios/CDVContact.m
----------------------------------------------------------------------
diff --git a/src/ios/CDVContact.m b/src/ios/CDVContact.m
index 58a6310..54efd86 100644
--- a/src/ios/CDVContact.m
+++ b/src/ios/CDVContact.m
@@ -544,7 +544,7 @@ static NSDictionary* org_apache_cordova_contacts_defaultFields = nil;
             if (!addrType) {
                 addrType = (NSString*)kABOtherLabel;
             }
-            NSObject* typeValue = ((prop == kABPersonInstantMessageProperty) ? (NSObject*)kABOtherLabel : addrType);
+            NSObject* typeValue = ((prop == kABPersonInstantMessageProperty) ? (NSString*)kABOtherLabel : addrType);
             // NSLog(@"typeValue: %@", typeValue);
             [addDict setObject:typeValue forKey:kW3ContactFieldType];    //  im labels will be set as Other and address labels as type from dictionary
             [addDict setObject:newDict forKey:kW3ContactFieldValue];
@@ -682,7 +682,7 @@ static NSDictionary* org_apache_cordova_contacts_defaultFields = nil;
                     if (dict) {
                         NSMutableDictionary* addDict = [NSMutableDictionary dictionaryWithCapacity:2];
                         // get the type out of the original dictionary for address
-                        NSObject* typeValue = ((prop == kABPersonInstantMessageProperty) ? (NSObject*)kABOtherLabel : (NSString*)[field valueForKey:kW3ContactFieldType]);
+                        NSObject* typeValue = ((prop == kABPersonInstantMessageProperty) ? (NSString*)kABOtherLabel : (NSString*)[field valueForKey:kW3ContactFieldType]);
                         // NSLog(@"typeValue: %@", typeValue);
                         [addDict setObject:typeValue forKey:kW3ContactFieldType];        //  im labels will be set as Other and address labels as type from dictionary
                         [addDict setObject:dict forKey:kW3ContactFieldValue];