No issue: Remove feature flag for removing one TP exception
parent
55ea92be5b
commit
b484ad38cc
|
@ -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.
|
||||
*
|
||||
|
|
|
@ -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()
|
||||
}
|
||||
|
|
|
@ -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)
|
||||
}
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
|
Loading…
Reference in New Issue