From 75f98070d2a55f938b21cda4058c28ac130f6f09 Mon Sep 17 00:00:00 2001
From: Christian Sadilek <christian.sadilek@gmail.com>
Date: Thu, 30 May 2019 15:06:24 -0400
Subject: [PATCH] [fenix] No issue: ClipboardProvider no longer needs to be
 added/removed based on input

---
 .../fenix/search/awesomebar/AwesomeBarUIView.kt   | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarUIView.kt b/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarUIView.kt
index 74af2d6b07..021c04bee4 100644
--- a/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarUIView.kt
+++ b/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarUIView.kt
@@ -169,7 +169,10 @@ class AwesomeBarUIView(
             view.addProviders(historyStorageProvider!!)
         }
 
-        view.addProviders(sessionProvider!!)
+        view.addProviders(
+            clipboardSuggestionProvider!!,
+            sessionProvider!!
+        )
     }
 
     private fun showSearchSuggestionProvider() {
@@ -178,14 +181,6 @@ class AwesomeBarUIView(
         }
     }
 
-    private fun updateLinkVisibility() {
-        if (state?.query?.isEmpty() == true) {
-            view.addProviders(clipboardSuggestionProvider!!)
-        } else {
-            view.removeProviders(clipboardSuggestionProvider!!)
-        }
-    }
-
     private fun setShortcutEngine(engine: SearchEngine) {
         with(container.context) {
             val draw = getDrawable(R.drawable.ic_search)
@@ -213,7 +208,5 @@ class AwesomeBarUIView(
 
         view.onInputChanged(it.query)
         state = it
-
-        updateLinkVisibility()
     }
 }