From 6da15306b0d4892d843f3cb886ddf5354a0a7c51 Mon Sep 17 00:00:00 2001 From: Maarten Billemont Date: Wed, 19 Sep 2012 23:29:21 +0200 Subject: [PATCH] Work-around for iOS 6 bug. [FIXED] iOS 6 SDK seems to crash on iOS 5 devices when doing scrollEnabled. --- MasterPassword/iOS/MPAppDelegate.m | 2 +- MasterPassword/iOS/MPUnlockViewController.m | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/MasterPassword/iOS/MPAppDelegate.m b/MasterPassword/iOS/MPAppDelegate.m index c50b212b..0dccc856 100644 --- a/MasterPassword/iOS/MPAppDelegate.m +++ b/MasterPassword/iOS/MPAppDelegate.m @@ -54,7 +54,7 @@ [[[NSBundle mainBundle] mutableInfoDictionary] setObject:@"Master Password" forKey:@"CFBundleDisplayName"]; [[[NSBundle mainBundle] mutableLocalizedInfoDictionary] setObject:@"Master Password" forKey:@"CFBundleDisplayName"]; -#ifdef ADHOC +#ifdef TESTFLIGHT_SDK_VERSION @try { NSString *testFlightToken = [self testFlightToken]; if ([testFlightToken length]) { diff --git a/MasterPassword/iOS/MPUnlockViewController.m b/MasterPassword/iOS/MPUnlockViewController.m index 70aea4aa..082fd361 100644 --- a/MasterPassword/iOS/MPUnlockViewController.m +++ b/MasterPassword/iOS/MPUnlockViewController.m @@ -426,7 +426,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 +437,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;