From 3e77975c1737a8aa8ded1c30ba222cdd21f435ce Mon Sep 17 00:00:00 2001
From: Cody Henthorne <cody@signal.org>
Date: Fri, 18 Mar 2022 14:09:52 -0400
Subject: [PATCH] Revert "Fix soft keyboard popping up when the text was
 selected when the other keyboard was open."

This reverts commit 6d41d1f6d297b37a1b6be93ca674ec55a3e76338.
---
 .../components/InputAwareLayout.java          | 28 -------------------
 .../ConversationParentFragment.java           |  2 +-
 2 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/InputAwareLayout.java b/app/src/main/java/org/thoughtcrime/securesms/components/InputAwareLayout.java
index d4154c0a5..dae12efa9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/InputAwareLayout.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/InputAwareLayout.java
@@ -1,8 +1,6 @@
 package org.thoughtcrime.securesms.components;
 
 import android.content.Context;
-import android.os.Build;
-import android.text.InputType;
 import android.util.AttributeSet;
 import android.widget.EditText;
 
@@ -14,7 +12,6 @@ import org.thoughtcrime.securesms.util.ServiceUtil;
 
 public class InputAwareLayout extends KeyboardAwareLinearLayout implements OnKeyboardShownListener {
   private InputView current;
-  private int       previousInputType = InputType.TYPE_NULL;
 
   public InputAwareLayout(Context context) {
     this(context, null);
@@ -47,8 +44,6 @@ public class InputAwareLayout extends KeyboardAwareLinearLayout implements OnKey
       input.show(getKeyboardHeight(), current != null);
       current = input;
     }
-
-    setShowSoftInputOnFocusCompat(imeTarget, false);
   }
 
   public InputView getCurrentInput() {
@@ -58,8 +53,6 @@ public class InputAwareLayout extends KeyboardAwareLinearLayout implements OnKey
   public void hideCurrentInput(EditText imeTarget) {
     if (isKeyboardOpen()) hideSoftkey(imeTarget, null);
     else                  hideAttachedInput(false);
-
-    setShowSoftInputOnFocusCompat(imeTarget, true);
   }
 
   public void hideAttachedInput(boolean instant) {
@@ -72,13 +65,6 @@ public class InputAwareLayout extends KeyboardAwareLinearLayout implements OnKey
   }
 
   public void showSoftkey(final EditText inputTarget) {
-    showSoftkey(inputTarget, false);
-  }
-
-  public void showSoftkey(final EditText inputTarget, boolean force) {
-    if (!force && isInputOpen()) return;
-
-    setShowSoftInputOnFocusCompat(inputTarget, true);
     postOnKeyboardOpen(new Runnable() {
       @Override public void run() {
         hideAttachedInput(true);
@@ -99,20 +85,6 @@ public class InputAwareLayout extends KeyboardAwareLinearLayout implements OnKey
                .hideSoftInputFromWindow(inputTarget.getWindowToken(), 0);
   }
 
-  private void setShowSoftInputOnFocusCompat(EditText imeTarget, boolean show) {
-    if (Build.VERSION.SDK_INT >= 21) {
-      imeTarget.setShowSoftInputOnFocus(show);
-    } else if (show) {
-      if (previousInputType != InputType.TYPE_NULL) {
-        imeTarget.setInputType(previousInputType);
-      }
-    } else {
-      previousInputType = imeTarget.getInputType();
-      imeTarget.setRawInputType(InputType.TYPE_CLASS_TEXT);
-      imeTarget.setTextIsSelectable(true);
-    }
-  }
-
   public interface InputView {
     void show(int height, boolean immediate);
     void hide(boolean immediate);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
index 9026afa11..370ee9780 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
@@ -3286,7 +3286,7 @@ public class ConversationParentFragment extends Fragment
     emojiDrawerStub.get().setFragmentManager(getChildFragmentManager());
 
     if (container.getCurrentInput() == emojiDrawerStub.get()) {
-      container.showSoftkey(composeText, true);
+      container.showSoftkey(composeText);
     } else {
       container.show(composeText, emojiDrawerStub.get());
     }