mirror of
https://github.com/bitwarden/mobile
synced 2025-12-15 07:43:37 +00:00
catch EnableForegroundDispatch exception. disable
back button on yubikey 2fa.
This commit is contained in:
@@ -233,9 +233,13 @@ namespace Bit.Android
|
|||||||
ndef.AddDataScheme("https");
|
ndef.AddDataScheme("https");
|
||||||
var filters = new IntentFilter[] { ndef };
|
var filters = new IntentFilter[] { ndef };
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
// register for foreground dispatch so we'll receive tags according to our intent filters
|
// register for foreground dispatch so we'll receive tags according to our intent filters
|
||||||
adapter.EnableForegroundDispatch(this, pendingIntent, filters, null);
|
adapter.EnableForegroundDispatch(this, pendingIntent, filters, null);
|
||||||
}
|
}
|
||||||
|
catch { }
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
adapter.DisableForegroundDispatch(this);
|
adapter.DisableForegroundDispatch(this);
|
||||||
|
|||||||
@@ -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;
|
||||||
|
|||||||
Reference in New Issue
Block a user