From ea018de253c40fe56799ec910781543287908675 Mon Sep 17 00:00:00 2001 From: Colin Lee Date: Tue, 16 Jul 2019 13:42:05 -0500 Subject: [PATCH] [fenix] For https://github.com/mozilla-mobile/fenix/issues/3615: Long pressing the address bar should not copy link (https://github.com/mozilla-mobile/fenix/pull/4083) --- .../org/mozilla/fenix/browser/BrowserFragment.kt | 15 --------------- .../fenix/components/toolbar/ToolbarComponent.kt | 1 - .../fenix/components/toolbar/ToolbarUIView.kt | 5 ----- 3 files changed, 21 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt index e2422a2cee..c02ae1f202 100644 --- a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt @@ -489,21 +489,6 @@ class BrowserFragment : Fragment(), BackHandler { trackToolbarItemInteraction(it) handleToolbarItemInteraction(it) } - is SearchAction.ToolbarLongClicked -> { - getSessionById()?.let { session -> - session.copyUrl(requireContext()) - view?.let { - val snackbar = FenixSnackbar.make(it, Snackbar.LENGTH_LONG) - .setText(resources.getString(R.string.url_copied)) - - if (!session.isCustomTabSession()) { - snackbar.anchorView = nestedScrollQuickAction - } - - snackbar.show() - } - } - } } } diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarComponent.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarComponent.kt index f35abd2818..43626f9bdc 100644 --- a/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarComponent.kt +++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarComponent.kt @@ -82,7 +82,6 @@ sealed class SearchAction : Action { data class UrlCommitted(val url: String, val session: String?, val engine: SearchEngine? = null) : SearchAction() data class TextChanged(val query: String) : SearchAction() object ToolbarClicked : SearchAction() - object ToolbarLongClicked : SearchAction() data class ToolbarMenuItemTapped(val item: ToolbarMenu.Item) : SearchAction() object EditingCanceled : SearchAction() } diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarUIView.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarUIView.kt index 0e5c6d1fa7..53ad9f2690 100644 --- a/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarUIView.kt +++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarUIView.kt @@ -86,11 +86,6 @@ class ToolbarUIView( actionEmitter.onNext(SearchAction.TextChanged(text)) } }) - - setOnUrlLongClickListener { - actionEmitter.onNext(SearchAction.ToolbarLongClicked) - true - } } with(view.context) {