Merge branch 'bugfix-13639' into release-6.6.4

livecodemichael · livecodemichael · commit e7d3cdf21187 · 2014-10-13T14:37:46.000+01:00
diff --git a/docs/notes/bugfix-13639.md b/docs/notes/bugfix-13639.md
@@ -0,0 +1 @@
+#     mobilepickcontact works under ios 7 but not under ios 8
diff --git a/engine/src/mbliphonecontact.mm b/engine/src/mbliphonecontact.mm
@@ -695,7 +695,12 @@ -(void)doShowPickContact
 		// Show the picker
 		m_running = true;
 		
-		[MCIPhoneGetViewController() presentModalViewController:m_pick_contact animated:YES];
+        if (MCmajorosversion >= 500)
+        {
+            [MCIPhoneGetViewController() presentViewController:m_pick_contact animated:YES completion:nil];
+        }
+        else
+            [MCIPhoneGetViewController() presentModalViewController:m_pick_contact animated:YES];
 	}
 }
 
@@ -706,7 +711,9 @@ -(bool)showPickContact: (int32_t&) r_chosen
     while (m_running)
 		MCscreen -> wait(1.0, False, True);
 	
-	[self dismissController];
+    // PM-2014-10-10: [[ Bug 13639 ]] On iOS 8, the ABPeoplePickerNavigationController is dismissed in peoplePickerNavigationController:didSelectPerson. If [self dismissController] is called, then the completion block of dismissViewControllerAnimated:completion:^(){} in doDismissController is never called. So m_finish never becomes true and the app freezes
+    if (MCmajorosversion < 800)
+        [self dismissController];
 	
     // Return the result
     if (m_selected_person == kABRecordInvalidID)
@@ -717,6 +724,25 @@ -(bool)showPickContact: (int32_t&) r_chosen
 	return m_success;
 }
 
+// PM-2014-10-10: [[ Bug 13639 ]] In iOS 8, this is the replacement for peoplePickerNavigationController:shouldContinueAfterSelectingPerson
+// Called after a person has been selected by the user. It seems that it is also dismissing the ABPeoplePickerNavigationController (m_pick_contact), so we should not call [self dismissController] in showPickContact.
+- (void)peoplePickerNavigationController:(ABPeoplePickerNavigationController*)peoplePicker didSelectPerson:(ABRecordRef)person;
+{
+    if (person != NULL)
+        m_selected_person = ABRecordGetRecordID(person);
+    m_running = false;
+    return;
+}
+
+
+- (void)peoplePickerNavigationController:(ABPeoplePickerNavigationController *)peoplePicker didSelectPerson:(ABRecordRef)person property:(ABPropertyID)property identifier:(ABMultiValueIdentifier)identifier
+{
+    if (person != NULL)
+        m_selected_person = ABRecordGetRecordID(person);
+    m_running = false;
+    return;
+}
+
 - (BOOL)peoplePickerNavigationController:(ABPeoplePickerNavigationController *)peoplePicker shouldContinueAfterSelectingPerson:(ABRecordRef)person
 {
     if (person != NULL)
@@ -1134,7 +1160,21 @@ bool MCSystemGetContactData(MCExecContext &r_ctxt, int32_t p_contact_id, MCVaria
 	bool t_success = true;
 	
     ABAddressBookRef t_address_book = nil;
-	t_success = nil != (t_address_book = ABAddressBookCreate());
+    
+    // PM-2014-10-08: [[ Bug 13621 ]] ABAddressBookCreate is deprecated in iOS 6. Use ABAddressBookCreateWithOptions instead
+    if (MCmajorosversion < 600)
+    {
+        // Fetch the address book
+        t_address_book = ABAddressBookCreate();
+    }
+    else
+    {
+        // The ABAddressBookRef created with ABAddressBookCreateWithOptions will initially not have access to contact data. The app must then call ABAddressBookRequestAccessWithCompletion to request this access.
+        t_address_book = ABAddressBookCreateWithOptions(NULL, NULL);
+        requestAuthorization(t_address_book);
+    }
+
+	t_success = (nil != t_address_book);
 	
     ABRecordRef t_person = nil;
 	if (t_success)

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# mobilepickcontact works under ios 7 but not under ios 8`