From 710da8dd633d57f5b8b83801574dc89e9d7343c0 Mon Sep 17 00:00:00 2001
From: Jeff Boek <jeff@jeffboek.com>
Date: Mon, 14 Sep 2020 15:20:46 -0700
Subject: [PATCH] [fenix] For
 https://github.com/mozilla-mobile/fenix/issues/15007 - Puts swipe to delete
 behind a feature flag (https://github.com/mozilla-mobile/fenix/pull/15009)

---
 app/src/main/java/org/mozilla/fenix/FeatureFlags.kt          | 5 +++++
 .../java/org/mozilla/fenix/library/bookmarks/BookmarkView.kt | 5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
index d226de870d..ef763bc977 100644
--- a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
+++ b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
@@ -40,4 +40,9 @@ object FeatureFlags {
      * Enables downloads with external download managers.
      */
     const val externalDownloadManager = true
+
+    /**
+     * Enables swipe to delete in bookmarks
+     */
+    val bookmarkSwipeToDelete = Config.channel.isNightlyOrDebug
 }
diff --git a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkView.kt b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkView.kt
index 6d4b0c690e..60ff69d4cc 100644
--- a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkView.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkView.kt
@@ -13,6 +13,7 @@ import kotlinx.android.synthetic.main.component_bookmark.view.*
 import mozilla.appservices.places.BookmarkRoot
 import mozilla.components.concept.storage.BookmarkNode
 import mozilla.components.support.base.feature.UserInteractionHandler
+import org.mozilla.fenix.FeatureFlags
 import org.mozilla.fenix.NavGraphDirections
 import org.mozilla.fenix.R
 import org.mozilla.fenix.library.LibraryPageView
@@ -135,7 +136,9 @@ class BookmarkView(
             interactor.onRequestSync()
         }
 
-        BookmarkTouchHelper(interactor).attachToRecyclerView(view.bookmark_list)
+        if (FeatureFlags.bookmarkSwipeToDelete) {
+            BookmarkTouchHelper(interactor).attachToRecyclerView(view.bookmark_list)
+        }
     }
 
     fun update(state: BookmarkFragmentState) {