catch EnableForegroundDispatch exception. disable

back button on yubikey 2fa.
This commit is contained in:
Kyle Spearrin 2018-08-01 15:45:32 -04:00
parent 7c781b60c5
commit 58aa37bf8e
2 changed files with 17 additions and 2 deletions

View File

@ -233,8 +233,12 @@ namespace Bit.Android
ndef.AddDataScheme("https"); ndef.AddDataScheme("https");
var filters = new IntentFilter[] { ndef }; var filters = new IntentFilter[] { ndef };
// register for foreground dispatch so we'll receive tags according to our intent filters try
adapter.EnableForegroundDispatch(this, pendingIntent, filters, null); {
// register for foreground dispatch so we'll receive tags according to our intent filters
adapter.EnableForegroundDispatch(this, pendingIntent, filters, null);
}
catch { }
} }
else else
{ {

View File

@ -335,6 +335,17 @@ namespace Bit.App.Pages
MessagingCenter.Unsubscribe<Application>(Application.Current, "ResumeYubiKey"); MessagingCenter.Unsubscribe<Application>(Application.Current, "ResumeYubiKey");
} }
protected override bool OnBackButtonPressed()
{
// ref: https://github.com/bitwarden/mobile/issues/350
if(Device.RuntimePlatform == Device.Android && _providerType.HasValue &&
_providerType.Value == TwoFactorProviderType.YubiKey)
{
return true;
}
return base.OnBackButtonPressed();
}
private async void AnotherMethodAsync() private async void AnotherMethodAsync()
{ {
var beforeProviderType = _providerType; var beforeProviderType = _providerType;