From 0f0aee5e9749f0941ca896f3dc86b2ff35c5c6b8 Mon Sep 17 00:00:00 2001
From: ekager <ekager@mozilla.com>
Date: Thu, 30 Jul 2020 16:46:08 -0400
Subject: [PATCH] For #6846 - Don't show ToolbarPopupWindow if nothing to show

---
 .../main/java/org/mozilla/fenix/utils/ToolbarPopupWindow.kt  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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 9e7b41204..af5f9169c 100644
--- a/app/src/main/java/org/mozilla/fenix/utils/ToolbarPopupWindow.kt
+++ b/app/src/main/java/org/mozilla/fenix/utils/ToolbarPopupWindow.kt
@@ -32,8 +32,11 @@ object ToolbarPopupWindow {
         copyVisible: Boolean = true
     ) {
         val context = view.get()?.context ?: return
-        val isCustomTabSession = customTabSession != null
         val clipboard = context.components.clipboardHandler
+        if (!copyVisible && clipboard.text.isNullOrEmpty()) return
+
+        val isCustomTabSession = customTabSession != null
+
         val customView = LayoutInflater.from(context)
             .inflate(R.layout.browser_toolbar_popup_window, null)
         val popupWindow = PopupWindow(