From 66d7f0aeaafedbae6cb25296da55cb89b28dc912 Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Wed, 5 Aug 2020 10:01:25 +1000
Subject: [PATCH] Make new private chat screen edit text done button work

---
 .../fragment_enter_public_key.xml               |  4 +++-
 res/layout/fragment_enter_public_key.xml        |  4 +++-
 .../activities/CreatePrivateChatActivity.kt     | 17 ++++++++++++++++-
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/res/layout-sw400dp/fragment_enter_public_key.xml b/res/layout-sw400dp/fragment_enter_public_key.xml
index 49efbd40ae..cf74f40d22 100644
--- a/res/layout-sw400dp/fragment_enter_public_key.xml
+++ b/res/layout-sw400dp/fragment_enter_public_key.xml
@@ -18,8 +18,10 @@
         android:layout_marginRight="@dimen/large_spacing"
         android:paddingTop="0dp"
         android:paddingBottom="0dp"
-        android:maxLines="2"
         android:gravity="center_vertical"
+        android:inputType="textMultiLine"
+        android:maxLines="2"
+        android:imeOptions="actionDone"
         android:hint="@string/fragment_enter_public_key_edit_text_hint" />
 
     <TextView
diff --git a/res/layout/fragment_enter_public_key.xml b/res/layout/fragment_enter_public_key.xml
index ab41859e87..4abafd17d9 100644
--- a/res/layout/fragment_enter_public_key.xml
+++ b/res/layout/fragment_enter_public_key.xml
@@ -18,8 +18,10 @@
         android:layout_marginRight="@dimen/large_spacing"
         android:paddingTop="0dp"
         android:paddingBottom="0dp"
-        android:maxLines="2"
         android:gravity="center_vertical"
+        android:inputType="textMultiLine"
+        android:maxLines="2"
+        android:imeOptions="actionDone"
         android:hint="@string/fragment_enter_public_key_edit_text_hint" />
 
     <TextView
diff --git a/src/org/thoughtcrime/securesms/loki/activities/CreatePrivateChatActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/CreatePrivateChatActivity.kt
index 5b784de808..aa325d8719 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/CreatePrivateChatActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/CreatePrivateChatActivity.kt
@@ -7,9 +7,12 @@ import android.content.Intent
 import android.os.Bundle
 import android.support.v4.app.Fragment
 import android.support.v4.app.FragmentPagerAdapter
+import android.text.InputType
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.view.inputmethod.EditorInfo
+import android.view.inputmethod.InputMethodManager
 import android.widget.Toast
 import kotlinx.android.synthetic.main.activity_create_private_chat.*
 import kotlinx.android.synthetic.main.fragment_enter_public_key.*
@@ -25,6 +28,7 @@ import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.whispersystems.signalservice.loki.utilities.PublicKeyValidation
 
+
 class CreatePrivateChatActivity : PassphraseRequiredActionBarActivity(), ScanQRCodeWrapperFragmentDelegate {
     private val adapter = CreatePrivateChatActivityAdapter(this)
 
@@ -111,7 +115,18 @@ class EnterPublicKeyFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        publicKeyTextView.imeOptions = publicKeyTextView.imeOptions or 16777216 // Always use incognito keyboard
+        publicKeyEditText.imeOptions = EditorInfo.IME_ACTION_DONE or 16777216 // Always use incognito keyboard
+        publicKeyEditText.setRawInputType(InputType.TYPE_CLASS_TEXT)
+        publicKeyEditText.setOnEditorActionListener { v, actionID, _ ->
+            if (actionID == EditorInfo.IME_ACTION_DONE) {
+                val imm = v.context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+                imm.hideSoftInputFromWindow(v.windowToken, 0)
+                createPrivateChatIfPossible()
+                true
+            } else {
+                false
+            }
+        }
         publicKeyTextView.text = hexEncodedPublicKey
         copyButton.setOnClickListener { copyPublicKey() }
         shareButton.setOnClickListener { sharePublicKey() }