From a4f561ca1a54107f0576f5d0a3d472258915257b Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Tue, 15 Oct 2019 17:28:01 +0100
Subject: [PATCH] Request focus when showing soft keyboard.

---
 .../briar/android/conversation/AliasDialogFragment.java  | 9 ++++-----
 .../briar/android/threaded/ThreadListActivity.java       | 1 -
 .../org/briarproject/briar/android/util/UiUtils.java     | 8 +++++---
 .../briar/android/view/EmojiTextInputView.java           | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/AliasDialogFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/AliasDialogFragment.java
index 03ed92b7f..9832e1522 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/AliasDialogFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/AliasDialogFragment.java
@@ -74,6 +74,7 @@ public class AliasDialogFragment extends AppCompatDialogFragment {
 		aliasEditText.setText(alias);
 		if (alias != null) aliasEditText.setSelection(alias.length());
 
+		// TODO: Close keyboard on accept or cancel
 		Button setButton = v.findViewById(R.id.setButton);
 		setButton.setOnClickListener(v1 -> onSetButtonClicked());
 
@@ -96,11 +97,9 @@ public class AliasDialogFragment extends AppCompatDialogFragment {
 	@Override
 	public void onStart() {
 		super.onStart();
-		if (aliasEditText.requestFocus()) {
-			requireNonNull(getDialog().getWindow())
-					.setSoftInputMode(SOFT_INPUT_STATE_ALWAYS_VISIBLE);
-			showSoftKeyboard(aliasEditText);
-		}
+		requireNonNull(getDialog().getWindow())
+				.setSoftInputMode(SOFT_INPUT_STATE_ALWAYS_VISIBLE);
+		showSoftKeyboard(aliasEditText);
 	}
 
 }
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListActivity.java
index 88c8edda8..8ae9dd4c0 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListActivity.java
@@ -327,7 +327,6 @@ public abstract class ThreadListActivity<G extends NamedGroup, I extends ThreadI
 	private void updateTextInput() {
 		if (replyId != null) {
 			textInput.setHint(R.string.forum_message_reply_hint);
-			textInput.requestFocus();
 			textInput.showSoftKeyboard();
 		} else {
 			textInput.setHint(R.string.forum_new_message_hint);
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java b/briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java
index fd42e26bd..ae9b8e090 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java
@@ -92,9 +92,11 @@ public class UiUtils {
 	public static final float GREY_OUT = 0.5f;
 
 	public static void showSoftKeyboard(View view) {
-		InputMethodManager imm = requireNonNull(
-				getSystemService(view.getContext(), InputMethodManager.class));
-		imm.showSoftInput(view, SHOW_IMPLICIT);
+		if (view.requestFocus()) {
+			InputMethodManager imm = requireNonNull(getSystemService(
+					view.getContext(), InputMethodManager.class));
+			imm.showSoftInput(view, SHOW_IMPLICIT);
+		}
 	}
 
 	public static void hideSoftKeyboard(View view) {
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 3127d287f..ccb214e76 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
@@ -258,7 +258,7 @@ public class EmojiTextInputView extends LinearLayout implements
 	}
 
 	void showSoftKeyboard() {
-		imm.showSoftInput(editText, SHOW_IMPLICIT);
+		if (editText.requestFocus()) imm.showSoftInput(editText, SHOW_IMPLICIT);
 	}
 
 	void hideSoftKeyboard() {