For #6846 - Don't show ToolbarPopupWindow if nothing to show

2020-07-30 16:46:08 -04:00 · 2020-07-30 16:46:08 -04:00 · 0f0aee5e97
commit 0f0aee5e97
parent 58e24b81aa
1 changed files with 4 additions and 1 deletions
--- 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(