From 850978cbe3c8a29dbeffd9b58806e1207ca68f9d Mon Sep 17 00:00:00 2001 From: Maarten Billemont Date: Fri, 21 Sep 2012 16:45:57 +0200 Subject: [PATCH] Fixed bug with scroll view in iOS5. [FIXED] On iOS5, the app crashed because gesture recognizers of a scrollview were being replaced. Now properly adding the desired gesture recognizer to the scroll view preserving the existing gesture recognizers. --- MasterPassword-iOS.xcodeproj/project.pbxproj | 2 +- .../MasterPassword 3.xcdatamodel/contents | 2 +- MasterPassword/iOS/MPUnlockViewController.m | 5 +- .../iOS/MainStoryboard_iPhone.storyboard | 133 ------------------ 4 files changed, 5 insertions(+), 137 deletions(-) diff --git a/MasterPassword-iOS.xcodeproj/project.pbxproj b/MasterPassword-iOS.xcodeproj/project.pbxproj index e5a4c123..c6c3bc7d 100644 --- a/MasterPassword-iOS.xcodeproj/project.pbxproj +++ b/MasterPassword-iOS.xcodeproj/project.pbxproj @@ -5310,7 +5310,7 @@ "\"$(SRCROOT)/External/Pearl/Pearl-Crypto\"", "\"$(SRCROOT)/External/google-plus-ios-sdk/lib\"", ); - "PROVISIONING_PROFILE[sdk=iphoneos*]" = "E0621374-3E4C-483D-A3F3-46D151712A4F"; + "PROVISIONING_PROFILE[sdk=iphoneos*]" = "DC0CD5E6-3ADC-40FF-8A6D-02BA6D8F5039"; SKIP_INSTALL = NO; TARGETED_DEVICE_FAMILY = 1; }; diff --git a/MasterPassword/MasterPassword.xcdatamodeld/MasterPassword 3.xcdatamodel/contents b/MasterPassword/MasterPassword.xcdatamodeld/MasterPassword 3.xcdatamodel/contents index 11352318..65ff4fca 100644 --- a/MasterPassword/MasterPassword.xcdatamodeld/MasterPassword 3.xcdatamodel/contents +++ b/MasterPassword/MasterPassword.xcdatamodeld/MasterPassword 3.xcdatamodel/contents @@ -3,7 +3,7 @@ - + diff --git a/MasterPassword/iOS/MPUnlockViewController.m b/MasterPassword/iOS/MPUnlockViewController.m index 9e8deaf3..57de935a 100644 --- a/MasterPassword/iOS/MPUnlockViewController.m +++ b/MasterPassword/iOS/MPUnlockViewController.m @@ -139,6 +139,7 @@ self.fbOperationQueue = [NSOperationQueue new]; [self.fbOperationQueue setSuspended:YES]; + [self.avatarsView addGestureRecognizer:self.targetedUserActionGesture]; self.avatarsView.decelerationRate = UIScrollViewDecelerationRateFast; self.avatarsView.clipsToBounds = NO; self.nameLabel.layer.cornerRadius = 5; @@ -426,7 +427,7 @@ // User was just selected. self.passwordView.alpha = 1; self.avatarsView.center = CGPointMake(160, 180); - //self.avatarsView.scrollEnabled = NO; + self.avatarsView.scrollEnabled = NO; self.nameLabel.center = CGPointMake(160, 94); self.nameLabel.backgroundColor = [UIColor blackColor]; self.oldNameLabel.center = self.nameLabel.center; @@ -437,7 +438,7 @@ self.passwordField.text = nil; self.passwordView.alpha = 0; self.avatarsView.center = CGPointMake(160, 310); - //self.avatarsView.scrollEnabled = YES; + self.avatarsView.scrollEnabled = YES; self.nameLabel.center = CGPointMake(160, 296); self.nameLabel.backgroundColor = [UIColor clearColor]; self.oldNameLabel.center = self.nameLabel.center; diff --git a/MasterPassword/iOS/MainStoryboard_iPhone.storyboard b/MasterPassword/iOS/MainStoryboard_iPhone.storyboard index 4bfef513..dfc53104 100644 --- a/MasterPassword/iOS/MainStoryboard_iPhone.storyboard +++ b/MasterPassword/iOS/MainStoryboard_iPhone.storyboard @@ -1417,7 +1417,6 @@ Pink fluffy door frame. -