From c9988d8cc2b8c9936200d1710b54d5b15e116945 Mon Sep 17 00:00:00 2001 From: Maarten Billemont Date: Tue, 2 Sep 2014 21:40:53 -0400 Subject: [PATCH] Fix for showing setup VC on landscape iPad + old -> new section objects crash. --- External/Pearl | 2 +- MasterPassword/ObjC/iOS/MPPasswordsViewController.m | 7 +++++-- .../ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj | 6 +++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/External/Pearl b/External/Pearl index c627df26..58b820f8 160000 --- a/External/Pearl +++ b/External/Pearl @@ -1 +1 @@ -Subproject commit c627df26355c02ee22fabdff2ff132d01b63d105 +Subproject commit 58b820f8d54a796aa79c3d130231c5e764c33c6d diff --git a/MasterPassword/ObjC/iOS/MPPasswordsViewController.m b/MasterPassword/ObjC/iOS/MPPasswordsViewController.m index 4751c9e4..fb776cee 100644 --- a/MasterPassword/ObjC/iOS/MPPasswordsViewController.m +++ b/MasterPassword/ObjC/iOS/MPPasswordsViewController.m @@ -370,7 +370,10 @@ referenceSizeForHeaderInSection:(NSInteger)section { } [self.fetchedResultsController.managedObjectContext performBlock:^{ - NSArray *oldSections = [self.fetchedResultsController sections]; + NSArray *oldSectionInfos = [self.fetchedResultsController sections]; + NSMutableArray *oldSections = [[NSMutableArray alloc] initWithCapacity:[oldSectionInfos count]]; + for (id sectionInfo in oldSectionInfos) + [oldSections addObject:[sectionInfo.objects copy]]; NSError *error = nil; self.fetchedResultsController.fetchRequest.predicate = @@ -391,7 +394,7 @@ referenceSizeForHeaderInSection:(NSInteger)section { else if (section >= toSections) [self.passwordCollectionView deleteSections:[NSIndexSet indexSetWithIndex:section]]; else - [self.passwordCollectionView reloadItemsFromArray:[oldSections[section] objects] + [self.passwordCollectionView reloadItemsFromArray:oldSections[section] toArray:[[self.fetchedResultsController sections][section] objects] inSection:section]; } diff --git a/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj b/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj index febc1803..ce68ff96 100644 --- a/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj +++ b/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj @@ -3564,7 +3564,7 @@ Reveal, ); PROVISIONING_PROFILE = ""; - "PROVISIONING_PROFILE[sdk=iphoneos*]" = "94333D7F-68F7-473D-B3B1-86AA41F33449"; + "PROVISIONING_PROFILE[sdk=iphoneos*]" = "78fbee53-abe7-4a47-b917-c223df3a6952"; SKIP_INSTALL = NO; TARGETED_DEVICE_FAMILY = 1; }; @@ -3592,7 +3592,7 @@ "/Users/lhunath/Documents/workspace/lyndir/MasterPassword/External/Pearl/Pearl-Crypto/lib", ); PROVISIONING_PROFILE = ""; - "PROVISIONING_PROFILE[sdk=iphoneos*]" = "923E2981-1F88-4F05-9408-9EC085C53225"; + "PROVISIONING_PROFILE[sdk=iphoneos*]" = "7142c408-252a-43c0-94c6-1ae1f43173f4"; SKIP_INSTALL = NO; STRIP_INSTALLED_PRODUCT = YES; TARGETED_DEVICE_FAMILY = 1; @@ -3701,7 +3701,7 @@ "/Users/lhunath/Documents/workspace/lyndir/MasterPassword/External/Pearl/Pearl-Crypto/lib", ); PROVISIONING_PROFILE = ""; - "PROVISIONING_PROFILE[sdk=iphoneos*]" = "36641E9D-D5E0-4E80-94F4-B2CF898CFE10"; + "PROVISIONING_PROFILE[sdk=iphoneos*]" = "48f9bae8-b80e-41c7-8792-663102bed54f"; SKIP_INSTALL = NO; STRIP_INSTALLED_PRODUCT = YES; TARGETED_DEVICE_FAMILY = 1;