From 52ba9f2ba7d96ec63c9b9f46a697cfe580423149 Mon Sep 17 00:00:00 2001
From: Thomas Rittson <31796059+eliykat@users.noreply.github.com>
Date: Wed, 3 Feb 2021 05:56:44 +1000
Subject: [PATCH] Fix crash when using Yubikey via usb on Android (#1246)

* Fix crash when using yubikey via usb on Android

* Fix crash when using usb keyboard on Android
---
 src/Android/MainActivity.cs                  | 4 +++-
 src/App/Pages/Accounts/TwoFactorPage.xaml.cs | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Android/MainActivity.cs b/src/Android/MainActivity.cs
index e2e9bb407..7cbdfee21 100644
--- a/src/Android/MainActivity.cs
+++ b/src/Android/MainActivity.cs
@@ -27,7 +27,9 @@ namespace Bit.Droid
         Icon = "@mipmap/ic_launcher",
         Theme = "@style/LaunchTheme",
         MainLauncher = true,
-        ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
+        ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation |
+                               ConfigChanges.Keyboard | ConfigChanges.KeyboardHidden |
+                               ConfigChanges.Navigation)]
     [Register("com.x8bit.bitwarden.MainActivity")]
     public class MainActivity : Xamarin.Forms.Platform.Android.FormsAppCompatActivity
     {
diff --git a/src/App/Pages/Accounts/TwoFactorPage.xaml.cs b/src/App/Pages/Accounts/TwoFactorPage.xaml.cs
index 2dd87b16b..b0968daf7 100644
--- a/src/App/Pages/Accounts/TwoFactorPage.xaml.cs
+++ b/src/App/Pages/Accounts/TwoFactorPage.xaml.cs
@@ -102,6 +102,9 @@ namespace Bit.App.Pages
                 if (_vm.TotpMethod)
                 {
                     RequestFocus(_totpEntry);
+                } else if (_vm.YubikeyMethod)
+                {
+                    RequestFocus(_yubikeyTokenEntry);
                 }
                 return Task.FromResult(0);
             });