2
0

fixup! Support for unset login type.

This commit is contained in:
Maarten Billemont 2021-11-01 20:52:04 -04:00
parent 0b45dc584f
commit f27607e63c

View File

@ -146,10 +146,10 @@ static NSOperationQueue *_mpwQueue = nil;
- (NSString *)nameOfType:(MPResultType)type { - (NSString *)nameOfType:(MPResultType)type {
if (!type)
return nil;
switch (type) { switch (type) {
case MPResultTypeNone:
return @"None";
case MPResultTypeTemplateMaximum: case MPResultTypeTemplateMaximum:
return @"Maximum Security Password"; return @"Maximum Security Password";
@ -189,10 +189,10 @@ static NSOperationQueue *_mpwQueue = nil;
- (NSString *)shortNameOfType:(MPResultType)type { - (NSString *)shortNameOfType:(MPResultType)type {
if (!type)
return nil;
switch (type) { switch (type) {
case MPResultTypeNone:
return @"None";
case MPResultTypeTemplateMaximum: case MPResultTypeTemplateMaximum:
return @"Maximum"; return @"Maximum";
@ -237,9 +237,6 @@ static NSOperationQueue *_mpwQueue = nil;
- (Class)classOfType:(MPResultType)type { - (Class)classOfType:(MPResultType)type {
if (!type)
Throw( @"No type given." );
switch (type) { switch (type) {
case MPResultTypeTemplateMaximum: case MPResultTypeTemplateMaximum:
return [MPGeneratedSiteEntity class]; return [MPGeneratedSiteEntity class];
@ -271,6 +268,7 @@ static NSOperationQueue *_mpwQueue = nil;
case MPResultTypeStatefulDevice: case MPResultTypeStatefulDevice:
return [MPStoredSiteEntity class]; return [MPStoredSiteEntity class];
case MPResultTypeNone:
case MPResultTypeDeriveKey: case MPResultTypeDeriveKey:
break; break;
} }
@ -322,6 +320,7 @@ static NSOperationQueue *_mpwQueue = nil;
return MPResultTypeStatefulDevice; return MPResultTypeStatefulDevice;
case MPResultTypeStatefulDevice: case MPResultTypeStatefulDevice:
return MPResultTypeTemplatePhrase; return MPResultTypeTemplatePhrase;
case MPResultTypeNone:
case MPResultTypeDeriveKey: case MPResultTypeDeriveKey:
break; break;
} }
@ -531,9 +530,14 @@ static NSOperationQueue *_mpwQueue = nil;
return; return;
} }
case MPResultTypeDeriveKey: case MPResultTypeNone:
case MPResultTypeDeriveKey: {
PearlNotMainQueue( ^{
resultBlock( nil );
} );
return; return;
} }
}
Throw( @"Type not supported: %lu", (long)type ); Throw( @"Type not supported: %lu", (long)type );
} }