Archives/iceraven-browser
2
0
Fork 0
mirror of https://github.com/fork-maintainers/iceraven-browser synced 2024-11-19 09:25:34 +00:00
Code Issues Releases Wiki Activity

[fenix] No issue: Remove feature flag for removing one TP exception

Browse Source
This commit is contained in:
Arturo Mejia 2020-03-24 10:30:22 -04:00
parent 41b3cbf069
commit ae917577f1
4 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
View File

@ -54,11 +54,6 @@ object FeatureFlags {
*/ */
val fenixLanguagePicker = Config.channel.isNightlyOrDebug 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. * Integration of push support provided by `feature-push` component into the Gecko engine.
* *

6
app/src/main/java/org/mozilla/fenix/exceptions/ExceptionsFragment.kt
View File

@ -16,7 +16,6 @@ import mozilla.components.concept.engine.content.blocking.TrackingProtectionExce
import mozilla.components.feature.session.TrackingProtectionUseCases import mozilla.components.feature.session.TrackingProtectionUseCases
import mozilla.components.lib.state.ext.consumeFrom import mozilla.components.lib.state.ext.consumeFrom
import org.mozilla.fenix.BrowserDirection import org.mozilla.fenix.BrowserDirection
import org.mozilla.fenix.FeatureFlags
import org.mozilla.fenix.HomeActivity import org.mozilla.fenix.HomeActivity
import org.mozilla.fenix.R import org.mozilla.fenix.R
import org.mozilla.fenix.components.StoreProvider import org.mozilla.fenix.components.StoreProvider
@ -77,10 +76,7 @@ class ExceptionsFragment : Fragment() {
} }
private fun deleteOneItem(item: TrackingProtectionException) { private fun deleteOneItem(item: TrackingProtectionException) {
// This feature hasn't been uplifted yet. trackingProtectionUseCases.removeException(item)
if (FeatureFlags.deleteIndividualTrackingProtectionExceptions) {
trackingProtectionUseCases.removeException(item)
}
Log.e("Remove one exception", "$item") Log.e("Remove one exception", "$item")
reloadExceptions() reloadExceptions()
} }

3
app/src/main/java/org/mozilla/fenix/exceptions/viewholders/ExceptionsListItemViewHolder.kt
View File

@ -5,11 +5,9 @@
package org.mozilla.fenix.exceptions.viewholders package org.mozilla.fenix.exceptions.viewholders
import android.view.View import android.view.View
import androidx.core.view.isVisible
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import kotlinx.android.synthetic.main.exception_item.view.* import kotlinx.android.synthetic.main.exception_item.view.*
import mozilla.components.concept.engine.content.blocking.TrackingProtectionException import mozilla.components.concept.engine.content.blocking.TrackingProtectionException
import org.mozilla.fenix.FeatureFlags
import org.mozilla.fenix.R import org.mozilla.fenix.R
import org.mozilla.fenix.exceptions.ExceptionsInteractor import org.mozilla.fenix.exceptions.ExceptionsInteractor
import org.mozilla.fenix.ext.components import org.mozilla.fenix.ext.components
@ -40,7 +38,6 @@ class ExceptionsListItemViewHolder(
fun bind(item: TrackingProtectionException) { fun bind(item: TrackingProtectionException) {
this.item = item this.item = item
url.text = item.url url.text = item.url
deleteButton.isVisible = FeatureFlags.deleteIndividualTrackingProtectionExceptions
updateFavIcon(item.url) updateFavIcon(item.url)
} }

1
app/src/main/res/layout/exception_item.xml
View File

@ -47,7 +47,6 @@
tools:text="mozilla.org" /> tools:text="mozilla.org" />
<ImageButton <ImageButton
android:visibility="gone"
android:id="@+id/delete_exception" android:id="@+id/delete_exception"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"