From 9d0db3c1e567fa2fb77aafeb7bdb17970c388752 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Tue, 29 Aug 2017 14:33:25 -0400
Subject: [PATCH] remove setting soft input mode

---
 src/Android/MainActivity.cs             | 4 +---
 src/App/Controls/ExtendedContentPage.cs | 1 +
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Android/MainActivity.cs b/src/Android/MainActivity.cs
index bf6c4597d..430512b6d 100644
--- a/src/Android/MainActivity.cs
+++ b/src/Android/MainActivity.cs
@@ -24,8 +24,7 @@ namespace Bit.Android
 {
     [Activity(Label = "bitwarden",
         Icon = "@drawable/icon",
-        ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation,
-        WindowSoftInputMode = SoftInput.StateHidden)]
+        ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
     public class MainActivity : FormsAppCompatActivity
     {
         private const string HockeyAppId = "d3834185b4a643479047b86c65293d42";
@@ -55,7 +54,6 @@ namespace Bit.Android
             Task.Delay(10).Wait();
 
             Console.WriteLine("A OnCreate");
-            Window.SetSoftInputMode(SoftInput.StateHidden);
             if(!App.Utilities.Helpers.InDebugMode())
             {
                 Window.AddFlags(WindowManagerFlags.Secure);
diff --git a/src/App/Controls/ExtendedContentPage.cs b/src/App/Controls/ExtendedContentPage.cs
index 8a5b4b4b8..4e0a8f301 100644
--- a/src/App/Controls/ExtendedContentPage.cs
+++ b/src/App/Controls/ExtendedContentPage.cs
@@ -62,6 +62,7 @@ namespace Bit.App.Controls
             }
 
             base.OnDisappearing();
+            MessagingCenter.Send(Application.Current, "DismissKeyboard");
         }
     }
 }