From c1162c76d3e7d437a56506a13656afc7370da396 Mon Sep 17 00:00:00 2001 From: Maarten Billemont Date: Sat, 9 Nov 2013 20:18:36 -0500 Subject: [PATCH] LoveLyndir & USM fixes. [IMPROVED] Sped up emergency display. [UPDATED] LoveLyndir and USM bump for fixes. --- External/LoveLyndir | 2 +- External/Pearl | 2 +- External/UbiquityStoreManager | 2 +- MasterPassword/ObjC/iOS/MPUnlockViewController.m | 9 ++------- .../iOS/MasterPassword-iOS.xcodeproj/project.pbxproj | 6 ------ 5 files changed, 5 insertions(+), 16 deletions(-) diff --git a/External/LoveLyndir b/External/LoveLyndir index 60b6e8fe..c2c0d1e4 160000 --- a/External/LoveLyndir +++ b/External/LoveLyndir @@ -1 +1 @@ -Subproject commit 60b6e8fef77d96b1d47110c55e79776703c9dde2 +Subproject commit c2c0d1e45adfcea88c95dfe8f5793654508d9fb2 diff --git a/External/Pearl b/External/Pearl index 7f176902..04d8ca58 160000 --- a/External/Pearl +++ b/External/Pearl @@ -1 +1 @@ -Subproject commit 7f176902dc2aba84ce607c0ada42b28645d4f436 +Subproject commit 04d8ca58b5f01c985b7d32dfb2248328d1ca0130 diff --git a/External/UbiquityStoreManager b/External/UbiquityStoreManager index 805459de..fbf5309d 160000 --- a/External/UbiquityStoreManager +++ b/External/UbiquityStoreManager @@ -1 +1 @@ -Subproject commit 805459de9352f74b001811a865ade7a28bd40742 +Subproject commit fbf5309ddcace2d8cb364e795a6ed4847944e54e diff --git a/MasterPassword/ObjC/iOS/MPUnlockViewController.m b/MasterPassword/ObjC/iOS/MPUnlockViewController.m index f12ff28d..0cb909ee 100644 --- a/MasterPassword/ObjC/iOS/MPUnlockViewController.m +++ b/MasterPassword/ObjC/iOS/MPUnlockViewController.m @@ -964,16 +964,11 @@ [UIView animateWithDuration:0.2 animations:^{ self.emergencyGeneratorContainer.frame = CGRectSetX( self.emergencyGeneratorContainer.frame, - self.emergencyGeneratorContainer.frame.origin.x + 150 ); + self.emergencyGeneratorContainer.frame.origin.x + 100 ); self.emergencyGeneratorContainer.alpha = 1; } completion:^(BOOL finished) { - if (finished) { + if (finished) [self emergencyOpenAnimated:NO]; - [UIView animateWithDuration:0.2 animations:^{ - self.emergencyGeneratorContainer.frame = CGRectSetX( self.emergencyGeneratorContainer.frame, - self.emergencyGeneratorContainer.frame.origin.x - 50 ); - }]; - } }]; return; } diff --git a/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj b/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj index b92e8a9a..c577f9b9 100644 --- a/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj +++ b/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj @@ -20,7 +20,6 @@ 93D399BBC0A7EC746CB1B19B /* MPLogsViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 93D391943675426839501BB8 /* MPLogsViewController.h */; }; 93D39C34FE35830EF5BE1D2A /* NSArray+Indexing.h in Headers */ = {isa = PBXBuildFile; fileRef = 93D396D04E57792A54D437AC /* NSArray+Indexing.h */; }; 93D39C8AD8EAB747856B3A8C /* LLModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D3923B42DA2DA18F287092 /* LLModel.m */; }; - 93D39CFC8520AD406FFF72D7 /* LLAboutViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D39696C9572BEE830F2EAB /* LLAboutViewController.m */; }; 93D39E281E3658B30550CB55 /* NSDictionary+Indexing.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D39AA1EE2E1E7B81372240 /* NSDictionary+Indexing.m */; }; 93D39F8A9254177891F38705 /* MPSetupViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D39A28369954D147E239BA /* MPSetupViewController.m */; }; DA04E33E14B1E70400ECA4F3 /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA04E33D14B1E70400ECA4F3 /* MobileCoreServices.framework */; }; @@ -419,8 +418,6 @@ 93D394077F8FAB8167647187 /* Twitter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Twitter.framework; path = System/Library/Frameworks/Twitter.framework; sourceTree = SDKROOT; }; 93D3942A356B639724157982 /* PearlOverlay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PearlOverlay.h; sourceTree = ""; }; 93D3956915634581E737B38C /* PearlNavigationController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PearlNavigationController.m; sourceTree = ""; }; - 93D395B53B7175D22034BBEF /* LLAboutViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LLAboutViewController.h; sourceTree = ""; }; - 93D39696C9572BEE830F2EAB /* LLAboutViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LLAboutViewController.m; sourceTree = ""; }; 93D396D04E57792A54D437AC /* NSArray+Indexing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSArray+Indexing.h"; sourceTree = ""; }; 93D39730673227EFF6DEFF19 /* MPSetupViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPSetupViewController.h; sourceTree = ""; }; 93D3979190DACEBD1F6AE9F4 /* MPLogsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPLogsViewController.m; sourceTree = ""; }; @@ -2527,8 +2524,6 @@ 93D3983278751A530262F64E /* LLConfig.h */, 93D39BF6BCBDFFE844E7D34C /* LLButtonView.m */, 93D39BA6C5CB452973918B7D /* LLButtonView.h */, - 93D39696C9572BEE830F2EAB /* LLAboutViewController.m */, - 93D395B53B7175D22034BBEF /* LLAboutViewController.h */, ); path = ObjC; sourceTree = ""; @@ -3556,7 +3551,6 @@ DADEF4471810D5850052CA3E /* LLToggleViewController.m in Sources */, 93D39C8AD8EAB747856B3A8C /* LLModel.m in Sources */, 93D39233C3EDD9A947ABA52D /* LLButtonView.m in Sources */, - 93D39CFC8520AD406FFF72D7 /* LLAboutViewController.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; };