From 65f2ea1df276ba317e3aa4ce299c47fef342f605 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Wed, 5 Jun 2019 09:12:29 -0400 Subject: [PATCH] stop blocking OnBackButtonPressed --- src/App/Pages/Accounts/TwoFactorPage.xaml.cs | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/src/App/Pages/Accounts/TwoFactorPage.xaml.cs b/src/App/Pages/Accounts/TwoFactorPage.xaml.cs index 214db64a7..c4719b7a8 100644 --- a/src/App/Pages/Accounts/TwoFactorPage.xaml.cs +++ b/src/App/Pages/Accounts/TwoFactorPage.xaml.cs @@ -84,23 +84,8 @@ namespace Bit.App.Pages if(!_vm.YubikeyMethod) { _messagingService.Send("listenYubiKeyOTP", false); - _broadcasterService.Unsubscribe(nameof(TwoFactorPage)); } - } - - protected override bool OnBackButtonPressed() - { - // ref: https://github.com/bitwarden/mobile/issues/350 - if(_vm.YubikeyMethod) - { - if(Device.RuntimePlatform == Device.Android) - { - return true; - } - _messagingService.Send("listenYubiKeyOTP", false); - _broadcasterService.Unsubscribe(nameof(TwoFactorPage)); - } - return base.OnBackButtonPressed(); + _broadcasterService.Unsubscribe(nameof(TwoFactorPage)); } private async void Continue_Clicked(object sender, EventArgs e)