mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2024-12-24 18:08:26 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:bitwarden/mobile

Browse source
This commit is contained in:
Kyle Spearrin 2018-09-21 12:45:16 -04:00
commit 225b8b8cd8
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/iOS.Autofill/CredentialProviderViewController.cs
View file

@ -55,7 +55,6 @@ namespace Bit.iOS.Autofill
{ {
_context.ServiceIdentifiers = serviceIdentifiers; _context.ServiceIdentifiers = serviceIdentifiers;
_context.UrlString = serviceIdentifiers[0].Identifier; _context.UrlString = serviceIdentifiers[0].Identifier;
base.PrepareCredentialList(serviceIdentifiers);
var authService = Resolver.Resolve<IAuthService>(); var authService = Resolver.Resolve<IAuthService>();
if(!authService.IsAuthenticated) if(!authService.IsAuthenticated)
@ -89,8 +88,6 @@ namespace Bit.iOS.Autofill
public override void ProvideCredentialWithoutUserInteraction(ASPasswordCredentialIdentity credentialIdentity) public override void ProvideCredentialWithoutUserInteraction(ASPasswordCredentialIdentity credentialIdentity)
{ {
base.ProvideCredentialWithoutUserInteraction(credentialIdentity);
bool canGetCredentials = false; bool canGetCredentials = false;
var authService = Resolver.Resolve<IAuthService>(); var authService = Resolver.Resolve<IAuthService>();
if(authService.IsAuthenticated) if(authService.IsAuthenticated)
@ -104,7 +101,7 @@ namespace Bit.iOS.Autofill
{ {
var err = new NSError(new NSString("ASExtensionErrorDomain"), var err = new NSError(new NSString("ASExtensionErrorDomain"),
Convert.ToInt32(ASExtensionErrorCode.UserInteractionRequired), null); Convert.ToInt32(ASExtensionErrorCode.UserInteractionRequired), null);
ExtensionContext.CancelRequest(err); this.ExtensionContext.CancelRequest(err);
return; return;
} }
_context.CredentialIdentity = credentialIdentity; _context.CredentialIdentity = credentialIdentity;
@ -146,7 +143,6 @@ namespace Bit.iOS.Autofill
public override void PrepareInterfaceForExtensionConfiguration() public override void PrepareInterfaceForExtensionConfiguration()
{ {
base.PrepareInterfaceForExtensionConfiguration();
var authService = Resolver.Resolve<IAuthService>(); var authService = Resolver.Resolve<IAuthService>();
if(authService.IsAuthenticated) if(authService.IsAuthenticated)
{ {