Merge pull request #7465 from cheekiatng/timob-20010-5_1_X

[TIMOB-20010](5_1_X) iOS9: FIX remove contacts causing app to crash
tidev · Nov 18, 2015 · 8429320 · 8429320
2 parents 50375ae + c9b64b4
commit 8429320
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/apidoc/Titanium/Contacts/Group.yml b/apidoc/Titanium/Contacts/Group.yml
@@ -9,7 +9,9 @@ platforms: [iphone, ipad]
 
 methods:
   - name: add
-    summary: Adds a person to this group.
+    summary: |
+        Adds a person to this group. For >= iOS9, it is not required to
+        call <Titanium.Contacts.save> after calling this method.
     parameters:
       - name: person
         summary: Person to add.
@@ -22,7 +24,9 @@ methods:
     platforms: [android, iphone, ipad]
 
   - name: remove
-    summary: Removes a person from this group.
+    summary: |
+        Removes a person from this group. For >= iOS9, it is not
+        required to call <Titanium.Contacts.save> after calling this method.
     parameters:
       - name: person
         summary: Person to remove.

diff --git a/iphone/Classes/TiContactsGroup.m b/iphone/Classes/TiContactsGroup.m
@@ -278,6 +278,7 @@ -(void)add:(id)arg
 					   subreason:nil
 						location:CODELOCATION];
 		};
+		RELEASE_TO_NIL(saveRequest)
 		return;
 	}
 #endif
@@ -315,6 +316,7 @@ -(void)remove:(id)arg
 					   subreason:nil
 						location:CODELOCATION];
 		};
+		RELEASE_TO_NIL(saveRequest)
 		return;
 	}
 #endif
@@ -333,13 +335,13 @@ -(void)remove:(id)arg
 //For iOS9 deleting contact
 -(CNSaveRequest*)getSaveRequestForDeletion
 {
-	CNSaveRequest *saveRequest = [[[CNSaveRequest alloc] init] autorelease];
+	CNSaveRequest *saveRequest = [[CNSaveRequest alloc] init];
 	[saveRequest deleteGroup:(CNMutableGroup*)group];
 	return saveRequest;
 }
 -(CNSaveRequest*)getSaveRequestForAddition: (NSString*)containerIdentifier
 {
-	CNSaveRequest *saveRequest = [[[CNSaveRequest alloc] init] autorelease];
+	CNSaveRequest *saveRequest = [[CNSaveRequest alloc] init];
 	[saveRequest addGroup:group toContainerWithIdentifier:containerIdentifier];
 	return saveRequest;
 }

diff --git a/iphone/Classes/TiContactsPerson.m b/iphone/Classes/TiContactsPerson.m
@@ -923,27 +923,27 @@ -(void)setValue:(id)value forUndefinedKey:(NSString*)key
 //For iOS9 deleting contact
 -(CNSaveRequest*)getSaveRequestForDeletion
 {
-	CNSaveRequest *saveRequest = [[[CNSaveRequest alloc] init] autorelease];
+	CNSaveRequest *saveRequest = [[CNSaveRequest alloc] init];
 	[saveRequest deleteContact:person];
 	return saveRequest;
 }
 
 -(CNSaveRequest*)getSaveRequestForAddition: (NSString*)containerIdentifier
 {
-	CNSaveRequest *saveRequest = [[[CNSaveRequest alloc] init] autorelease];
+	CNSaveRequest *saveRequest = [[CNSaveRequest alloc] init];
 	[saveRequest addContact:person toContainerWithIdentifier:containerIdentifier];
 	return saveRequest;
 }
 
 -(CNSaveRequest*)getSaveRequestForAddToGroup: (CNMutableGroup*) group
 {
-	CNSaveRequest *saveRequest = [[[CNSaveRequest alloc] init] autorelease];
+	CNSaveRequest *saveRequest = [[CNSaveRequest alloc] init];
 	[saveRequest addMember:person toGroup:group];
 	return saveRequest;
 }
 -(CNSaveRequest*)getSaveRequestForRemoveFromGroup: (CNMutableGroup*) group
 {
-	CNSaveRequest *saveRequest = [[[CNSaveRequest alloc] init] autorelease];
+	CNSaveRequest *saveRequest = [[CNSaveRequest alloc] init];
 	[saveRequest removeMember:person fromGroup:group];
 	return saveRequest;
 }