From d6c129e919501ded529bc88bbe2f35a723c8ddcf Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Tue, 28 Aug 2018 16:45:04 +0100
Subject: [PATCH] Hide emoji popup when hiding soft keyboard.

---
 .../java/org/briarproject/briar/android/view/TextInputView.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputView.java b/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputView.java
index b92abe138..0733fb4a0 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputView.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputView.java
@@ -163,6 +163,7 @@ public class TextInputView extends KeyboardAwareLinearLayout {
 	}
 
 	public void hideSoftKeyboard() {
+		if (emojiPopup.isShowing()) emojiPopup.dismiss();
 		IBinder token = editText.getWindowToken();
 		Object o = getContext().getSystemService(INPUT_METHOD_SERVICE);
 		((InputMethodManager) o).hideSoftInputFromWindow(token, 0);