The root of the users VC interferes with touches from the sites VC when it appears.

Fix migration tips no longer interactable when logged in.
Move Spectre migration dialogs fully global & make closeable.
2021-11-03 21:13:04 -04:00 · 2021-11-03 16:51:37 -04:00 · 2021-11-01 21:16:00 -04:00 · 2021-11-01 20:52:04 -04:00 · 2021-11-01 20:07:13 -04:00 · 2021-11-01 20:06:37 -04:00
12 changed files with 160 additions and 161 deletions
--- a/platform-darwin/Source/MPAlgorithmV0.m
+++ b/platform-darwin/Source/MPAlgorithmV0.m
@ -146,10 +146,10 @@ static NSOperationQueue *_mpwQueue = nil;

 - (NSString *)nameOfType:(MPResultType)type {

-    if (!type)
-        return nil;
-
    switch (type) {
+        case MPResultTypeNone:
+            return @"None";
+
        case MPResultTypeTemplateMaximum:
            return @"Maximum Security Password";

@ -189,10 +189,10 @@ static NSOperationQueue *_mpwQueue = nil;

 - (NSString *)shortNameOfType:(MPResultType)type {

-    if (!type)
-        return nil;
-
    switch (type) {
+        case MPResultTypeNone:
+            return @"None";
+
        case MPResultTypeTemplateMaximum:
            return @"Maximum";

@ -237,9 +237,6 @@ static NSOperationQueue *_mpwQueue = nil;

 - (Class)classOfType:(MPResultType)type {

-    if (!type)
-        Throw( @"No type given." );
-
    switch (type) {
        case MPResultTypeTemplateMaximum:
            return [MPGeneratedSiteEntity class];
@ -271,6 +268,7 @@ static NSOperationQueue *_mpwQueue = nil;
        case MPResultTypeStatefulDevice:
            return [MPStoredSiteEntity class];

+        case MPResultTypeNone:
        case MPResultTypeDeriveKey:
            break;
    }
@ -322,6 +320,7 @@ static NSOperationQueue *_mpwQueue = nil;
            return MPResultTypeStatefulDevice;
        case MPResultTypeStatefulDevice:
            return MPResultTypeTemplatePhrase;
+        case MPResultTypeNone:
        case MPResultTypeDeriveKey:
            break;
    }
@ -531,8 +530,13 @@ static NSOperationQueue *_mpwQueue = nil;
            return;
        }

-        case MPResultTypeDeriveKey:
+        case MPResultTypeNone:
+        case MPResultTypeDeriveKey: {
+            PearlNotMainQueue( ^{
+                resultBlock( nil );
+            } );
            return;
+        }
    }

    Throw( @"Type not supported: %lu", (long)type );
--- a/platform-darwin/Source/iOS/MPCombinedViewController.m
+++ b/platform-darwin/Source/iOS/MPCombinedViewController.m
@ -124,7 +124,7 @@

    switch (self.mode) {
        case MPCombinedModeUserSelection: {
-            self.usersVC.view.userInteractionEnabled = YES;
+            self.usersVC.userSelectionContainer.userInteractionEnabled = YES;
            [self.usersVC setActive:YES animated:animated];
            if (self.sitesVC) {
                MPSitesSegue *segue = [[MPSitesSegue alloc] initWithIdentifier:@"passwords" source:self.sitesVC destination:self];
@ -134,7 +134,7 @@
            break;
        }
        case MPCombinedModePasswordSelection: {
-            self.usersVC.view.userInteractionEnabled = NO;
+            self.usersVC.userSelectionContainer.userInteractionEnabled = NO;
            [self.usersVC setActive:NO animated:animated];
            [self performSegueWithIdentifier:@"passwords" sender:@{ @"animated": @(animated) }];
            break;
--- a/platform-darwin/Source/iOS/MPSitesViewController.h
+++ b/platform-darwin/Source/iOS/MPSitesViewController.h
@ -30,8 +30,6 @@
@property(nonatomic, strong) IBOutlet UIView *badNameTipContainer;
@property(nonatomic, strong) IBOutlet UIView *popdownView;
@property(nonatomic, strong) IBOutlet UIView *popdownContainer;
-@property(nonatomic, strong) IBOutlet UIView *spectreInstallAlert;
-@property(nonatomic, strong) IBOutlet UIView *spectreMigrateAlert;

@property(assign, nonatomic) BOOL active;

@ -39,6 +37,5 @@
 - (void)reloadSites;

 - (IBAction)dismissPopdown:(id)sender;
- (IBAction)upgradeSpectre:(UIButton *)sender;

@end
--- a/platform-darwin/Source/iOS/MPSitesViewController.m
+++ b/platform-darwin/Source/iOS/MPSitesViewController.m
@ -74,7 +74,6 @@ typedef NS_OPTIONS( NSUInteger, MPPasswordsTips ) {

    [self registerObservers];
    [self updateConfigKey:nil];
-    [self updateSpectreAlerts];

    static NSRegularExpression *bareHostRE = nil;
    static dispatch_once_t once = 0;
@ -318,7 +317,6 @@ typedef NS_OPTIONS( NSUInteger, MPPasswordsTips ) {
    PearlAddNotificationObserver( UIApplicationWillEnterForegroundNotification, nil, [NSOperationQueue mainQueue],
            ^(MPSitesViewController *self, NSNotification *note) {
                [self viewWillAppear:YES];
-                [self updateSpectreAlerts];
            } );
    PearlAddNotificationObserver( MPSignedOutNotification, nil, nil,
            ^(MPSitesViewController *self, NSNotification *note) {
@ -466,24 +464,4 @@ typedef NS_OPTIONS( NSUInteger, MPPasswordsTips ) {
        self.popdownToTopConstraint.priority = UILayoutPriorityDefaultHigh;
 }

- (IBAction)upgradeSpectre:(UIButton *)sender {
-
-    [[MPiOSAppDelegate get] migrateFor:[MPiOSAppDelegate get].activeUserForMainThread];
-}
-
-#pragma mark - Private
-
- (void)updateSpectreAlerts {
-
-    BOOL spectreInstalled = [UIApp canOpenURL:[[NSURL alloc] initWithString:@"spectre:"]];
-    if (spectreInstalled) {
-        self.spectreInstallAlert.visible = NO;
-        self.spectreMigrateAlert.visible = YES;
-    }
-    else {
-        self.spectreInstallAlert.visible = [MPiOSAppDelegate get].spectreViewController != nil;
-        self.spectreMigrateAlert.visible = NO;
-    }
-}
-
@end
--- a/platform-darwin/Source/iOS/MPUsersViewController.h
+++ b/platform-darwin/Source/iOS/MPUsersViewController.h
@ -36,11 +36,13 @@
@property(weak, nonatomic) IBOutlet UIButton *previousAvatarButton;
@property(weak, nonatomic) IBOutlet NSLayoutConstraint *keyboardHeightConstraint;
@property(weak, nonatomic) IBOutlet UIView *spectreInstallAlert;
+@property(weak, nonatomic) IBOutlet UIView *spectreMigrateAlert;

@property(assign, nonatomic, readonly) BOOL active;

 - (void)setActive:(BOOL)active animated:(BOOL)animated;
 - (IBAction)changeAvatar:(UIButton *)sender;
 - (IBAction)upgradeSpectre:(UIButton *)sender;
+- (IBAction)dismissSpectre:(UIButton *)sender;

@end
--- a/platform-darwin/Source/iOS/MPUsersViewController.m
+++ b/platform-darwin/Source/iOS/MPUsersViewController.m
@ -733,9 +733,11 @@ referenceSizeForFooterInSection:(NSInteger)section {
    BOOL spectreInstalled = [UIApp canOpenURL:[[NSURL alloc] initWithString:@"spectre:"]];
    if (spectreInstalled) {
        self.spectreInstallAlert.visible = NO;
+        self.spectreMigrateAlert.visible = YES;
    }
    else {
        self.spectreInstallAlert.visible = [MPiOSAppDelegate get].spectreViewController != nil;
+        self.spectreMigrateAlert.visible = NO;
    }
 }

@ -922,7 +924,13 @@ referenceSizeForFooterInSection:(NSInteger)section {

 - (IBAction)upgradeSpectre:(UIButton *)sender {

-    [[MPiOSAppDelegate get] migrateFor:nil];
+    [[MPiOSAppDelegate get] migrateFor:[MPiOSAppDelegate get].activeUserForMainThread];
+}
+
+- (IBAction)dismissSpectre:(UIButton *)sender {
+
+    self.spectreInstallAlert.visible = NO;
+    self.spectreMigrateAlert.visible = NO;
 }

@end
--- a/platform-darwin/Source/iOS/MPiOSAppDelegate.m
+++ b/platform-darwin/Source/iOS/MPiOSAppDelegate.m
@ -132,7 +132,9 @@ MP_LIBS_END
            [self updateConfigKey:note.object];
        } );
        PearlAddNotificationObserver( NSUserDefaultsDidChangeNotification, nil, nil, ^(id self, NSNotification *note) {
-            [[NSNotificationCenter defaultCenter] postNotificationName:MPCheckConfigNotification object:nil];
+            PearlMainQueueOperation( ^{
+                [[NSNotificationCenter defaultCenter] postNotificationName:MPCheckConfigNotification object:nil];
+            } );
        } );
    }
    @catch (id exception) {
--- a/platform-darwin/Source/iOS/Storyboard.storyboard
+++ b/platform-darwin/Source/iOS/Storyboard.storyboard
@ -384,38 +384,6 @@
                                            <userDefinedRuntimeAttribute type="boolean" keyPath="visible" value="NO"/>
                                        </userDefinedRuntimeAttributes>
                                    </view>
-                                    <view opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="tOT-TZ-yse" userLabel="Install Spectre Tip">
-                                        <rect key="frame" x="0.0" y="740" width="414" height="156"/>
-                                        <subviews>
-                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ded-Ii-gyf">
-                                                <rect key="frame" x="8" y="8" width="398" height="106"/>
-                                                <state key="normal" backgroundImage="tip_alert_black"/>
-                                                <connections>
-                                                    <action selector="upgradeSpectre:" destination="S8q-YF-Kt9" eventType="touchUpInside" id="Mmn-CK-C45"/>
-                                                </connections>
-                                            </button>
-                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bqa-qH-Bia">
-                                                <rect key="frame" x="80" y="15" width="315" height="84"/>
-                                                <string key="text">The next generation of password security is now called «Spectre»:
-Tap to install the upgrade.
-
-This app is now out of maintenance.</string>
-                                                <fontDescription key="fontDescription" name="Exo2.0-Regular" family="Exo 2.0" pointSize="14"/>
-                                                <color key="textColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                                <nil key="highlightedColor"/>
-                                            </label>
-                                        </subviews>
-                                        <constraints>
-                                            <constraint firstItem="bqa-qH-Bia" firstAttribute="trailing" secondItem="ded-Ii-gyf" secondAttribute="trailing" constant="-11" id="2gN-5G-boh"/>
-                                            <constraint firstItem="ded-Ii-gyf" firstAttribute="leading" secondItem="tOT-TZ-yse" secondAttribute="leadingMargin" id="3fy-Qc-KlM"/>
-                                            <constraint firstItem="bqa-qH-Bia" firstAttribute="top" secondItem="ded-Ii-gyf" secondAttribute="top" constant="7" id="8Rd-qC-ttx"/>
-                                            <constraint firstItem="bqa-qH-Bia" firstAttribute="bottom" secondItem="ded-Ii-gyf" secondAttribute="bottom" constant="-15" id="VLO-QZ-6Jf"/>
-                                            <constraint firstItem="ded-Ii-gyf" firstAttribute="top" secondItem="tOT-TZ-yse" secondAttribute="topMargin" id="Y6k-Ep-Skv"/>
-                                            <constraint firstAttribute="trailingMargin" secondItem="ded-Ii-gyf" secondAttribute="trailing" id="d8e-pL-U3v"/>
-                                            <constraint firstItem="bqa-qH-Bia" firstAttribute="leading" secondItem="ded-Ii-gyf" secondAttribute="leading" constant="72" id="nD7-ie-dHF"/>
-                                            <constraint firstAttribute="bottomMargin" secondItem="ded-Ii-gyf" secondAttribute="bottom" id="xzD-vT-p1O"/>
-                                        </constraints>
-                                    </view>
                                </subviews>
                                <constraints>
                                    <constraint firstAttribute="centerX" secondItem="VDd-oM-ZOO" secondAttribute="centerX" id="0j9-vM-WFA"/>
@ -427,12 +395,10 @@ This app is now out of maintenance.</string>
                                    <constraint firstItem="L6J-pd-gcp" firstAttribute="leading" secondItem="rWM-08-aab" secondAttribute="leading" id="BcO-0y-Nih"/>
                                    <constraint firstAttribute="centerX" secondItem="cF4-TE-GEj" secondAttribute="centerX" id="CvC-rv-8KE"/>
                                    <constraint firstItem="qp1-nX-o4i" firstAttribute="leading" secondItem="rWM-08-aab" secondAttribute="leading" id="DY1-Ad-Mbi"/>
-                                    <constraint firstAttribute="trailing" secondItem="tOT-TZ-yse" secondAttribute="trailing" id="Fe4-eR-tJB"/>
                                    <constraint firstItem="L6J-pd-gcp" firstAttribute="top" secondItem="rWM-08-aab" secondAttribute="top" id="Ldu-eE-xi7"/>
                                    <constraint firstItem="0Um-Ot-hI6" firstAttribute="centerX" secondItem="zCP-wo-gTl" secondAttribute="centerX" id="OJA-7u-h1T"/>
                                    <constraint firstAttribute="bottom" secondItem="XEP-O3-ayG" secondAttribute="bottom" id="PpW-Of-YOc"/>
                                    <constraint firstAttribute="trailing" secondItem="fUK-gJ-NRE" secondAttribute="trailing" id="TBr-pS-kEK"/>
-                                    <constraint firstItem="tOT-TZ-yse" firstAttribute="leading" secondItem="rWM-08-aab" secondAttribute="leading" id="UKi-XP-1Kp"/>
                                    <constraint firstItem="cF4-TE-GEj" firstAttribute="top" relation="greaterThanOrEqual" secondItem="L6J-pd-gcp" secondAttribute="top" constant="4" id="VHh-25-0mJ"/>
                                    <constraint firstAttribute="trailing" secondItem="qp1-nX-o4i" secondAttribute="trailing" id="cOq-BS-Xmo"/>
                                    <constraint firstAttribute="centerY" secondItem="VDd-oM-ZOO" secondAttribute="centerY" id="dxP-im-1dM"/>
@ -442,7 +408,88 @@ This app is now out of maintenance.</string>
                                    <constraint firstAttribute="trailing" secondItem="zCP-wo-gTl" secondAttribute="trailing" id="rGd-K4-pHL"/>
                                    <constraint firstAttribute="trailing" secondItem="XEP-O3-ayG" secondAttribute="trailing" id="raD-hD-OYt"/>
                                    <constraint firstItem="9u7-pu-Wtv" firstAttribute="leading" secondItem="rWM-08-aab" secondAttribute="leading" id="sez-BC-G3I"/>
-                                    <constraint firstAttribute="bottom" secondItem="tOT-TZ-yse" secondAttribute="bottom" id="uGl-t4-UKd"/>
+                                </constraints>
+                            </view>
+                            <view opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="tOT-TZ-yse" userLabel="Install Spectre Tip">
+                                <rect key="frame" x="0.0" y="740" width="414" height="156"/>
+                                <subviews>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ded-Ii-gyf" userLabel="Migrate">
+                                        <rect key="frame" x="8" y="8" width="398" height="106"/>
+                                        <state key="normal" backgroundImage="tip_alert_black"/>
+                                        <connections>
+                                            <action selector="upgradeSpectre:" destination="S8q-YF-Kt9" eventType="touchUpInside" id="Mmn-CK-C45"/>
+                                        </connections>
+                                    </button>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bqa-qH-Bia">
+                                        <rect key="frame" x="80" y="15" width="267" height="84"/>
+                                        <string key="text">The next generation of password security is now called «Spectre»:
+Tap to install the upgrade.
+
+This app is now out of maintenance.</string>
+                                        <fontDescription key="fontDescription" name="Exo2.0-Regular" family="Exo 2.0" pointSize="14"/>
+                                        <color key="textColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <button opaque="NO" contentMode="scaleToFill" horizontalCompressionResistancePriority="751" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="tDY-IR-ak2" userLabel="Close">
+                                        <rect key="frame" x="347" y="20" width="47" height="31"/>
+                                        <buttonConfiguration key="configuration" style="plain" title="╳"/>
+                                        <connections>
+                                            <action selector="dismissSpectre:" destination="S8q-YF-Kt9" eventType="touchUpInside" id="7a6-W3-NIK"/>
+                                        </connections>
+                                    </button>
+                                </subviews>
+                                <constraints>
+                                    <constraint firstItem="ded-Ii-gyf" firstAttribute="leading" secondItem="tOT-TZ-yse" secondAttribute="leadingMargin" id="3fy-Qc-KlM"/>
+                                    <constraint firstItem="bqa-qH-Bia" firstAttribute="top" secondItem="ded-Ii-gyf" secondAttribute="top" constant="7" id="8Rd-qC-ttx"/>
+                                    <constraint firstItem="bqa-qH-Bia" firstAttribute="bottom" secondItem="ded-Ii-gyf" secondAttribute="bottom" constant="-15" id="VLO-QZ-6Jf"/>
+                                    <constraint firstItem="ded-Ii-gyf" firstAttribute="top" secondItem="tOT-TZ-yse" secondAttribute="topMargin" id="Y6k-Ep-Skv"/>
+                                    <constraint firstAttribute="trailingMargin" secondItem="ded-Ii-gyf" secondAttribute="trailing" id="d8e-pL-U3v"/>
+                                    <constraint firstAttribute="trailing" secondItem="tDY-IR-ak2" secondAttribute="trailing" constant="20" symbolic="YES" id="lb2-4g-zJV"/>
+                                    <constraint firstItem="bqa-qH-Bia" firstAttribute="leading" secondItem="ded-Ii-gyf" secondAttribute="leading" constant="72" id="nD7-ie-dHF"/>
+                                    <constraint firstItem="tDY-IR-ak2" firstAttribute="top" secondItem="tOT-TZ-yse" secondAttribute="top" constant="20" symbolic="YES" id="pDc-SL-x9W"/>
+                                    <constraint firstItem="tDY-IR-ak2" firstAttribute="leading" secondItem="bqa-qH-Bia" secondAttribute="trailing" id="suM-kx-xRY"/>
+                                    <constraint firstAttribute="bottomMargin" secondItem="ded-Ii-gyf" secondAttribute="bottom" id="xzD-vT-p1O"/>
+                                </constraints>
+                            </view>
+                            <view opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="e7i-8u-nyd" userLabel="Migrate Spectre Tip">
+                                <rect key="frame" x="0.0" y="740" width="414" height="156"/>
+                                <subviews>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="4s3-Ex-jpT" userLabel="Migrate">
+                                        <rect key="frame" x="8" y="8" width="398" height="106"/>
+                                        <state key="normal" backgroundImage="tip_alert_black"/>
+                                        <connections>
+                                            <action selector="upgradeSpectre:" destination="S8q-YF-Kt9" eventType="touchUpInside" id="059-Sa-0EF"/>
+                                        </connections>
+                                    </button>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bWt-lb-7xL">
+                                        <rect key="frame" x="80" y="15" width="267" height="84"/>
+                                        <string key="text">The next generation of password security is now called «Spectre»:
+Tap to copy your user into Spectre.
+
+This app is now out of maintenance.</string>
+                                        <fontDescription key="fontDescription" name="Exo2.0-Regular" family="Exo 2.0" pointSize="14"/>
+                                        <color key="textColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <button opaque="NO" contentMode="scaleToFill" horizontalCompressionResistancePriority="751" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3WO-6r-WEn" userLabel="Close">
+                                        <rect key="frame" x="347" y="20" width="47" height="31"/>
+                                        <buttonConfiguration key="configuration" style="plain" title="╳"/>
+                                        <connections>
+                                            <action selector="dismissSpectre:" destination="S8q-YF-Kt9" eventType="touchUpInside" id="aEC-nX-WeV"/>
+                                        </connections>
+                                    </button>
+                                </subviews>
+                                <constraints>
+                                    <constraint firstItem="3WO-6r-WEn" firstAttribute="leading" secondItem="bWt-lb-7xL" secondAttribute="trailing" id="49f-Eg-XMb"/>
+                                    <constraint firstItem="bWt-lb-7xL" firstAttribute="leading" secondItem="4s3-Ex-jpT" secondAttribute="leading" constant="72" id="4rw-uH-p06"/>
+                                    <constraint firstItem="3WO-6r-WEn" firstAttribute="top" secondItem="e7i-8u-nyd" secondAttribute="top" constant="20" id="50L-TI-WJ8"/>
+                                    <constraint firstItem="bWt-lb-7xL" firstAttribute="top" secondItem="4s3-Ex-jpT" secondAttribute="top" constant="7" id="AwO-Pj-Wnr"/>
+                                    <constraint firstAttribute="bottomMargin" secondItem="4s3-Ex-jpT" secondAttribute="bottom" id="LWF-xQ-l5k"/>
+                                    <constraint firstItem="4s3-Ex-jpT" firstAttribute="leading" secondItem="e7i-8u-nyd" secondAttribute="leadingMargin" id="OKe-0I-vdR"/>
+                                    <constraint firstItem="4s3-Ex-jpT" firstAttribute="top" secondItem="e7i-8u-nyd" secondAttribute="topMargin" id="TRy-eS-Ch4"/>
+                                    <constraint firstAttribute="trailing" secondItem="3WO-6r-WEn" secondAttribute="trailing" constant="20" id="aPO-KL-k9X"/>
+                                    <constraint firstItem="bWt-lb-7xL" firstAttribute="bottom" secondItem="4s3-Ex-jpT" secondAttribute="bottom" constant="-15" id="cYX-vL-MKX"/>
+                                    <constraint firstAttribute="trailingMargin" secondItem="4s3-Ex-jpT" secondAttribute="trailing" id="lRd-Hq-SH2"/>
                                </constraints>
                            </view>
                        </subviews>
@ -451,15 +498,24 @@ This app is now out of maintenance.</string>
                            <constraint firstItem="VGz-R0-vMD" firstAttribute="top" secondItem="X8H-vh-j7B" secondAttribute="bottom" id="8Ed-3Y-ll0"/>
                            <constraint firstAttribute="trailing" secondItem="X8H-vh-j7B" secondAttribute="trailing" id="8Gr-Dq-UpZ"/>
                            <constraint firstAttribute="bottom" secondItem="rWM-08-aab" secondAttribute="bottom" id="9Yx-cj-wHh"/>
+                            <constraint firstItem="tOT-TZ-yse" firstAttribute="leading" secondItem="DOr-Xu-P9q" secondAttribute="leading" id="CKQ-85-U4k"/>
+                            <constraint firstAttribute="bottom" secondItem="e7i-8u-nyd" secondAttribute="bottom" id="G00-FW-tqE"/>
                            <constraint firstItem="X8H-vh-j7B" firstAttribute="top" secondItem="9u7-pu-Wtv" secondAttribute="centerY" priority="500" constant="180" id="Gp5-h6-53S"/>
                            <constraint firstItem="rWM-08-aab" firstAttribute="leading" secondItem="DOr-Xu-P9q" secondAttribute="leading" id="Il8-kg-Dra"/>
                            <constraint firstItem="X8H-vh-j7B" firstAttribute="top" secondItem="fUK-gJ-NRE" secondAttribute="centerY" priority="500" constant="180" id="PgC-ZL-cQo"/>
                            <constraint firstAttribute="trailing" secondItem="rWM-08-aab" secondAttribute="trailing" id="UPP-1n-zIe"/>
                            <constraint firstItem="X8H-vh-j7B" firstAttribute="top" secondItem="qp1-nX-o4i" secondAttribute="bottom" constant="20" id="WdK-tA-njz"/>
+                            <constraint firstItem="e7i-8u-nyd" firstAttribute="leading" secondItem="DOr-Xu-P9q" secondAttribute="leading" id="au3-Bw-ioi"/>
                            <constraint firstItem="X8H-vh-j7B" firstAttribute="leading" secondItem="DOr-Xu-P9q" secondAttribute="leading" id="jbn-ko-MPq"/>
+                            <constraint firstAttribute="trailing" secondItem="e7i-8u-nyd" secondAttribute="trailing" id="l3l-d3-Y68"/>
                            <constraint firstItem="zCP-wo-gTl" firstAttribute="top" secondItem="zp4-4O-wZI" secondAttribute="bottom" id="nAS-Jf-o5m"/>
+                            <constraint firstAttribute="bottom" secondItem="tOT-TZ-yse" secondAttribute="bottom" id="oNx-xq-124"/>
+                            <constraint firstAttribute="trailing" secondItem="tOT-TZ-yse" secondAttribute="trailing" id="wI5-eh-S2b"/>
                            <constraint firstAttribute="top" secondItem="rWM-08-aab" secondAttribute="top" id="xBe-1Q-mz2"/>
                        </constraints>
+                        <userDefinedRuntimeAttributes>
+                            <userDefinedRuntimeAttribute type="boolean" keyPath="ignoreTouches" value="YES"/>
+                        </userDefinedRuntimeAttributes>
                    </view>
                    <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="lightContent"/>
                    <connections>
@ -477,6 +533,8 @@ This app is now out of maintenance.</string>
                        <outlet property="nextAvatarButton" destination="fUK-gJ-NRE" id="5qo-lK-rSa"/>
                        <outlet property="preferencesTipContainer" destination="0Um-Ot-hI6" id="Cv8-Bp-ZZs"/>
                        <outlet property="previousAvatarButton" destination="9u7-pu-Wtv" id="Hgv-lN-S1n"/>
+                        <outlet property="spectreInstallAlert" destination="tOT-TZ-yse" id="2hk-xb-psR"/>
+                        <outlet property="spectreMigrateAlert" destination="e7i-8u-nyd" id="6oI-L9-VgE"/>
                        <outlet property="storeLoadingActivity" destination="VDd-oM-ZOO" id="MJ7-2f-e8n"/>
                        <outlet property="thanksTipContainer" destination="069-Pu-yXe" id="wWf-2X-Ryw"/>
                        <outlet property="userSelectionContainer" destination="rWM-08-aab" id="Yme-hX-8P0"/>
@ -484,7 +542,7 @@ This app is now out of maintenance.</string>
                </viewController>
                <placeholder placeholderIdentifier="IBFirstResponder" id="8hZ-Tb-wZw" userLabel="First Responder" sceneMemberID="firstResponder"/>
            </objects>
-            <point key="canvasLocation" x="2041" y="226"/>
+            <point key="canvasLocation" x="2040.5797101449277" y="225.66964285714283"/>
        </scene>
        <!--Web View Controller-->
        <scene sceneID="JQz-u7-oA7">
@ -968,7 +1026,7 @@ Note that this feature requires you enable the Save Password option and have pur
                                        <rect key="frame" x="0.0" y="1544.5" width="414" height="250"/>
                                        <autoresizingMask key="autoresizingMask"/>
                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="9QG-lM-ymM" id="hK8-XQ-lLz">
-                                            <rect key="frame" x="0.0" y="0.0" width="395" height="250"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="396.5" height="250"/>
                                            <autoresizingMask key="autoresizingMask"/>
                                            <subviews>
                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" ambiguous="YES" text="Feedback" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5zr-Nr-zRb">
@ -1000,7 +1058,7 @@ Note that this feature requires you enable the Save Password option and have pur
                                        <rect key="frame" x="0.0" y="1794.5" width="414" height="250"/>
                                        <autoresizingMask key="autoresizingMask"/>
                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="UdB-BV-AHA" id="V2Y-nu-jhZ">
-                                            <rect key="frame" x="0.0" y="0.0" width="395" height="250"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="396.5" height="250"/>
                                            <autoresizingMask key="autoresizingMask"/>
                                            <subviews>
                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" ambiguous="YES" text="Check For Inconsistencies" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WXh-sg-l2h">
@ -1032,7 +1090,7 @@ Note that this feature requires you enable the Save Password option and have pur
                                        <rect key="frame" x="0.0" y="2044.5" width="414" height="250"/>
                                        <autoresizingMask key="autoresizingMask"/>
                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="IVT-Rs-nTu" id="Q5J-2f-mmz">
-                                            <rect key="frame" x="0.0" y="0.0" width="395" height="250"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="396.5" height="250"/>
                                            <autoresizingMask key="autoresizingMask"/>
                                            <subviews>
                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" ambiguous="YES" text="Export" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KEh-y5-Obc">
@ -1707,70 +1765,6 @@ eg. apple.com, rmitchell@twitter.com</string>
                                </view>
                                <blurEffect style="regular"/>
                            </visualEffectView>
-                            <view opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3ve-eR-1IW">
-                                <rect key="frame" x="0.0" y="740" width="414" height="156"/>
-                                <subviews>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="PWC-I5-RSl">
-                                        <rect key="frame" x="8" y="8" width="398" height="106"/>
-                                        <state key="normal" backgroundImage="tip_alert_black"/>
-                                        <connections>
-                                            <action selector="upgradeSpectre:" destination="nkY-z6-8jd" eventType="touchUpInside" id="8KJ-vm-3D0"/>
-                                        </connections>
-                                    </button>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XgC-Ky-oVC">
-                                        <rect key="frame" x="80" y="15" width="315" height="84"/>
-                                        <string key="text">The next generation of password security is now called «Spectre»:
-Tap to install the upgrade.
-
-This app is now out of maintenance.</string>
-                                        <fontDescription key="fontDescription" name="Exo2.0-Regular" family="Exo 2.0" pointSize="14"/>
-                                        <color key="textColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                        <nil key="highlightedColor"/>
-                                    </label>
-                                </subviews>
-                                <constraints>
-                                    <constraint firstItem="PWC-I5-RSl" firstAttribute="top" secondItem="3ve-eR-1IW" secondAttribute="topMargin" id="0gi-j6-mfg"/>
-                                    <constraint firstItem="XgC-Ky-oVC" firstAttribute="leading" secondItem="PWC-I5-RSl" secondAttribute="leading" constant="72" id="E88-An-rzp"/>
-                                    <constraint firstAttribute="bottomMargin" secondItem="PWC-I5-RSl" secondAttribute="bottom" id="FrN-5c-k1V"/>
-                                    <constraint firstItem="XgC-Ky-oVC" firstAttribute="trailing" secondItem="PWC-I5-RSl" secondAttribute="trailing" constant="-11" id="Scl-zE-fTg"/>
-                                    <constraint firstAttribute="trailingMargin" secondItem="PWC-I5-RSl" secondAttribute="trailing" id="gwp-DL-I06"/>
-                                    <constraint firstItem="XgC-Ky-oVC" firstAttribute="bottom" secondItem="PWC-I5-RSl" secondAttribute="bottom" constant="-15" id="hFa-k3-yr9"/>
-                                    <constraint firstItem="PWC-I5-RSl" firstAttribute="leading" secondItem="3ve-eR-1IW" secondAttribute="leadingMargin" id="jod-TY-7Iu"/>
-                                    <constraint firstItem="XgC-Ky-oVC" firstAttribute="top" secondItem="PWC-I5-RSl" secondAttribute="top" constant="7" id="yjZ-x1-6JY"/>
-                                </constraints>
-                            </view>
-                            <view opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="67c-5R-Foa">
-                                <rect key="frame" x="0.0" y="740" width="414" height="156"/>
-                                <subviews>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="EZK-er-8ql">
-                                        <rect key="frame" x="8" y="8" width="398" height="106"/>
-                                        <state key="normal" backgroundImage="tip_alert_black"/>
-                                        <connections>
-                                            <action selector="upgradeSpectre:" destination="nkY-z6-8jd" eventType="touchUpInside" id="P4a-tL-9yX"/>
-                                        </connections>
-                                    </button>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fLB-gA-32p">
-                                        <rect key="frame" x="80" y="15" width="315" height="84"/>
-                                        <string key="text">The next generation of password security is now called «Spectre»:
-Tap to copy this user into Spectre.
-
-This app is now out of maintenance.</string>
-                                        <fontDescription key="fontDescription" name="Exo2.0-Regular" family="Exo 2.0" pointSize="14"/>
-                                        <color key="textColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                        <nil key="highlightedColor"/>
-                                    </label>
-                                </subviews>
-                                <constraints>
-                                    <constraint firstAttribute="trailingMargin" secondItem="EZK-er-8ql" secondAttribute="trailing" id="2v6-0n-EXu"/>
-                                    <constraint firstItem="fLB-gA-32p" firstAttribute="bottom" secondItem="EZK-er-8ql" secondAttribute="bottom" constant="-15" id="KET-Ct-225"/>
-                                    <constraint firstAttribute="bottomMargin" secondItem="EZK-er-8ql" secondAttribute="bottom" id="LqJ-v9-IDf"/>
-                                    <constraint firstItem="fLB-gA-32p" firstAttribute="trailing" secondItem="EZK-er-8ql" secondAttribute="trailing" constant="-11" id="ivM-cA-Fn9"/>
-                                    <constraint firstItem="fLB-gA-32p" firstAttribute="leading" secondItem="EZK-er-8ql" secondAttribute="leading" constant="72" id="iwL-1a-Tgo"/>
-                                    <constraint firstItem="fLB-gA-32p" firstAttribute="top" secondItem="EZK-er-8ql" secondAttribute="top" constant="7" id="mHI-WQ-tMx"/>
-                                    <constraint firstItem="EZK-er-8ql" firstAttribute="top" secondItem="67c-5R-Foa" secondAttribute="topMargin" id="xMX-Iy-gkw"/>
-                                    <constraint firstItem="EZK-er-8ql" firstAttribute="leading" secondItem="67c-5R-Foa" secondAttribute="leadingMargin" id="ycd-o8-QVl"/>
-                                </constraints>
-                            </view>
                            <view opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="XNM-XQ-rMe" userLabel="Popdown">
                                <rect key="frame" x="0.0" y="-896" width="414" height="896"/>
                                <subviews>
@ -1814,13 +1808,8 @@ This app is now out of maintenance.</string>
                        </subviews>
                        <color key="backgroundColor" red="0.1215686275" green="0.12941176469999999" blue="0.14117647059999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                        <constraints>
-                            <constraint firstAttribute="trailing" secondItem="67c-5R-Foa" secondAttribute="trailing" id="0mY-Tq-ZT4"/>
                            <constraint firstItem="cHF-cD-2Ge" firstAttribute="top" secondItem="XNM-XQ-rMe" secondAttribute="bottom" id="6V9-tX-50t"/>
-                            <constraint firstAttribute="trailing" secondItem="3ve-eR-1IW" secondAttribute="trailing" id="7hd-C3-Akk"/>
-                            <constraint firstAttribute="bottom" secondItem="67c-5R-Foa" secondAttribute="bottom" id="8xp-Si-tWG"/>
                            <constraint firstAttribute="top" secondItem="XNM-XQ-rMe" secondAttribute="bottom" priority="750" id="BdD-Kc-eHl"/>
-                            <constraint firstItem="67c-5R-Foa" firstAttribute="leading" secondItem="tI8-OT-LrO" secondAttribute="leading" id="Ftn-Yi-mdI"/>
-                            <constraint firstAttribute="bottom" secondItem="3ve-eR-1IW" secondAttribute="bottom" id="GOa-ky-jfJ"/>
                            <constraint firstItem="uuT-jm-2La" firstAttribute="bottom" secondItem="S9X-2T-e1e" secondAttribute="bottom" priority="500" constant="44" id="HAi-jL-BdJ"/>
                            <constraint firstAttribute="trailing" secondItem="K2e-Gh-7hH" secondAttribute="trailing" id="Hnk-mU-GSd"/>
                            <constraint firstAttribute="top" secondItem="cHF-cD-2Ge" secondAttribute="bottom" priority="1" id="JO5-ph-0ce"/>
@ -1832,7 +1821,6 @@ This app is now out of maintenance.</string>
                            <constraint firstItem="cHF-cD-2Ge" firstAttribute="leading" secondItem="tI8-OT-LrO" secondAttribute="leading" id="TJC-eP-DDE"/>
                            <constraint firstItem="uuT-jm-2La" firstAttribute="bottom" secondItem="VOY-zU-XQR" secondAttribute="bottom" id="U4C-1P-lIR"/>
                            <constraint firstItem="K2e-Gh-7hH" firstAttribute="height" secondItem="tI8-OT-LrO" secondAttribute="height" id="Xfe-XT-eOn"/>
-                            <constraint firstItem="3ve-eR-1IW" firstAttribute="leading" secondItem="tI8-OT-LrO" secondAttribute="leading" id="bKZ-qF-SL5"/>
                            <constraint firstAttribute="trailing" secondItem="XNM-XQ-rMe" secondAttribute="trailing" id="bgl-u9-shU"/>
                            <constraint firstItem="K2e-Gh-7hH" firstAttribute="top" secondItem="tI8-OT-LrO" secondAttribute="bottom" priority="1" id="dNt-uf-8BC"/>
                            <constraint firstItem="K2e-Gh-7hH" firstAttribute="top" secondItem="tI8-OT-LrO" secondAttribute="top" priority="500" id="vtB-e4-L8o"/>
@ -1851,8 +1839,6 @@ This app is now out of maintenance.</string>
                        <outlet property="popdownView" destination="XNM-XQ-rMe" id="FaW-4m-Fff"/>
                        <outlet property="searchBar" destination="aGs-1S-aC3" id="rTp-DP-rIz"/>
                        <outlet property="sitesToBottomConstraint" destination="dNt-uf-8BC" id="Ta6-eL-z7w"/>
-                        <outlet property="spectreInstallAlert" destination="3ve-eR-1IW" id="Ah5-OX-XhQ"/>
-                        <outlet property="spectreMigrateAlert" destination="67c-5R-Foa" id="aTi-fu-opO"/>
                        <segue destination="z9O-w0-6oR" kind="modal" identifier="guide" id="Ql4-wf-T8u"/>
                        <segue destination="Foa-Er-RBr" kind="custom" identifier="message" customClass="MPOverlaySegue" id="Xne-Sm-HQt"/>
                    </connections>
--- a/platform-independent/c/core/src/mpw-algorithm.c
+++ b/platform-independent/c/core/src/mpw-algorithm.c
@ -122,7 +122,10 @@ const char *mpw_site_result(
        return NULL;
    }

-    if (resultType & MPResultTypeClassTemplate) {
+    if (resultType == MPResultTypeNone) {
+        return NULL;
+    }
+    else if (resultType & MPResultTypeClassTemplate) {
        switch (algorithmVersion) {
            case MPAlgorithmVersionV0:
                return mpw_site_template_password_v0( masterKey, siteKey, resultType, resultParam );
@ -203,6 +206,10 @@ const char *mpw_site_state(
        return NULL;
    }

+    if (resultType == MPResultTypeNone) {
+        return NULL;
+    }
+
    switch (algorithmVersion) {
        case MPAlgorithmVersionV0:
            return mpw_site_state_v0( masterKey, siteKey, resultType, resultParam );
--- a/platform-independent/c/core/src/mpw-marshal.c
+++ b/platform-independent/c/core/src/mpw-marshal.c
@ -93,7 +93,7 @@ MPMarshalledUser *mpw_marshal_user(
            .fullName = mpw_strdup( fullName ),
            .identicon = MPIdenticonUnset,
            .keyID = NULL,
-            .defaultType = MPResultTypeDefault,
+            .defaultType = MPResultTypeDefaultResult,
            .lastUsed = 0,

            .sites_count = 0,
@ -122,7 +122,7 @@ MPMarshalledSite *mpw_marshal_site(
            .resultType = resultType,
            .resultState = NULL,

-            .loginType = MPResultTypeTemplateName,
+            .loginType = MPResultTypeDefaultLogin,
            .loginState = NULL,

            .url = NULL,
@ -864,7 +864,7 @@ static void mpw_marshal_read_flat(
    char *fullName = NULL, *keyID = NULL;
    MPAlgorithmVersion algorithm = MPAlgorithmVersionCurrent;
    MPIdenticon identicon = MPIdenticonUnset;
-    MPResultType defaultType = MPResultTypeDefault;
+    MPResultType defaultType = MPResultTypeDefaultResult;
    time_t exportDate = 0;
    bool headerStarted = false, headerEnded = false, importRedacted = false;
    for (const char *endOfLine, *positionInLine = in; (endOfLine = strstr( positionInLine, "\n" )); positionInLine = endOfLine + 1) {
@ -1014,13 +1014,14 @@ static void mpw_marshal_read_flat(
                mpw_marshal_error( file, MPMarshalErrorIllegal, "Invalid site last used: %s: %s", siteName, str_lastUsed );
                continue;
            }
+            MPResultType siteLoginType = siteLoginState && strlen( siteLoginState )? MPResultTypeStatefulPersonal: MPResultTypeNone;

            char dateString[21];
            mpw_marshal_data_set_num( siteCounter, file->data, "sites", siteName, "counter", NULL );
            mpw_marshal_data_set_num( siteAlgorithm, file->data, "sites", siteName, "algorithm", NULL );
            mpw_marshal_data_set_num( siteType, file->data, "sites", siteName, "type", NULL );
            mpw_marshal_data_set_str( siteResultState, file->data, "sites", siteName, "password", NULL );
-            mpw_marshal_data_set_num( MPResultTypeDefault, file->data, "sites", siteName, "login_type", NULL );
+            mpw_marshal_data_set_num( siteLoginType, file->data, "sites", siteName, "login_type", NULL );
            mpw_marshal_data_set_str( siteLoginState, file->data, "sites", siteName, "login_name", NULL );
            mpw_marshal_data_set_num( strtol( str_uses, NULL, 10 ), file->data, "sites", siteName, "uses", NULL );
            if (strftime( dateString, sizeof( dateString ), "%FT%TZ", gmtime( &siteLastUsed ) ))
@ -1150,7 +1151,7 @@ MPMarshalledUser *mpw_marshal_auth(
    }
    MPIdenticon identicon = mpw_identicon_encoded( mpw_marshal_data_get_str( file->data, "user", "identicon", NULL ) );
    const char *keyID = mpw_marshal_data_get_str( file->data, "user", "key_id", NULL );
-    MPResultType defaultType = mpw_default_n( MPResultTypeDefault, mpw_marshal_data_get_num( file->data, "user", "default_type", NULL ) );
+    MPResultType defaultType = mpw_default_n( MPResultTypeDefaultResult, mpw_marshal_data_get_num( file->data, "user", "default_type", NULL ) );
    if (!mpw_type_short_name( defaultType )) {
        mpw_marshal_error( file, MPMarshalErrorIllegal, "Invalid user default type: %u", defaultType );
        return NULL;
@ -1216,7 +1217,7 @@ MPMarshalledUser *mpw_marshal_auth(
            return NULL;
        }
        const char *siteResultState = mpw_marshal_data_get_str( siteData, "password", NULL );
-        MPResultType siteLoginType = mpw_default_n( MPResultTypeTemplateName, mpw_marshal_data_get_num( siteData, "login_type", NULL ) );
+        MPResultType siteLoginType = mpw_default_n( MPResultTypeDefaultLogin, mpw_marshal_data_get_num( siteData, "login_type", NULL ) );
        if (!mpw_type_short_name( siteLoginType )) {
            mpw_marshal_error( file, MPMarshalErrorIllegal, "Invalid site login type: %s: %u", siteName, siteLoginType );
            mpw_free( &masterKey, MPMasterKeySize );
@ -1258,10 +1259,10 @@ MPMarshalledUser *mpw_marshal_auth(
                return NULL;
            }

-            if (siteResultState && strlen( siteResultState ))
+            if (siteResultState && strlen( siteResultState ) && masterKey)
                site->resultState = mpw_site_state( masterKey, site->siteName, site->counter,
                        MPKeyPurposeAuthentication, NULL, site->resultType, siteResultState, site->algorithm );
-            if (siteLoginState && strlen( siteLoginState ))
+            if (siteLoginState && strlen( siteLoginState ) && masterKey)
                site->loginState = mpw_site_state( masterKey, site->siteName, MPCounterValueInitial,
                        MPKeyPurposeIdentification, NULL, site->loginType, siteLoginState, site->algorithm );
        }
@ -1282,7 +1283,7 @@ MPMarshalledUser *mpw_marshal_auth(

            if (!user->redacted) {
                // Clear Text
-                if (answerState && strlen( answerState ))
+                if (answerState && strlen( answerState ) && masterKey)
                    question->state = mpw_site_state( masterKey, site->siteName, MPCounterValueInitial,
                            MPKeyPurposeRecovery, question->keyword, question->type, answerState, site->algorithm );
            }
--- a/platform-independent/c/core/src/mpw-types.c
+++ b/platform-independent/c/core/src/mpw-types.c
@ -38,6 +38,8 @@ const MPResultType mpw_type_named(const char *typeName) {

    // Find what password type is represented by the type letter.
    if (strlen( typeName ) == 1) {
+        if ('0' == typeName[0])
+            return MPResultTypeNone;
        if ('x' == typeName[0])
            return MPResultTypeTemplateMaximum;
        if ('l' == typeName[0])
@ -63,6 +65,8 @@ const MPResultType mpw_type_named(const char *typeName) {
    }

    // Find what password type is represented by the type name.
+    if (mpw_strncasecmp( mpw_type_short_name( MPResultTypeNone ), typeName, strlen( typeName ) ) == OK)
+        return MPResultTypeNone;
    if (mpw_strncasecmp( mpw_type_short_name( MPResultTypeTemplateMaximum ), typeName, strlen( typeName ) ) == OK)
        return MPResultTypeTemplateMaximum;
    if (mpw_strncasecmp( mpw_type_short_name( MPResultTypeTemplateLong ), typeName, strlen( typeName ) ) == OK)
@ -93,6 +97,8 @@ const MPResultType mpw_type_named(const char *typeName) {
 const char *mpw_type_abbreviation(const MPResultType resultType) {

    switch (resultType) {
+        case MPResultTypeNone:
+            return "no";
        case MPResultTypeTemplateMaximum:
            return "max";
        case MPResultTypeTemplateLong:
@ -125,6 +131,8 @@ const char *mpw_type_abbreviation(const MPResultType resultType) {
 const char *mpw_type_short_name(const MPResultType resultType) {

    switch (resultType) {
+        case MPResultTypeNone:
+            return "none";
        case MPResultTypeTemplateMaximum:
            return "maximum";
        case MPResultTypeTemplateLong:
@ -157,6 +165,8 @@ const char *mpw_type_short_name(const MPResultType resultType) {
 const char *mpw_type_long_name(const MPResultType resultType) {

    switch (resultType) {
+        case MPResultTypeNone:
+            return "None";
        case MPResultTypeTemplateMaximum:
            return "Maximum Security Password";
        case MPResultTypeTemplateLong:
--- a/platform-independent/c/core/src/mpw-types.h
+++ b/platform-independent/c/core/src/mpw-types.h
@ -80,6 +80,9 @@ typedef mpw_opts( uint16_t, MPSiteFeature ) {

 // bit 0-3 | MPResultTypeClass | MPSiteFeature
 typedef mpw_enum( uint32_t, MPResultType ) {
+    /** 0: Don't produce a result */
+            MPResultTypeNone = 0,
+
    /** 16: pg^VMAUBk5x3p%HP%i4= */
            MPResultTypeTemplateMaximum = 0x0 | MPResultTypeClassTemplate | 0x0,
    /** 17: BiroYena8:Kixa */
@ -105,7 +108,8 @@ typedef mpw_enum( uint32_t, MPResultType ) {
    /** 4160: Derive a unique binary key. */
            MPResultTypeDeriveKey = 0x0 | MPResultTypeClassDerive | MPSiteFeatureAlternative,

-    MPResultTypeDefault = MPResultTypeTemplateLong,
+    MPResultTypeDefaultResult = MPResultTypeTemplateLong,
+    MPResultTypeDefaultLogin = MPResultTypeTemplateName,
 };

 typedef mpw_enum ( uint32_t, MPCounterValue ) {
Author	SHA1	Message	Date
Maarten Billemont	0b6e43a18f	The root of the users VC interferes with touches from the sites VC when it appears.	2021-11-03 21:13:04 -04:00
Maarten Billemont	c94c52f4b6	Fix migration tips no longer interactable when logged in.	2021-11-03 16:51:37 -04:00
Maarten Billemont	5de9b05299	Move Spectre migration dialogs fully global & make closeable.	2021-11-01 21:16:00 -04:00
Maarten Billemont	f27607e63c	fixup! Support for unset login type.	2021-11-01 20:52:04 -04:00
Maarten Billemont	0b45dc584f	Fix deadlock when loadStore posts notifications to the main thread.	2021-11-01 20:07:13 -04:00
Maarten Billemont	88a4d7ba4d	Support for unset login type.	2021-11-01 20:06:37 -04:00