diff --git a/External/UbiquityStoreManager b/External/UbiquityStoreManager
index b2ad0ef8..51bcfb69 160000
--- a/External/UbiquityStoreManager
+++ b/External/UbiquityStoreManager
@@ -1 +1 @@
-Subproject commit b2ad0ef886ff6700ef6f7371cabe35e10e73cd6c
+Subproject commit 51bcfb691ed906fcbbec4e020234fdbef21a2288
diff --git a/MasterPassword.xcworkspace/xcshareddata/MasterPassword.xccheckout b/MasterPassword.xcworkspace/xcshareddata/MasterPassword.xccheckout
index 92d2d2e0..ddc1b72d 100644
--- a/MasterPassword.xcworkspace/xcshareddata/MasterPassword.xccheckout
+++ b/MasterPassword.xcworkspace/xcshareddata/MasterPassword.xccheckout
@@ -5,17 +5,15 @@
IDESourceControlProjectFavoriteDictionaryKey
IDESourceControlProjectIdentifier
- CE2CFE46-2421-46AB-8B34-0FD2B03C1222
+ D4AB9F0C-D746-4319-AABF-B24705099AED
IDESourceControlProjectName
MasterPassword
IDESourceControlProjectOriginsDictionary
- 35C761A6-90CF-4EF5-93DA-E38ECBAD949A
- https://github.com/domesticcatsoftware/DCIntrospect.git
+ 2B6DA448-3730-4F84-B2C3-51272E0D42F3
+ ssh://github.com/lhunath/DCIntrospect.git
5263993D-5FE8-464F-B66E-B0F7C2DFF410
ssh://github.com/lhunath/UbiquityStoreManager.git
- 56D4C2AF-681C-406B-A5EA-C7FC4FA88907
- git://github.com/futuretap/InAppSettingsKit.git
6A449EC2-A2A3-4635-9C5F-A811E011EAC3
ssh://github.com/Lyndir/MasterPassword.git
ADA0D7F9-4871-4128-8FEE-FD1021EEF3AC
@@ -24,6 +22,8 @@
git://github.com/lhunath/uicolor-utilities.git
B0F634DD-AEE1-4F0D-AE35-4FAF51AD1B5A
git://github.com/lhunath/RHStatusItemView.git
+ CBA93B91-B799-4CC6-85B6-749792B76DD4
+ ssh://github.com/lhunath/InAppSettingsKit.git
E4C8E206-229C-4DA8-A130-0C544DEC7E07
git://github.com/jonmarimba/jrswizzle.git
FF42A9E0-F41C-42FC-88CD-F2CCDE15DBB6
@@ -33,12 +33,10 @@
MasterPassword.xcworkspace
IDESourceControlProjectRelativeInstallPathDictionary
- 35C761A6-90CF-4EF5-93DA-E38ECBAD949A
+ 2B6DA448-3730-4F84-B2C3-51272E0D42F3
../External/DCIntrospect
5263993D-5FE8-464F-B66E-B0F7C2DFF410
../External/UbiquityStoreManager
- 56D4C2AF-681C-406B-A5EA-C7FC4FA88907
- ../External/InAppSettingsKit
6A449EC2-A2A3-4635-9C5F-A811E011EAC3
..
ADA0D7F9-4871-4128-8FEE-FD1021EEF3AC
@@ -47,6 +45,8 @@
../External/Pearl/External/uicolor-utilities
B0F634DD-AEE1-4F0D-AE35-4FAF51AD1B5A
../External/RHStatusItemView
+ CBA93B91-B799-4CC6-85B6-749792B76DD4
+ ../External/InAppSettingsKit
E4C8E206-229C-4DA8-A130-0C544DEC7E07
../External/Pearl/External/jrswizzle
FF42A9E0-F41C-42FC-88CD-F2CCDE15DBB6
@@ -64,7 +64,7 @@
IDESourceControlRepositoryExtensionIdentifierKey
public.vcs.git
IDESourceControlWCCIdentifierKey
- 35C761A6-90CF-4EF5-93DA-E38ECBAD949A
+ 2B6DA448-3730-4F84-B2C3-51272E0D42F3
IDESourceControlWCCName
DCIntrospect
@@ -80,7 +80,7 @@
IDESourceControlRepositoryExtensionIdentifierKey
public.vcs.git
IDESourceControlWCCIdentifierKey
- 56D4C2AF-681C-406B-A5EA-C7FC4FA88907
+ CBA93B91-B799-4CC6-85B6-749792B76DD4
IDESourceControlWCCName
InAppSettingsKit
diff --git a/MasterPassword/ObjC/MPAppDelegate_Store.m b/MasterPassword/ObjC/MPAppDelegate_Store.m
index 1df11ee7..b0263246 100644
--- a/MasterPassword/ObjC/MPAppDelegate_Store.m
+++ b/MasterPassword/ObjC/MPAppDelegate_Store.m
@@ -289,6 +289,7 @@ PearlAssociatedObjectProperty(NSManagedObjectContext*, MainManagedObjectContext,
NSManagedObjectContext *moc = [self mainManagedObjectContextIfReady];
[moc performBlockAndWait:^{
[moc saveToStore];
+ [moc reset];
self.privateManagedObjectContext = nil;
self.mainManagedObjectContext = nil;
diff --git a/MasterPassword/ObjC/iOS/MPMainViewController.m b/MasterPassword/ObjC/iOS/MPMainViewController.m
index 093c35fb..82370ba1 100644
--- a/MasterPassword/ObjC/iOS/MPMainViewController.m
+++ b/MasterPassword/ObjC/iOS/MPMainViewController.m
@@ -55,23 +55,6 @@
- (void)viewDidLoad {
- self.searchDelegate = [MPElementListSearchController new];
- self.searchDelegate.delegate = self;
- self.searchDelegate.searchDisplayController = self.searchDisplayController;
- self.searchDelegate.searchTipContainer = self.searchTipContainer;
- self.searchDisplayController.searchBar.delegate = self.searchDelegate;
- self.searchDisplayController.delegate = self.searchDelegate;
- self.searchDisplayController.searchResultsDelegate = self.searchDelegate;
- self.searchDisplayController.searchResultsDataSource = self.searchDelegate;
-
- [self.passwordIncrementer addGestureRecognizer:[[UILongPressGestureRecognizer alloc] initWithTarget:self
- action:@selector(resetPasswordCounter:)]];
- [self.loginNameContainer addGestureRecognizer:[[UILongPressGestureRecognizer alloc] initWithTarget:self
- action:@selector(editLoginName:)]];
- [self.loginNameContainer addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(copyLoginName:)]];
- [self.outdatedAlertBack addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self
- action:@selector(infoOutdatedAlert)]];
-
self.view.backgroundColor = [UIColor colorWithPatternImage:[UIImage imageNamed:@"ui_background"]];
self.alertBody.text = nil;
diff --git a/MasterPassword/ObjC/iOS/MainStoryboard_iPhone.storyboard b/MasterPassword/ObjC/iOS/MainStoryboard_iPhone.storyboard
index b0d0b3fa..dcb86e06 100644
--- a/MasterPassword/ObjC/iOS/MainStoryboard_iPhone.storyboard
+++ b/MasterPassword/ObjC/iOS/MainStoryboard_iPhone.storyboard
@@ -1,5 +1,5 @@
-
+
@@ -674,6 +674,7 @@ Your passwords will be AES-encrypted with your master password.
+