For mozilla-mobile#3326 - Remove open image in tab from context menu

ekager · Jun 11, 2019 · 1846a0c · 1846a0c
1 parent 4d82c29
commit 1846a0c
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 2 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
@@ -37,7 +37,6 @@ import mozilla.appservices.places.BookmarkRoot
 import mozilla.components.browser.session.Session
 import mozilla.components.browser.session.SessionManager
 import mozilla.components.feature.app.links.AppLinksFeature
-import mozilla.components.feature.contextmenu.ContextMenuCandidate
 import mozilla.components.feature.contextmenu.ContextMenuFeature
 import mozilla.components.feature.downloads.DownloadsFeature
 import mozilla.components.feature.intent.IntentProcessor
@@ -206,7 +205,7 @@ class BrowserFragment : Fragment(), BackHandler, CoroutineScope {
             feature = ContextMenuFeature(
                 requireFragmentManager(),
                 sessionManager,
-                ContextMenuCandidate.defaultCandidates(
+                FenixContextMenuCandidate.defaultCandidates(
                     requireContext(),
                     requireComponents.useCases.tabsUseCases,
                     view,

diff --git a/app/src/main/java/org/mozilla/fenix/browser/FenixContextMenuCandidate.kt b/app/src/main/java/org/mozilla/fenix/browser/FenixContextMenuCandidate.kt
@@ -0,0 +1,45 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+   License, v. 2.0. If a copy of the MPL was not distributed with this
+   file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.fenix.browser
+
+import android.content.Context
+import android.view.View
+import mozilla.components.feature.contextmenu.ContextMenuCandidate
+import mozilla.components.feature.contextmenu.DefaultSnackbarDelegate
+import mozilla.components.feature.tabs.TabsUseCases
+
+
+class FenixContextMenuCandidate {
+    companion object {
+        /**
+         * Returns the default list of context menu candidates.
+         *
+         * We are removing open image in new tab temporarily see https://github.com/mozilla-mobile/fenix/issues/2312
+         */
+        fun defaultCandidates(
+            context: Context,
+            tabsUseCases: TabsUseCases,
+            snackBarParentView: View,
+            snackbarDelegate: ContextMenuCandidate.SnackbarDelegate = DefaultSnackbarDelegate()
+        ): List<ContextMenuCandidate> = listOf(
+            ContextMenuCandidate.createOpenInNewTabCandidate(
+                context,
+                tabsUseCases,
+                snackBarParentView,
+                snackbarDelegate
+            ),
+            ContextMenuCandidate.createOpenInPrivateTabCandidate(
+                context,
+                tabsUseCases,
+                snackBarParentView,
+                snackbarDelegate
+            ),
+            ContextMenuCandidate.createCopyLinkCandidate(context, snackBarParentView, snackbarDelegate),
+            ContextMenuCandidate.createShareLinkCandidate(context),
+            ContextMenuCandidate.createSaveImageCandidate(context),
+            ContextMenuCandidate.createCopyImageLocationCandidate(context, snackBarParentView, snackbarDelegate)
+        )
+    }
+}