From b484ad38cc9f95a74f37ca7c74f9cc53391d75a7 Mon Sep 17 00:00:00 2001
From: Arturo Mejia <arturomejiamarmol@gmail.com>
Date: Tue, 24 Mar 2020 10:30:22 -0400
Subject: [PATCH] No issue: Remove feature flag for removing one TP exception

---
 app/src/main/java/org/mozilla/fenix/FeatureFlags.kt         | 5 -----
 .../java/org/mozilla/fenix/exceptions/ExceptionsFragment.kt | 6 +-----
 .../exceptions/viewholders/ExceptionsListItemViewHolder.kt  | 3 ---
 app/src/main/res/layout/exception_item.xml                  | 1 -
 4 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
index 3b67e9423..a98e16651 100644
--- a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
+++ b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
@@ -54,11 +54,6 @@ object FeatureFlags {
      */
     val fenixLanguagePicker = Config.channel.isNightlyOrDebug
 
-    /**
-     * Enables deleting individual tracking protection exceptions.
-     */
-    val deleteIndividualTrackingProtectionExceptions = Config.channel.isNightlyOrDebug
-
     /**
      * Integration of push support provided by `feature-push` component into the Gecko engine.
      *
diff --git a/app/src/main/java/org/mozilla/fenix/exceptions/ExceptionsFragment.kt b/app/src/main/java/org/mozilla/fenix/exceptions/ExceptionsFragment.kt
index 9d4b07ead..10485d3ee 100644
--- a/app/src/main/java/org/mozilla/fenix/exceptions/ExceptionsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/exceptions/ExceptionsFragment.kt
@@ -16,7 +16,6 @@ import mozilla.components.concept.engine.content.blocking.TrackingProtectionExce
 import mozilla.components.feature.session.TrackingProtectionUseCases
 import mozilla.components.lib.state.ext.consumeFrom
 import org.mozilla.fenix.BrowserDirection
-import org.mozilla.fenix.FeatureFlags
 import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.R
 import org.mozilla.fenix.components.StoreProvider
@@ -77,10 +76,7 @@ class ExceptionsFragment : Fragment() {
     }
 
     private fun deleteOneItem(item: TrackingProtectionException) {
-        // This feature hasn't been uplifted yet.
-        if (FeatureFlags.deleteIndividualTrackingProtectionExceptions) {
-            trackingProtectionUseCases.removeException(item)
-        }
+        trackingProtectionUseCases.removeException(item)
         Log.e("Remove one exception", "$item")
         reloadExceptions()
     }
diff --git a/app/src/main/java/org/mozilla/fenix/exceptions/viewholders/ExceptionsListItemViewHolder.kt b/app/src/main/java/org/mozilla/fenix/exceptions/viewholders/ExceptionsListItemViewHolder.kt
index f5875792f..f4f241a8c 100644
--- a/app/src/main/java/org/mozilla/fenix/exceptions/viewholders/ExceptionsListItemViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/exceptions/viewholders/ExceptionsListItemViewHolder.kt
@@ -5,11 +5,9 @@
 package org.mozilla.fenix.exceptions.viewholders
 
 import android.view.View
-import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
 import kotlinx.android.synthetic.main.exception_item.view.*
 import mozilla.components.concept.engine.content.blocking.TrackingProtectionException
-import org.mozilla.fenix.FeatureFlags
 import org.mozilla.fenix.R
 import org.mozilla.fenix.exceptions.ExceptionsInteractor
 import org.mozilla.fenix.ext.components
@@ -40,7 +38,6 @@ class ExceptionsListItemViewHolder(
     fun bind(item: TrackingProtectionException) {
         this.item = item
         url.text = item.url
-        deleteButton.isVisible = FeatureFlags.deleteIndividualTrackingProtectionExceptions
         updateFavIcon(item.url)
     }
 
diff --git a/app/src/main/res/layout/exception_item.xml b/app/src/main/res/layout/exception_item.xml
index 290cd1298..15138c60a 100644
--- a/app/src/main/res/layout/exception_item.xml
+++ b/app/src/main/res/layout/exception_item.xml
@@ -47,7 +47,6 @@
         tools:text="mozilla.org" />
 
     <ImageButton
-        android:visibility="gone"
         android:id="@+id/delete_exception"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"