From 529eaceec741e359969cdae40ecf3962b2d59d52 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 22 Oct 2019 12:42:57 -0300
Subject: [PATCH] [android] show keyboard when clicking text input field

---
 .../briarproject/briar/android/view/EmojiTextInputView.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/EmojiTextInputView.java b/briar-android/src/main/java/org/briarproject/briar/android/view/EmojiTextInputView.java
index ccb214e76..66deb1acb 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/view/EmojiTextInputView.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/view/EmojiTextInputView.java
@@ -85,7 +85,6 @@ public class EmojiTextInputView extends LinearLayout implements
 		editText = findViewById(R.id.input_text);
 		editText.setPadding(0, 0, paddingEnd, paddingBottom);
 		if (maxLines > 0) editText.setMaxLines(maxLines);
-		editText.setOnClickListener(v -> showSoftKeyboard());
 		editText.addTextChangedListener(this);
 		editText.setOnEditorActionListener((v, actionId, event) -> {
 			if (actionId == IME_ACTION_SEND) {
@@ -130,6 +129,9 @@ public class EmojiTextInputView extends LinearLayout implements
 						R.attr.colorControlNormal))
 				.build(editText);
 		emojiToggle.setOnClickListener(v -> emojiPopup.toggle());
+		editText.setOnClickListener(v -> {
+			if (emojiPopup.isShowing()) emojiPopup.dismiss();
+		});
 	}
 
 	@Override