Show purchase transaction failures to the user.

Avoids choking when query string becomes long and there are excessively
long site name entries.

platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj

@@ -174,7 +174,6 @@
 		DA67461018DE7F0C00DFE240 /* Exo2.0-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = DA67460C18DE7F0C00DFE240 /* Exo2.0-Bold.otf */; };
 		DA69540617D975D900BF294E /* icon_gears.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD37841711E29500CF925C /* icon_gears.png */; };
 		DA69540717D975D900BF294E /* icon_gears@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD37851711E29500CF925C /* icon_gears@2x.png */; };
-		DA72BD7B19C1510C00E6ACFE /* UIView+FontScale.m in Sources */ = {isa = PBXBuildFile; fileRef = DACE2F6719BA6A2A0010F92E /* UIView+FontScale.m */; };
 		DA72E2302453B91700676D4F /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA72E22F2453B91700676D4F /* WebKit.framework */; };
 		DA73049D194E022700E72520 /* ui_spinner.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD36511711E29400CF925C /* ui_spinner.png */; };
 		DA73049E194E022700E72520 /* ui_spinner@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD36521711E29400CF925C /* ui_spinner@2x.png */; };
@@ -3161,7 +3160,7 @@
 				DA5BFA42147E415C00F98B1E /* Resources */,
 				DA6556E314D55F3000841C99 /* Run Script: GIT version -> Info.plist */,
 				4A87858EE3659604089E2F9F /* [CP] Embed Pods Frameworks */,
-				DA3C4EB32439438B00A6C4A8 /* Upload Sentry dSYM */,
+				DA3C4EB32439438B00A6C4A8 /* Sentry dSYM Upload */,
 			);
 			buildRules = (
 			);
@@ -3518,7 +3517,7 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		DA3C4EB32439438B00A6C4A8 /* Upload Sentry dSYM */ = {
+		DA3C4EB32439438B00A6C4A8 /* Sentry dSYM Upload */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 8;
 			files = (
@@ -3526,15 +3525,16 @@
 			inputFileListPaths = (
 			);
 			inputPaths = (
+				"${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}/Contents/Resources/DWARF/${TARGET_NAME}",
 			);
-			name = "Upload Sentry dSYM";
+			name = "Sentry dSYM Upload";
 			outputFileListPaths = (
 			);
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 1;
 			shellPath = "/bin/sh -e";
-			shellScript = "if hash sentry-cli 2>/dev/null; then\n    if ! ERROR=$(SENTRY_ORG=lyndir SENTRY_PROJECT=masterpassword-ios sentry-cli upload-dif --log-level info \"$DWARF_DSYM_FOLDER_PATH\" 2>&1 >/dev/null); then\n        echo >&2 \"warning: sentry-cli: $ERROR\"\n    fi\nelse\n    echo >&2 \"warning: sentry-cli not installed: try brew install getsentry/tools/sentry-cli\"\nfi\n";
+			shellScript = "if ! hash sentry-cli 2>/dev/null; then\n    echo >&2 \"error: sentry-cli not installed. Try brew install getsentry/tools/sentry-cli\"\n    exit 1\nfi\n\nSENTRY_ORG=lyndir SENTRY_PROJECT=masterpassword-ios sentry-cli upload-dif --log-level info \"$DWARF_DSYM_FOLDER_PATH\"\n";
 			showEnvVarsInLog = 0;
 		};
 		DA6556E314D55F3000841C99 /* Run Script: GIT version -> Info.plist */ = {
@@ -3682,7 +3682,6 @@
 				DAFE4A2E15039824003ABA7C /* PearlStrings.m in Sources */,
 				DAFE4A3015039824003ABA7C /* PearlStringUtils.m in Sources */,
 				DAFE4A3715039824003ABA7C /* PearlKeyChain.m in Sources */,
-				DA72BD7B19C1510C00E6ACFE /* UIView+FontScale.m in Sources */,
 				DA250A17195665A100AC23F1 /* UITableView+PearlReloadItems.m in Sources */,
 				DAFE4A4115039824003ABA7C /* PearlArrayTVC.m in Sources */,
 				DAFE4A4315039824003ABA7C /* PearlBoxView.m in Sources */,

platform-darwin/MasterPassword-macOS.xcodeproj/project.pbxproj

@@ -2329,7 +2329,7 @@
 				DAD9B5EE1762CA3A001835F9 /* Copy LoginHelper */,
 				DA6556E314D55F3000841C99 /* Run Script: GIT version -> Info.plist */,
 				43E5966C8C236E86824DDADE /* [CP] Embed Pods Frameworks */,
-				DA3C4EB2243941AE00A6C4A8 /* Upload Sentry dSYM */,
+				DA3C4EB2243941AE00A6C4A8 /* Sentry dSYM Upload */,
 			);
 			buildRules = (
 			);
@@ -2585,7 +2585,7 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-MasterPassword-macOS/Pods-MasterPassword-macOS-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		DA3C4EB2243941AE00A6C4A8 /* Upload Sentry dSYM */ = {
+		DA3C4EB2243941AE00A6C4A8 /* Sentry dSYM Upload */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 8;
 			files = (
@@ -2593,15 +2593,16 @@
 			inputFileListPaths = (
 			);
 			inputPaths = (
+				"${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}/Contents/Resources/DWARF/${TARGET_NAME}",
 			);
-			name = "Upload Sentry dSYM";
+			name = "Sentry dSYM Upload";
 			outputFileListPaths = (
 			);
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 1;
 			shellPath = "/bin/sh -e";
-			shellScript = "if hash sentry-cli 2>/dev/null; then\n    if ! ERROR=$(SENTRY_ORG=lyndir SENTRY_PROJECT=masterpassword-macos sentry-cli upload-dif --log-level info \"$DWARF_DSYM_FOLDER_PATH\" 2>&1 >/dev/null); then\n        echo >&2 \"warning: sentry-cli: $ERROR\"\n    fi\nelse\n    echo >&2 \"warning: sentry-cli not installed: try brew install getsentry/tools/sentry-cli\"\nfi\n";
+			shellScript = "if ! hash sentry-cli 2>/dev/null; then\n    echo >&2 \"error: sentry-cli not installed. Try brew install getsentry/tools/sentry-cli\"\n    exit 1\nfi\n\nSENTRY_ORG=lyndir SENTRY_PROJECT=masterpassword-macos sentry-cli upload-dif --log-level info \"$DWARF_DSYM_FOLDER_PATH\"\n";
 			showEnvVarsInLog = 0;
 		};
 		DA4EF9CB19FD4B600032ECB5 /* Run Script: genassets */ = {

platform-darwin/Source/MPAppDelegate_InApp.m

@@ -117,7 +117,7 @@ PearlAssociatedObjectProperty( NSMutableArray*, ProductObservers, productObserve
             [self performPurchaseProductWithIdentifier:productIdentifier quantity:quantity];
         }]];
         [controller addAction:[UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel handler:nil]];
-        [self.navigationController presentViewController:controller animated:YES completion:nil];
+        [self.window.rootViewController presentViewController:controller animated:YES completion:nil];
         return;
     }
 #endif
@@ -158,16 +158,16 @@ PearlAssociatedObjectProperty( NSMutableArray*, ProductObservers, productObserve
 
 - (void)request:(SKRequest *)request didFailWithError:(NSError *)error {
 
-    MPError( error, @"StoreKit request (%@) failed.", request );
+    MPError( error, @"StoreKit request failed." );
 
 #if TARGET_OS_IPHONE
     PearlMainQueue( ^{
         UIAlertController *controller = [UIAlertController alertControllerWithTitle:@"Purchase Failed" message:
                         strf( @"%@\n\n%@", error.localizedDescription,
-                                @"Ensure you are online and try logging out and back into iTunes from your device's Settings." )
+                                @"Could not reach Apple's iTunes Store.  Make sure you're connected to the Internet and try again." )
                                                                      preferredStyle:UIAlertControllerStyleAlert];
         [controller addAction:[UIAlertAction actionWithTitle:@"OK" style:UIAlertActionStyleCancel handler:nil]];
-        [self.navigationController presentViewController:controller animated:YES completion:nil];
+        [self.window.rootViewController presentViewController:controller animated:YES completion:nil];
     } );
 #endif
 }
@@ -222,6 +222,17 @@ PearlAssociatedObjectProperty( NSMutableArray*, ProductObservers, productObserve
                 MPError( transaction.error, @"Transaction failed: %@.", transaction.payment.productIdentifier );
                 [queue finishTransaction:transaction];
 
+#if TARGET_OS_IPHONE
+                PearlMainQueue( ^{
+                    UIAlertController *controller = [UIAlertController alertControllerWithTitle:@"Purchase Failed" message:
+                                    strf( @"%@\n\n%@", transaction.error.localizedDescription,
+                                            @"Could not reach Apple's iTunes Store.  Make sure you're connected to the Internet and try again." )
+                                                                                 preferredStyle:UIAlertControllerStyleAlert];
+                    [controller addAction:[UIAlertAction actionWithTitle:@"OK" style:UIAlertActionStyleCancel handler:nil]];
+                    [self.window.rootViewController presentViewController:controller animated:YES completion:nil];
+                } );
+#endif
+
                 SKProduct *product = self.products[transaction.payment.productIdentifier];
                 [Countly.sharedInstance recordEvent:@"purchase" segmentation:@{
                         @"id": product.productIdentifier,

platform-darwin/Source/MPAppDelegate_Key.m

@@ -249,18 +249,18 @@
                 masterPassword = PearlAwait( ^(void (^setResult)(id)) {
                     PearlMainQueue( ^{
                         UIAlertController *controller = [UIAlertController alertControllerWithTitle:@"Enter Old Master Password" message:
-                                        strf( @"Your old master password is required to migrate the stored password for %@", site.name )
+                                        strf( @"Your old master password is required to unlock the stored password for: <%@>", site.name )
                                                                                      preferredStyle:UIAlertControllerStyleAlert];
                         [controller addTextFieldWithConfigurationHandler:nil];
                         [controller addAction:[UIAlertAction actionWithTitle:@"Migrate" style:UIAlertActionStyleDefault handler:
                                 ^(UIAlertAction *_Nonnull action) {
                                     setResult( controller.textFields.firstObject.text );
                                 }]];
-                        [controller addAction:[UIAlertAction actionWithTitle:@"Don't Migrate" style:UIAlertActionStyleCancel handler:
+                        [controller addAction:[UIAlertAction actionWithTitle:@"Leave It" style:UIAlertActionStyleCancel handler:
                                 ^(UIAlertAction *_Nonnull action) {
                                     setResult( nil );
                                 }]];
-                        [self.navigationController presentViewController:controller animated:YES completion:nil];
+                        [self.window.rootViewController presentViewController:controller animated:YES completion:nil];
                     } );
                 } );
 #endif

platform-darwin/Source/MPAppDelegate_Shared.h

@@ -20,7 +20,7 @@
 
 #if TARGET_OS_IPHONE
 
-@interface MPAppDelegate_Shared : PearlAppDelegate
+@interface MPAppDelegate_Shared : UIResponder<UIApplicationDelegate, PearlConfigDelegate>
 
 #else
 

platform-darwin/Source/MPAppDelegate_Store.h

@@ -30,6 +30,7 @@
 - (id)managedObjectContextChanged:(void ( ^ )(NSDictionary<NSManagedObjectID *, NSString *> *affectedObjects))changedBlock;
 
 - (MPFixableResult)findAndFixInconsistenciesSaveInContext:(NSManagedObjectContext *)context;
+- (void)retryCorruptStore;
 - (void)deleteAndResetStore;
 
 /** @param completion The block to execute after adding the site, executed from the main thread with the new site in the main MOC. */

platform-darwin/Source/MPAppDelegate_Store.m

@@ -232,22 +232,27 @@ PearlAssociatedObjectProperty( NSNumber*, StoreCorrupted, storeCorrupted );
                 }];
             } );
 
-
         // Create a new store coordinator.
         NSError *error = nil;
         NSURL *localStoreURL = [self localStoreURL];
         if (![[NSFileManager defaultManager] createDirectoryAtURL:[localStoreURL URLByDeletingLastPathComponent]
                                       withIntermediateDirectories:YES attributes:nil error:&error]) {
             MPError( error, @"Couldn't create our application support directory." );
+            PearlRemoveNotificationObserversFrom( self.mainManagedObjectContext );
+            self.mainManagedObjectContext = nil;
+            self.privateManagedObjectContext = nil;
             return;
         }
-        if (![self.storeCoordinator addPersistentStoreWithType:NSSQLiteStoreType configuration:nil URL:[self localStoreURL]
+        if (![self.storeCoordinator addPersistentStoreWithType:NSSQLiteStoreType configuration:nil URL:localStoreURL
                                                        options:@{
                                                                NSMigratePersistentStoresAutomaticallyOption: @YES,
                                                                NSInferMappingModelAutomaticallyOption      : @YES,
                                                                STORE_OPTIONS
                                                        } error:&error]) {
             MPError( error, @"Failed to open store." );
+            PearlRemoveNotificationObserversFrom( self.mainManagedObjectContext );
+            self.mainManagedObjectContext = nil;
+            self.privateManagedObjectContext = nil;
             self.storeCorrupted = @YES;
             [self handleCoordinatorError:error];
             return;
@@ -274,6 +279,12 @@ PearlAssociatedObjectProperty( NSNumber*, StoreCorrupted, storeCorrupted );
     }];
 }
 
+- (void)retryCorruptStore {
+
+    self.storeCorrupted = @NO;
+    [self loadStore];
+}
+
 - (void)deleteAndResetStore {
 
     @synchronized (self) {

platform-darwin/Source/MPTypes.h

@@ -43,6 +43,7 @@ __END_DECLS
         SentryEvent *event = [[SentryEvent alloc] initWithLevel:kSentryLevelError]; \
         event.message = strf( message_ @": %@", ##__VA_ARGS__, [__error localizedDescription]); \
         event.logger = @"MPError"; \
+        event.fingerprint = @[ message_, __error.domain, @(__error.code) ]; \
         [SentrySDK captureEvent:event]; \
     } \
     __error; \

platform-darwin/Source/Mac/Base.lproj/MainMenu.xib

@@ -12,9 +12,6 @@
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <menu title="AMainMenu" systemMenu="main" id="29">
-            <point key="canvasLocation" x="139" y="155"/>
-        </menu>
         <customObject id="494" customClass="MPMacAppDelegate">
             <connections>
                 <outlet property="createUserItem" destination="757" id="763"/>
@@ -241,6 +238,9 @@
                     </connections>
                 </menuItem>
             </items>
+            <connections>
+                <outlet property="delegate" destination="494" id="Slu-zT-yO4"/>
+            </connections>
             <point key="canvasLocation" x="140" y="23"/>
         </menu>
     </objects>

platform-darwin/Source/Mac/MPMacAppDelegate.h

@@ -21,9 +21,9 @@
 #import "MPSitesWindowController.h"
 #import "MPInitialWindowController.h"
 
-@interface MPMacAppDelegate : MPAppDelegate_Shared<NSApplicationDelegate>
+@interface MPMacAppDelegate : MPAppDelegate_Shared<NSApplicationDelegate, NSMenuDelegate>
 
-@property(nonatomic, strong) NSStatusItem *statusView;
+@property(nonatomic, strong) NSStatusItem *statusItem;
 @property(nonatomic, strong) MPSitesWindowController *sitesWindowController;
 @property(nonatomic, strong) MPInitialWindowController *initialWindowController;
 @property(nonatomic, weak) IBOutlet NSMenuItem *lockItem;

platform-darwin/Source/Mac/MPMacAppDelegate.m

@@ -158,12 +158,10 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven
     }           forKeyPath:@"activeUser" options:0 context:nil];
 
     // Status item.
-    self.statusView = [[NSStatusBar systemStatusBar] statusItemWithLength:NSSquareStatusItemLength];
-    self.statusView.image = [NSImage imageNamed:@"menu-icon"];
-    self.statusView.image.template = YES;
-    self.statusView.menu = self.statusMenu;
-    self.statusView.target = self;
-    self.statusView.action = @selector( showMenu );
+    self.statusItem = [[NSStatusBar systemStatusBar] statusItemWithLength:NSSquareStatusItemLength];
+    self.statusItem.menu = self.statusMenu;
+    self.statusItem.button.image = [NSImage imageNamed:@"menu-icon"];
+    self.statusItem.button.image.template = YES;
 
     PearlAddNotificationObserver( NSPersistentStoreCoordinatorStoresWillChangeNotification, self.storeCoordinator, nil,
             ^(id self, NSNotification *note) {
@@ -502,7 +500,7 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven
 
 - (IBAction)showPopup:(id)sender {
 
-    [self.statusView popUpStatusItemMenu:self.statusView.menu];
+    [[self.statusItem button] performClick:sender];
 }
 
 - (IBAction)showPasswordWindow:(id)sender {
@@ -682,13 +680,6 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven
     [self updateMenuItems];
 }
 
-- (void)showMenu {
-
-    [self updateMenuItems];
-
-    [self.statusView popUpStatusItemMenu:self.statusView.menu];
-}
-
 - (void)updateMenuItems {
 
     MPUserEntity *activeUser = [self activeUserForMainThread];
@@ -743,6 +734,13 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven
     }
 }
 
+#pragma mark - NSMenuDelegate
+
+- (void)menuNeedsUpdate:(NSMenu *)menu {
+
+    [self updateMenuItems];
+}
+
 #pragma mark - PearlConfigDelegate
 
 - (void)didUpdateConfigForKey:(SEL)configKey fromValue:(id)oldValue {

platform-darwin/Source/Mac/MPSiteModel.h

@@ -45,7 +45,7 @@
 @property(nonatomic, readonly) BOOL stored;
 @property(nonatomic, readonly) BOOL transient;
 
-- (instancetype)initWithEntity:(MPSiteEntity *)entity fuzzyGroups:(NSArray *)fuzzyGroups;
+- (instancetype)initWithEntity:(MPSiteEntity *)entity queryGroups:(NSArray *)queryGroups;
 - (instancetype)initWithName:(NSString *)siteName forUser:(MPUserEntity *)user;
 - (MPSiteEntity *)entityInContext:(NSManagedObjectContext *)moc;
 

platform-darwin/Source/Mac/MPSiteModel.m

@@ -31,12 +31,12 @@
 
 @implementation MPSiteModel
 
-- (instancetype)initWithEntity:(MPSiteEntity *)entity fuzzyGroups:(NSArray *)fuzzyGroups {
+- (instancetype)initWithEntity:(MPSiteEntity *)entity queryGroups:(NSArray *)queryGroups {
 
     if (!(self = [super init]))
         return nil;
 
-    [self setEntity:entity fuzzyGroups:fuzzyGroups];
+    [self setEntity:entity queryGroups:queryGroups];
     self.initialized = YES;
 
     return self;
@@ -53,23 +53,25 @@
     return self;
 }
 
-- (void)setEntity:(MPSiteEntity *)entity fuzzyGroups:(NSArray *)fuzzyGroups {
+- (void)setEntity:(MPSiteEntity *)entity queryGroups:(NSArray *)queryGroups {
 
     if ([self.entityOID isEqual:entity.permanentObjectID])
         return;
     self.entityOID = entity.permanentObjectID;
 
     NSString *siteName = entity.name;
-    NSMutableAttributedString *attributedSiteName = [[NSMutableAttributedString alloc] initWithString:siteName];
-    for (NSUInteger f = 0, s = (NSUInteger)-1; f < [fuzzyGroups count]; ++f) {
-        s = [siteName rangeOfString:fuzzyGroups[f] options:NSDiacriticInsensitiveSearch | NSCaseInsensitiveSearch
-                              range:NSMakeRange( s + 1, [siteName length] - (s + 1) )].location;
+    NSMutableAttributedString *attributedSiteName = [[NSMutableAttributedString alloc] initWithString:siteName?: @""];
+    if ([attributedSiteName length])
+        for (NSUInteger f = 0, s = 0; f < [queryGroups count]; ++f, ++s) {
+            s = [siteName rangeOfString:queryGroups[f] options:NSDiacriticInsensitiveSearch | NSCaseInsensitiveSearch
+                                  range:NSMakeRange( s, [siteName length] - s )].location;
             if (s == NSNotFound)
                 break;
 
             [attributedSiteName addAttribute:NSBackgroundColorAttributeName value:[NSColor alternateSelectedControlColor]
-                                   range:NSMakeRange( s, [fuzzyGroups[f] length] )];
+                                       range:NSMakeRange( s, [queryGroups[f] length] )];
         }
+
     NSMutableParagraphStyle *paragraphStyle = [NSMutableParagraphStyle new];
     paragraphStyle.alignment = NSCenterTextAlignment;
     [attributedSiteName addAttribute:NSParagraphStyleAttributeName value:paragraphStyle range:NSMakeRange( 0, [siteName length] )];

platform-darwin/Source/Mac/MPSitesWindowController.m

@@ -611,22 +611,20 @@
         return;
     }
 
-    static NSRegularExpression *fuzzyRE;
-    static dispatch_once_t once = 0;
-    dispatch_once( &once, ^{
-        fuzzyRE = [NSRegularExpression regularExpressionWithPattern:@"(.)" options:0 error:nil];
-    } );
-
     prof_new( @"updateSites" );
     NSString *queryString = self.siteField.stringValue;
-    NSString *queryPattern = [[queryString stringByReplacingMatchesOfExpression:fuzzyRE withTemplate:@"*$1"] stringByAppendingString:@"*"];
-    prof_rewind( @"queryPattern" );
-    NSMutableArray *fuzzyGroups = [NSMutableArray new];
-    [fuzzyRE enumerateMatchesInString:queryString options:0 range:NSMakeRange( 0, queryString.length )
-                           usingBlock:^(NSTextCheckingResult *result, NSMatchingFlags flags, BOOL *stop) {
-                               [fuzzyGroups addObject:[queryString substringWithRange:result.range]];
+    NSMutableArray *queryGroups = [NSMutableArray new];
+    NSMutableString *queryPattern = [NSMutableString new];
+    [queryString enumerateSubstringsInRange: NSMakeRange(0, [queryString length]) options: NSStringEnumerationByComposedCharacterSequences
+                                 usingBlock: ^(NSString *substring, NSRange substringRange, NSRange enclosingRange, BOOL *stop) {
+                                     if (substringRange.location < 10) {
+                                         [queryGroups addObject:substring];
+                                         [queryPattern appendString:@"*"];
+                                     }
+                                     [queryPattern appendString:substring];
                                  }];
-    prof_rewind( @"fuzzyRE" );
+    [queryPattern appendString:@"*"];
+    prof_rewind( @"queryPattern" );
     [MPMacAppDelegate managedObjectContextPerformBlock:^(NSManagedObjectContext *context) {
         prof_rewind( @"moc" );
 
@@ -648,7 +646,7 @@
         BOOL exact = NO;
         NSMutableArray *newSites = [NSMutableArray arrayWithCapacity:[siteResults count]];
         for (MPSiteEntity *site in siteResults) {
-            [newSites addObject:[[MPSiteModel alloc] initWithEntity:site fuzzyGroups:fuzzyGroups]];
+            [newSites addObject:[[MPSiteModel alloc] initWithEntity:site queryGroups:queryGroups]];
             exact |= [site.name isEqualToString:queryString];
         }
         prof_rewind( @"newSites: %u, exact: %d", (uint)[siteResults count], exact );

platform-darwin/Source/iOS/MPSiteCell.h

@@ -27,7 +27,7 @@ typedef NS_ENUM ( NSUInteger, MPSiteCellMode ) {
 
 @interface MPSiteCell : MPCell<UIScrollViewDelegate, UITextFieldDelegate>
 
-@property(nonatomic) NSArray *fuzzyGroups;
+@property(nonatomic) NSArray *queryGroups;
 
 - (void)setSite:(MPSiteEntity *)site animated:(BOOL)animated;
 - (void)setTransientSite:(NSString *)siteName animated:(BOOL)animated;

platform-darwin/Source/iOS/MPSiteCell.m

@@ -135,7 +135,7 @@
     [super prepareForReuse];
 
     self.siteOID = nil;
-    self.fuzzyGroups = nil;
+    self.queryGroups = nil;
     self.transientSite = nil;
     self.mode = MPPasswordCellModePassword;
     [self updateAnimated:NO];
@@ -150,11 +150,11 @@
 
 #pragma mark - State
 
-- (void)setFuzzyGroups:(NSArray *)fuzzyGroups {
+- (void)setQueryGroups:(NSArray *)queryGroups {
 
-    if (self.fuzzyGroups == fuzzyGroups)
+    if (self.queryGroups == queryGroups)
         return;
-    _fuzzyGroups = fuzzyGroups;
+    _queryGroups = queryGroups;
 
     [self updateSiteName:[self siteInContext:[MPiOSAppDelegate managedObjectContextForMainThreadIfReady]]];
 }
@@ -656,14 +656,14 @@
     NSString *siteName = self.transientSite?: site.name;
     NSMutableAttributedString *attributedSiteName = [[NSMutableAttributedString alloc] initWithString:siteName?: @""];
     if ([attributedSiteName length])
-        for (NSUInteger f = 0, s = (NSUInteger)-1; f < [self.fuzzyGroups count]; ++f) {
-            s = [siteName rangeOfString:self.fuzzyGroups[f] options:NSDiacriticInsensitiveSearch | NSCaseInsensitiveSearch
-                                  range:NSMakeRange( s + 1, [siteName length] - (s + 1) )].location;
+        for (NSUInteger f = 0, s = 0; f < [self.queryGroups count]; ++f, ++s) {
+            s = [siteName rangeOfString:self.queryGroups[f] options:NSDiacriticInsensitiveSearch | NSCaseInsensitiveSearch
+                                  range:NSMakeRange( s, [siteName length] - s )].location;
             if (s == NSNotFound)
                 break;
 
             [attributedSiteName addAttribute:NSBackgroundColorAttributeName value:[UIColor redColor]
-                                       range:NSMakeRange( s, [self.fuzzyGroups[f] length] )];
+                                       range:NSMakeRange( s, [self.queryGroups[f] length] )];
         }
 
     if (self.transientSite)

platform-darwin/Source/iOS/MPSitesViewController.m

@@ -36,7 +36,7 @@ typedef NS_OPTIONS( NSUInteger, MPPasswordsTips ) {
 @interface MPSitesViewController()<NSFetchedResultsControllerDelegate>
 
 @property(nonatomic, strong) NSFetchedResultsController *fetchedResultsController;
-@property(nonatomic, strong) NSArray *fuzzyGroups;
+@property(nonatomic, strong) NSArray *queryGroups;
 @property(nonatomic, strong) NSCharacterSet *siteNameAcceptableCharactersSet;
 @property(nonatomic, strong) NSMutableArray<NSMutableArray *> *dataSource;
 @property(nonatomic, weak) UIViewController *popdownVC;
@@ -120,12 +120,14 @@ typedef NS_OPTIONS( NSUInteger, MPPasswordsTips ) {
     PearlRemoveNotificationObservers();
 }
 
-- (void)viewWillLayoutSubviews {
+- (void)viewDidLayoutSubviews {
 
-    self.collectionView.contentInset = [self.collectionView occludedInsets];
-    self.collectionView.scrollIndicatorInsets = self.collectionView.contentInset;
+    [super viewDidLayoutSubviews];
 
-    [super viewWillLayoutSubviews];
+    if (@available( iOS 11, * )) {
+        self.collectionView.layoutMargins =
+                UIEdgeInsetsMake( [self.collectionView occludedInsets].top - self.view.safeAreaInsets.top, 0, 0, 0 );
+    }
 }
 
 - (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
@@ -160,7 +162,7 @@ typedef NS_OPTIONS( NSUInteger, MPPasswordsTips ) {
 - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath {
 
     MPSiteCell *cell = [MPSiteCell dequeueFromCollectionView:collectionView indexPath:indexPath];
-    [cell setFuzzyGroups:self.fuzzyGroups];
+    [cell setQueryGroups:self.queryGroups];
     id item = self.dataSource[(NSUInteger)indexPath.section][(NSUInteger)indexPath.item];
     if ([item isKindOfClass:[MPSiteEntity class]])
         [cell setSite:item animated:NO];
@@ -170,6 +172,19 @@ typedef NS_OPTIONS( NSUInteger, MPPasswordsTips ) {
     return cell;
 }
 
+#pragma mark - UICollectionViewDelegateFlowLayout
+
+- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout
+  sizeForItemAtIndexPath:(NSIndexPath *)indexPath {
+
+    UICollectionViewFlowLayout *layout = (UICollectionViewFlowLayout *)collectionViewLayout;
+    CGFloat availableWidth = collectionView.bounds.size.width
+                             - collectionView.layoutMargins.left - collectionView.layoutMargins.right
+                             - layout.sectionInset.left - layout.sectionInset.right;
+    CGFloat cells = MAX( 1, (int)((availableWidth + layout.minimumInteritemSpacing) / (318 + layout.minimumInteritemSpacing)) );
+    return CGSizeMake( (availableWidth - layout.minimumInteritemSpacing * (cells - 1)) / cells, 100 );
+}
+
 #pragma mark - UIScrollDelegate
 
 - (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView {
@@ -353,21 +368,19 @@ typedef NS_OPTIONS( NSUInteger, MPPasswordsTips ) {
 - (void)reloadSites {
 
     [self.fetchedResultsController.managedObjectContext performBlock:^{
-        static NSRegularExpression *fuzzyRE;
-        static dispatch_once_t once = 0;
-        dispatch_once( &once, ^{
-            fuzzyRE = [NSRegularExpression regularExpressionWithPattern:@"(.)" options:0 error:nil];
-        } );
-
         NSString *queryString = self.query;
-        NSString *queryPattern = [[queryString stringByReplacingMatchesOfExpression:fuzzyRE withTemplate:@"*$1"]
-                stringByAppendingString:@"*"];
-        NSMutableArray *fuzzyGroups = [NSMutableArray new];
-        [fuzzyRE enumerateMatchesInString:queryString options:0 range:NSMakeRange( 0, queryString.length )
-                               usingBlock:^(NSTextCheckingResult *result, NSMatchingFlags flags, BOOL *stop) {
-                                   [fuzzyGroups addObject:[queryString substringWithRange:result.range]];
+        NSMutableArray *queryGroups = [NSMutableArray new];
+        NSMutableString *queryPattern = [NSMutableString new];
+        [queryString enumerateSubstringsInRange: NSMakeRange(0, [queryString length]) options: NSStringEnumerationByComposedCharacterSequences
+                              usingBlock: ^(NSString *substring, NSRange substringRange, NSRange enclosingRange, BOOL *stop) {
+            if (substringRange.location < 10) {
+                [queryGroups addObject:substring];
+                [queryPattern appendString:@"*"];
+            }
+                                  [queryPattern appendString:substring];
                               }];
-        self.fuzzyGroups = fuzzyGroups;
+        [queryPattern appendString:@"*"];
+        self.queryGroups = queryGroups;
 
         NSError *error = nil;
         self.fetchedResultsController.fetchRequest.predicate =
@@ -380,7 +393,7 @@ typedef NS_OPTIONS( NSUInteger, MPPasswordsTips ) {
                                        toSections:[self createDataSource]
                                       reloadItems:@[ MPTransientPasswordItem ] completion:^(BOOL finished) {
                         for (MPSiteCell *cell in self.collectionView.visibleCells)
-                            [cell setFuzzyGroups:self.fuzzyGroups];
+                            [cell setQueryGroups:self.queryGroups];
                     }];
         } );
     }];

platform-darwin/Source/iOS/MPWebViewController.m

@@ -100,9 +100,10 @@ decisionHandler:(void ( ^ )(WKNavigationActionPolicy))decisionHandler {
 
 - (IBAction)action:(id)sender {
 
-    UIAlertController *controller = [UIAlertController new];
-    controller.title = self.webView.URL.host;
-    controller.message = self.webView.URL.absoluteString;
+    UIAlertController *controller = [UIAlertController alertControllerWithTitle:self.webView.URL.host
+                                                                        message:self.webView.URL.absoluteString
+                                                                 preferredStyle:UIAlertControllerStyleActionSheet];
+    [controller.popoverPresentationController setSourceView:sender];
     [controller addAction:[UIAlertAction actionWithTitle:@"Safari" style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
         [UIApp openURL:self.webView.URL];
     }]];

platform-darwin/Source/iOS/MPiOSAppDelegate.h

@@ -23,6 +23,7 @@
 
 @interface MPiOSAppDelegate : MPAppDelegate_Shared <SKStoreProductViewControllerDelegate>
 
+@property(nonatomic, strong) UIWindow *window;
 @property(nonatomic, strong) SKStoreProductViewController *voltoViewController;
 
 - (void)openURL:(NSURL *)url;

platform-darwin/Source/iOS/MPiOSAppDelegate.m

@@ -35,7 +35,7 @@
 @implementation CountlyPushNotifications(MPNotifications)
 
 - (void)openURL:(NSString *)URLString {
-    [[MPiOSAppDelegate get].navigationController performSegueWithIdentifier:@"web" sender:[NSURL URLWithString:URLString]];
+    [[MPiOSAppDelegate get].window.rootViewController performSegueWithIdentifier:@"web" sender:[NSURL URLWithString:URLString]];
 }
 
 @end
@@ -48,6 +48,8 @@
 
 @implementation MPiOSAppDelegate
 
+@synthesize window;
+
 + (void)initialize {
 
     [MPiOSConfig get];
@@ -150,12 +152,6 @@
     @catch (id exception) {
         err( @"During Config Test: %@", exception );
     }
-    @try {
-        [super application:application didFinishLaunchingWithOptions:launchOptions];
-    }
-    @catch (id exception) {
-        err( @"During Pearl Application Launch: %@", exception );
-    }
     @try {
         inf( @"Started up with device identifier: %@", [PearlKeyChain deviceIdentifier] );
 
@@ -206,7 +202,7 @@
 
         PearlMainQueueOperation( ^{
             if ([[MPiOSConfig get].showSetup boolValue])
-                [self.navigationController performSegueWithIdentifier:@"setup" sender:self];
+                [self.window.rootViewController performSegueWithIdentifier:@"setup" sender:self];
 
             [self consentFeatures];
         } );
@@ -244,7 +240,7 @@
                                                 (id)[error localizedDescription]?: error )
                                                                                 preferredStyle:UIAlertControllerStyleAlert];
                         [alert addAction:[UIAlertAction actionWithTitle:@"Continue" style:UIAlertActionStyleCancel handler:nil]];
-                        [self.navigationController presentViewController:alert animated:YES completion:nil];
+                        [self.window.rootViewController presentViewController:alert animated:YES completion:nil];
                     } );
                     return;
                 }
@@ -256,7 +252,7 @@
                                         @"Master Password couldn't understand the import file."
                                                                                 preferredStyle:UIAlertControllerStyleAlert];
                         [alert addAction:[UIAlertAction actionWithTitle:@"Continue" style:UIAlertActionStyleCancel handler:nil]];
-                        [self.navigationController presentViewController:alert animated:YES completion:nil];
+                        [self.window.rootViewController presentViewController:alert animated:YES completion:nil];
                     } );
                     return;
                 }
@@ -296,8 +292,7 @@
             [self consentFeatures];
         }]];
 
-        [(self.navigationController.presentedViewController?: (UIViewController *)self.navigationController)
-                presentViewController:alert animated:YES completion:nil];
+        [self.window.rootViewController presentViewController:alert animated:YES completion:nil];
     } );
 
     return YES;
@@ -342,8 +337,7 @@
                 [MPiOSConfig get].notificationsDecided = @(YES);
             }
         }]];
-        [(self.navigationController.presentedViewController?: (UIViewController *)self.navigationController)
-                presentViewController:alert animated:YES completion:nil];
+        [self.window.rootViewController presentViewController:alert animated:YES completion:nil];
     } );
 }
 
@@ -372,7 +366,7 @@
                 [alert addAction:[UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel handler:^(UIAlertAction *action) {
                     setResult( nil );
                 }]];
-                [self.navigationController presentViewController:alert animated:YES completion:nil];
+                [self.window.rootViewController presentViewController:alert animated:YES completion:nil];
             } );
         } );
     } askUserPassword:^NSString *(NSString *userName) {
@@ -390,7 +384,7 @@
                 [alert addAction:[UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel handler:^(UIAlertAction *action) {
                     setResult( nil );
                 }]];
-                [self.navigationController presentViewController:alert animated:YES completion:nil];
+                [self.window.rootViewController presentViewController:alert animated:YES completion:nil];
             } );
         } );
     }          result:^(NSError *error) {
@@ -401,7 +395,7 @@
                 UIAlertController *controller = [UIAlertController alertControllerWithTitle:@"Error" message:[error localizedDescription]
                                                                              preferredStyle:UIAlertControllerStyleAlert];
                 [controller addAction:[UIAlertAction actionWithTitle:@"Continue" style:UIAlertActionStyleCancel handler:nil]];
-                [self.navigationController presentViewController:controller animated:YES completion:nil];
+                [self.window.rootViewController presentViewController:controller animated:YES completion:nil];
             }
         } );
     }];
@@ -411,8 +405,6 @@
 
     inf( @"Will foreground" );
 
-    [super applicationWillEnterForeground:application];
-
     [self.hangDetector start];
 }
 
@@ -435,20 +427,16 @@
                             [UIPasteboard generalPasteboard].string = @"";
                         }]];
                 [alert addAction:[UIAlertAction actionWithTitle:@"No" style:UIAlertActionStyleCancel handler:nil]];
-                [self.navigationController presentViewController:alert animated:YES completion:nil];
+                [self.window.rootViewController presentViewController:alert animated:YES completion:nil];
             } );
         }
         mpw_marshal_file_free( &importFile );
     } );
-
-    [super applicationDidBecomeActive:application];
 }
 
 - (void)applicationDidReceiveMemoryWarning:(UIApplication *)application {
 
     inf( @"Received memory warning." );
-
-    [super applicationDidReceiveMemoryWarning:application];
 }
 
 - (void)applicationDidEnterBackground:(UIApplication *)application {
@@ -461,8 +449,6 @@
     }
 
     [self.hangDetector stop];
-
-    [super applicationDidEnterBackground:application];
 }
 
 #pragma mark - Behavior
@@ -479,7 +465,7 @@
         else if ([url.host isEqualToString:@"show-url"]) {
             for (NSURLQueryItem *item in [NSURLComponents componentsWithString:[url absoluteString]].queryItems)
                 if ([item.name isEqualToString:@"url"]) {
-                    [[MPiOSAppDelegate get].navigationController performSegueWithIdentifier:@"web" sender:[NSURL URLWithString:item.value]];
+                    [self.window.rootViewController performSegueWithIdentifier:@"web" sender:[NSURL URLWithString:item.value]];
                     return;
                 }
         }
@@ -512,7 +498,7 @@
                         @"help@masterpassword.app"
                                                                 preferredStyle:UIAlertControllerStyleAlert];
         [alert addAction:[UIAlertAction actionWithTitle:@"Okay" style:UIAlertActionStyleCancel handler:nil]];
-        [self.navigationController presentViewController:alert animated:YES completion:nil];
+        [self.window.rootViewController presentViewController:alert animated:YES completion:nil];
     }
     else if (logs) {
         UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"Feedback" message:
@@ -526,7 +512,7 @@
         [alert addAction:[UIAlertAction actionWithTitle:@"No Logs" style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
             [self openFeedbackWithLogs:NO forVC:viewController];
         }]];
-        [self.navigationController presentViewController:alert animated:YES completion:nil];
+        [self.window.rootViewController presentViewController:alert animated:YES completion:nil];
     }
     else
         [self openFeedbackWithLogs:NO forVC:viewController];
@@ -572,15 +558,16 @@
                             @"This may be due to corruption.  You can either reset Master Password and "
                             @"recreate your user, or E-Mail us your logs and leave your corrupt store as-is for now."
                                                                     preferredStyle:UIAlertControllerStyleAlert];
-            [alert addAction:[UIAlertAction actionWithTitle:@"E-Mail Logs" style:UIAlertActionStyleDefault
-                                                    handler:^(UIAlertAction *action) {
+            [alert addAction:[UIAlertAction actionWithTitle:@"Try Again" style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
+                [self retryCorruptStore];
+            }]];
+            [alert addAction:[UIAlertAction actionWithTitle:@"Send Logs" style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
                 [self openFeedbackWithLogs:YES forVC:nil];
             }]];
             [alert addAction:[UIAlertAction actionWithTitle:@"Reset" style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
                 [self deleteAndResetStore];
             }]];
-            [alert addAction:[UIAlertAction actionWithTitle:@"Ignore" style:UIAlertActionStyleCancel handler:nil]];
-            [self.navigationController presentViewController:alert animated:YES completion:nil];
+            [self.window.rootViewController presentViewController:alert animated:YES completion:nil];
         } );
     } );
 }
@@ -605,10 +592,10 @@
             [self showExportRevealPasswords:YES forVC:viewController];
         }]];
         [sheet addAction:[UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel handler:nil]];
-        [self.navigationController presentViewController:sheet animated:YES completion:nil];
+        [self.window.rootViewController presentViewController:sheet animated:YES completion:nil];
     }]];
     [alert addAction:[UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel handler:nil]];
-    [self.navigationController presentViewController:alert animated:YES completion:nil];
+    [self.window.rootViewController presentViewController:alert animated:YES completion:nil];
 }
 
 - (void)showExportRevealPasswords:(BOOL)revealPasswords forVC:(UIViewController *)viewController {
@@ -619,7 +606,7 @@
                         @"Close Master Password, go into Settings and add a Mail account."
                                                                 preferredStyle:UIAlertControllerStyleAlert];
         [alert addAction:[UIAlertAction actionWithTitle:@"Okay" style:UIAlertActionStyleCancel handler:nil]];
-        [self.navigationController presentViewController:alert animated:YES completion:nil];
+        [self.window.rootViewController presentViewController:alert animated:YES completion:nil];
         return;
     }
 
@@ -644,7 +631,7 @@
                                                                     handler:^(UIAlertAction *action) {
                                                                         setResult( nil );
                                                                     }]];
-                            [self.navigationController presentViewController:alert animated:YES completion:nil];
+                            [self.window.rootViewController presentViewController:alert animated:YES completion:nil];
                         } );
                     } );
                 }                               error:&error];
@@ -655,7 +642,7 @@
                 UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"Export Error" message:[error localizedDescription]
                                                                         preferredStyle:UIAlertControllerStyleAlert];
                 [alert addAction:[UIAlertAction actionWithTitle:@"Okay" style:UIAlertActionStyleCancel handler:nil]];
-                [self.navigationController presentViewController:alert animated:YES completion:nil];
+                [self.window.rootViewController presentViewController:alert animated:YES completion:nil];
             }
             if (!exportedUser)
                 return;
@@ -711,7 +698,7 @@
                 }
             }]];
             [alert addAction:[UIAlertAction actionWithTitle:@"Continue" style:UIAlertActionStyleCancel handler:nil]];
-            [self.navigationController presentViewController:alert animated:YES completion:nil];
+            [self.window.rootViewController presentViewController:alert animated:YES completion:nil];
         } );
     }];
 }
@@ -735,7 +722,7 @@
                             ^(UIAlertAction *action) { [self migrateFor:user_]; }]];
 
                 PearlMainQueue( ^{
-                    [self.navigationController presentViewController:usersSheet animated:YES completion:nil];
+                    [self.window.rootViewController presentViewController:usersSheet animated:YES completion:nil];
                 } );
             }];
             return;
@@ -757,7 +744,7 @@
                                         ^(UIAlertAction *action) { setResult( alert.textFields.firstObject.text ); }]];
                                 [alert addAction:[UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel handler:
                                         ^(UIAlertAction *action) { setResult( nil ); }]];
-                                [self.navigationController presentViewController:alert animated:YES completion:nil];
+                                [self.window.rootViewController presentViewController:alert animated:YES completion:nil];
                             } );
                         } );
                     } error:&error];
@@ -769,7 +756,7 @@
                                                                                    message:[error localizedDescription]
                                                                             preferredStyle:UIAlertControllerStyleAlert];
                     [alert addAction:[UIAlertAction actionWithTitle:@"Okay" style:UIAlertActionStyleCancel handler:nil]];
-                    [self.navigationController presentViewController:alert animated:YES completion:nil];
+                    [self.window.rootViewController presentViewController:alert animated:YES completion:nil];
                 }
                 if (!exportedUser)
                     return;
@@ -784,7 +771,7 @@
     }
 
     else if (self.voltoViewController)
-        [self.navigationController presentViewController:self.voltoViewController animated:YES completion:nil];
+        [self.window.rootViewController presentViewController:self.voltoViewController animated:YES completion:nil];
 }
 
 - (void)changeMasterPasswordFor:(MPUserEntity *)user saveInContext:(NSManagedObjectContext *)moc didResetBlock:(void ( ^ )(void))didReset {
@@ -795,7 +782,7 @@
                         @"Changing your master password will cause all your generated passwords to change!\n"
                         @"Changing the master password back to the old one will cause your passwords to revert as well."
                                                                 preferredStyle:UIAlertControllerStyleAlert];
-        [alert addAction:[UIAlertAction actionWithTitle:@"Abort" style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
+        [alert addAction:[UIAlertAction actionWithTitle:@"Continue" style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
             [moc performBlockAndWait:^{
                 inf( @"Clearing keyID for user: %@.", user.userID );
                 user.keyID = nil;
@@ -808,7 +795,7 @@
                 didReset();
         }]];
         [alert addAction:[UIAlertAction actionWithTitle:@"Abort" style:UIAlertActionStyleCancel handler:nil]];
-        [self.navigationController presentViewController:alert animated:YES completion:nil];
+        [self.window.rootViewController presentViewController:alert animated:YES completion:nil];
     } );
 }
 

platform-darwin/Source/iOS/Storyboard.storyboard

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES" initialViewController="Q1S-vU-GGO">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES" initialViewController="Q1S-vU-GGO">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
@@ -97,10 +97,10 @@
                                                             </constraints>
                                                         </imageView>
                                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="0Sa-Vg-EEI" userLabel="Name Backdrop">
-                                                            <rect key="frame" x="43.5" y="263" width="128.5" height="16"/>
+                                                            <rect key="frame" x="43.5" y="263" width="128" height="16"/>
                                                             <subviews>
                                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalCompressionResistancePriority="1000" text="Maarten Billemont" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" adjustsLetterSpacingToFitWidth="YES" translatesAutoresizingMaskIntoConstraints="NO" id="cLT-s0-4SQ" userLabel="Name Field">
-                                                                    <rect key="frame" x="5" y="0.0" width="118.5" height="16"/>
+                                                                    <rect key="frame" x="5" y="0.0" width="118" height="16"/>
                                                                     <fontDescription key="fontDescription" name="Exo2.0-ExtraBold" family="Exo 2.0" pointSize="13"/>
                                                                     <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                                     <nil key="highlightedColor"/>
@@ -288,14 +288,14 @@
                                                 </connections>
                                             </button>
                                             <view userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="069-Pu-yXe" userLabel="Thanks Tip">
-                                                <rect key="frame" x="91" y="0.0" width="232.5" height="60"/>
+                                                <rect key="frame" x="90.5" y="0.0" width="233" height="60"/>
                                                 <subviews>
                                                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="tip_basic_black.png" translatesAutoresizingMaskIntoConstraints="NO" id="Z8P-ZK-aS0">
-                                                        <rect key="frame" x="0.0" y="0.0" width="232.5" height="60"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="233" height="60"/>
                                                         <rect key="contentStretch" x="0.15000000000000002" y="0.0" width="0.69999999999999973" height="1"/>
                                                     </imageView>
                                                     <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Why is Master Password free?" textAlignment="center" lineBreakMode="tailTruncation" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="BLV-3x-Q0z">
-                                                        <rect key="frame" x="20" y="11.5" width="192.5" height="17"/>
+                                                        <rect key="frame" x="20" y="11.5" width="193" height="17"/>
                                                         <fontDescription key="fontDescription" name="Exo2.0-Regular" family="Exo 2.0" pointSize="14"/>
                                                         <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                         <nil key="highlightedColor"/>
@@ -1149,7 +1149,8 @@ Note that this feature requires you enable the Save Password option and have pur
                                     <collectionView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" minimumZoomScale="0.0" maximumZoomScale="0.0" keyboardDismissMode="interactive" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="aXw-tn-8Sj" userLabel="Password Collection">
                                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                                         <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
-                                        <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" sectionInsetReference="safeArea" id="Mv1-29-TWx">
+                                        <edgeInsets key="layoutMargins" top="100" left="0.0" bottom="0.0" right="0.0"/>
+                                        <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" sectionInsetReference="layoutMargins" id="Mv1-29-TWx">
                                             <size key="itemSize" width="355" height="100"/>
                                             <size key="headerReferenceSize" width="0.0" height="0.0"/>
                                             <size key="footerReferenceSize" width="0.0" height="0.0"/>
@@ -1157,7 +1158,7 @@ Note that this feature requires you enable the Save Password option and have pur
                                         </collectionViewFlowLayout>
                                         <cells>
                                             <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="MPSiteCell" id="W2g-yv-V3V" customClass="MPSiteCell">
-                                                <rect key="frame" x="29.5" y="10" width="355" height="100"/>
+                                                <rect key="frame" x="29.5" y="110" width="355" height="100"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                                 <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO">
                                                     <rect key="frame" x="0.0" y="0.0" width="355" height="100"/>
@@ -2240,7 +2241,7 @@ Suspendisse potenti. Etiam ut nisi id augue tempor ultrices et sit amet sapien.
                                 <dataDetectorType key="dataDetectorTypes" link="YES"/>
                             </textView>
                             <toolbar contentMode="scaleToFill" barStyle="black" translatesAutoresizingMaskIntoConstraints="NO" id="WmH-JB-jp2">
-                                <rect key="frame" x="0.0" y="764" width="414" height="49"/>
+                                <rect key="frame" x="0.0" y="769" width="414" height="44"/>
                                 <items>
                                     <barButtonItem systemItem="compose" id="BSV-3i-01h">
                                         <connections>
@@ -2255,7 +2256,7 @@ Suspendisse potenti. Etiam ut nisi id augue tempor ultrices et sit amet sapien.
                                     <barButtonItem systemItem="flexibleSpace" id="Lp4-ss-KxI"/>
                                     <barButtonItem style="plain" id="aMS-HH-mnE">
                                         <segmentedControl key="customView" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="bar" selectedSegmentIndex="0" id="lxp-wx-uCy">
-                                            <rect key="frame" x="267" y="11" width="127" height="32"/>
+                                            <rect key="frame" x="267" y="6" width="127" height="32"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                             <segments>
                                                 <segment title="Normal"/>
@@ -2755,7 +2756,7 @@ Invested: 3.7 work hours</string>
                                             <rect key="frame" x="188.5" y="20" width="37" height="37"/>
                                         </activityIndicatorView>
                                         <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" verticalCompressionResistancePriority="751" text="Loading products..." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="12" adjustsLetterSpacingToFitWidth="YES" translatesAutoresizingMaskIntoConstraints="NO" id="NPg-it-juF">
-                                            <rect key="frame" x="134.5" y="97" width="145.5" height="25"/>
+                                            <rect key="frame" x="134" y="97" width="146" height="25"/>
                                             <fontDescription key="fontDescription" name="Exo2.0-Regular" family="Exo 2.0" pointSize="17"/>
                                             <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                             <nil key="highlightedColor"/>
@@ -3271,7 +3272,7 @@ Ut in geometria, prima si dederis, danda sunt omnia. Nonne igitur tibi videntur,
         </scene>
     </scenes>
     <inferredMetricsTieBreakers>
-        <segue reference="k2G-nL-x3l"/>
+        <segue reference="Ql4-wf-T8u"/>
         <segue reference="gtb-zE-u9H"/>
     </inferredMetricsTieBreakers>
     <color key="tintColor" white="1" alpha="1" colorSpace="calibratedWhite"/>