From 39b489a36c664a4318f4e5e950bd245dd048d675 Mon Sep 17 00:00:00 2001
From: Grigory Kruglov <grigory@kruglov.ca>
Date: Tue, 15 Mar 2022 19:50:02 -0700
Subject: [PATCH] [fenix] For
 https://github.com/mozilla-mobile/fenix/issues/23697: Allow pasting plain
 text in toolbar long press

---
 .../org/mozilla/fenix/utils/ToolbarPopupWindow.kt    | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/utils/ToolbarPopupWindow.kt b/app/src/main/java/org/mozilla/fenix/utils/ToolbarPopupWindow.kt
index 28b8378aed..a6bf67bc15 100644
--- a/app/src/main/java/org/mozilla/fenix/utils/ToolbarPopupWindow.kt
+++ b/app/src/main/java/org/mozilla/fenix/utils/ToolbarPopupWindow.kt
@@ -36,6 +36,7 @@ object ToolbarPopupWindow {
         val context = view.get()?.context ?: return
         val clipboard = context.components.clipboardHandler
         val clipboardUrl = clipboard.getUrl()
+        val clipboardText = clipboard.text
         if (!copyVisible && clipboardUrl == null) return
 
         val isCustomTabSession = customTabId != null
@@ -56,9 +57,8 @@ object ToolbarPopupWindow {
 
         binding.copy.isVisible = copyVisible
 
-        val showPaste = clipboardUrl != null && !isCustomTabSession
-        binding.paste.isVisible = showPaste
-        binding.pasteAndGo.isVisible = showPaste
+        binding.paste.isVisible = clipboardText != null && !isCustomTabSession
+        binding.pasteAndGo.isVisible = clipboardUrl != null && !isCustomTabSession
 
         if (copyVisible) {
             binding.copy.setOnClickListener { copyView ->
@@ -81,12 +81,14 @@ object ToolbarPopupWindow {
             }
         }
 
-        clipboardUrl?.let { url ->
+        clipboardText?.let { text ->
             binding.paste.setOnClickListener {
                 popupWindow.dismiss()
-                handlePaste(url)
+                handlePaste(text)
             }
+        }
 
+        clipboardUrl?.let { url ->
             binding.pasteAndGo.setOnClickListener {
                 popupWindow.dismiss()
                 handlePasteAndGo(url)