Skip to content

Commit 23b42d0

Browse files
landomendaxmobile
andauthored
Remove web tracking protections grid feature flag (#7068)
Task/Issue URL: https://app.asana.com/1/137249556945/project/1210594645151737/task/1211375666072192?focus=true ### Description Removes `webTrackingProtectionsGrid` feature flag / killswitch that has been enabled by default since launching the feature in September ### Steps to test this PR _Web Tracking Protection Grid_ - [x] Go to Settings -> Web Tracking Protection - [x] Verify you see a grid of cards ### UI changes Removes the old UI variant --------- Co-authored-by: Dax The Translator <daxmobile@duckduckgo.com>
1 parent 0970c87 commit 23b42d0

File tree

29 files changed

+2
-109
lines changed

29 files changed

+2
-109
lines changed

app/src/main/java/com/duckduckgo/app/webtrackingprotection/WebTrackingProtectionActivity.kt

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import android.text.method.LinkMovementMethod
2424
import android.text.style.ClickableSpan
2525
import android.text.style.URLSpan
2626
import android.view.View
27-
import androidx.annotation.StringRes
2827
import androidx.core.view.isVisible
2928
import androidx.lifecycle.Lifecycle
3029
import androidx.lifecycle.flowWithLifecycle
@@ -58,9 +57,6 @@ class WebTrackingProtectionActivity : DuckDuckGoActivity() {
5857
@Inject
5958
lateinit var globalActivityStarter: GlobalActivityStarter
6059

61-
@Inject
62-
lateinit var webTrackingProtectionsGridFeature: WebTrackingProtectionsGridFeature
63-
6460
private val viewModel: WebTrackingProtectionViewModel by bindViewModel()
6561
private val binding: ActivityWebTrackingProtectionBinding by viewBinding()
6662
private lateinit var gridAdapter: FeatureGridAdapter
@@ -96,13 +92,7 @@ class WebTrackingProtectionActivity : DuckDuckGoActivity() {
9692
}
9793

9894
private fun configureClickableLink() {
99-
@StringRes val descriptionStringRes = if (webTrackingProtectionsGridFeature.self().isEnabled()) {
100-
R.string.webTrackingProtectionExplanationDescription
101-
} else {
102-
R.string.webTrackingProtectionDescriptionNew
103-
}
104-
105-
val htmlGPCText = getString(descriptionStringRes).html(this)
95+
val htmlGPCText = getString(R.string.webTrackingProtectionExplanationDescription).html(this)
10696
val gpcSpannableString = SpannableStringBuilder(htmlGPCText)
10797
val urlSpans = htmlGPCText.getSpans(0, htmlGPCText.length, URLSpan::class.java)
10898
urlSpans?.forEach {
@@ -125,10 +115,6 @@ class WebTrackingProtectionActivity : DuckDuckGoActivity() {
125115
}
126116

127117
private fun configureGridList() {
128-
if (!webTrackingProtectionsGridFeature.self().isEnabled()) {
129-
return
130-
}
131-
132118
binding.protectionsListDivider.isVisible = true
133119
binding.protectionsTitle.isVisible = true
134120
binding.protectionsList.isVisible = true
@@ -192,10 +178,6 @@ class WebTrackingProtectionActivity : DuckDuckGoActivity() {
192178
}
193179

194180
private fun updateProtectionsGridList(protectionItems: List<FeatureGridItem>) {
195-
if (!webTrackingProtectionsGridFeature.self().isEnabled()) {
196-
return
197-
}
198-
199181
gridAdapter.submitList(protectionItems)
200182
}
201183
}

app/src/main/java/com/duckduckgo/app/webtrackingprotection/WebTrackingProtectionViewModel.kt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ class WebTrackingProtectionViewModel @Inject constructor(
4141
private val gpc: Gpc,
4242
private val featureToggle: FeatureToggle,
4343
private val pixel: Pixel,
44-
private val webTrackingProtectionsGridFeature: WebTrackingProtectionsGridFeature,
4544
) : ViewModel() {
4645

4746
data class ViewState(
@@ -88,10 +87,6 @@ class WebTrackingProtectionViewModel @Inject constructor(
8887
}
8988

9089
private fun getProtectionItems(): List<FeatureGridItem> {
91-
if (!webTrackingProtectionsGridFeature.self().isEnabled()) {
92-
return emptyList()
93-
}
94-
9590
return listOf(
9691
FeatureGridItem(
9792
iconRes = R.drawable.ic_shield_protection,

app/src/main/java/com/duckduckgo/app/webtrackingprotection/WebTrackingProtectionsGridFeature.kt

Lines changed: 0 additions & 31 deletions
This file was deleted.

app/src/main/res/values-bg/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,6 @@
190190
<string name="webTrackingProtectionActivityTitle">Защита от проследяване в мрежата</string>
191191
<string name="webTrackingProtectionLearnMoreTitle">Защита от проследяване в мрежата</string>
192192
<string name="webTrackingProtectionTitle">Защита от проследяване в мрежата</string>
193-
<string name="webTrackingProtectionDescriptionNew"><![CDATA[DuckDuckGo автоматично блокира скритите тракери, докато сърфирате в мрежата.\n<a href=\"\">Научете повече</a>]]></string>
194193
<string name="webTrackingProtectionExplanationDescription"><![CDATA[Браузърът DuckDuckGo предоставя защити от проследяване, които винаги са активни.\n<a href=\"\">Научете повече</a>]]></string>
195194
<string name="webTrackingProtectionExplanationTitle">Как защитаваме теб</string>
196195
<string name="webTrackingProtectionThirdPartyTrackersTitle">Блокира тракерите на трети страни</string>

app/src/main/res/values-cs/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,6 @@
192192
<string name="webTrackingProtectionActivityTitle">Ochrana před sledováním na webu</string>
193193
<string name="webTrackingProtectionLearnMoreTitle">Ochrana před sledováním na webu</string>
194194
<string name="webTrackingProtectionTitle">Ochrana před sledováním na webu</string>
195-
<string name="webTrackingProtectionDescriptionNew"><![CDATA[DuckDuckGo automaticky blokuje skryté trackery při procházení webu.\n<a href=\"\">Další informace</a>]]></string>
196195
<string name="webTrackingProtectionExplanationDescription"><![CDATA[Prohlížeč DuckDuckGo poskytuje ochranu proti sledování, která je neustále zapnutá.\n<a href=\"\">Další informace</a>]]></string>
197196
<string name="webTrackingProtectionExplanationTitle">Jak tě chráníme</string>
198197
<string name="webTrackingProtectionThirdPartyTrackersTitle">Blokuje trackery třetích stran</string>

app/src/main/res/values-da/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,6 @@
190190
<string name="webTrackingProtectionActivityTitle">Beskyttelse mod sporing på nettet</string>
191191
<string name="webTrackingProtectionLearnMoreTitle">Beskyttelse mod sporing på nettet</string>
192192
<string name="webTrackingProtectionTitle">Beskyttelse mod sporing på nettet</string>
193-
<string name="webTrackingProtectionDescriptionNew"><![CDATA[DuckDuckGo blokerer automatisk skjulte trackere, når du surfer på nettet.\n<a href=\"\">Mere info</a>]]></string>
194193
<string name="webTrackingProtectionExplanationDescription"><![CDATA[DuckDuckGo-browseren giver sporingbeskyttelse, som altid er aktiv.\n<a href=\"\">Mere info</a>]]></string>
195194
<string name="webTrackingProtectionExplanationTitle">Sådan beskytter vi dig</string>
196195
<string name="webTrackingProtectionThirdPartyTrackersTitle">Bloker tredjeparts-trackere</string>

app/src/main/res/values-de/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,6 @@
190190
<string name="webTrackingProtectionActivityTitle">Web Tracking Protection</string>
191191
<string name="webTrackingProtectionLearnMoreTitle">Web Tracking Protection</string>
192192
<string name="webTrackingProtectionTitle">Web Tracking Protection</string>
193-
<string name="webTrackingProtectionDescriptionNew"><![CDATA[DuckDuckGo blockiert automatisch versteckte Tracker, während du browst.\n<a href=\"\">Mehr erfahren</a>]]></string>
194193
<string name="webTrackingProtectionExplanationDescription"><![CDATA[Der DuckDuckGo-Browser bietet Tracking-Schutz, der immer aktiv ist.\n<a href=\"\">Mehr erfahren</a>]]></string>
195194
<string name="webTrackingProtectionExplanationTitle">Wie wir dich schützen</string>
196195
<string name="webTrackingProtectionThirdPartyTrackersTitle">Blockiert Tracker von Drittanbietern</string>

app/src/main/res/values-el/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,6 @@
190190
<string name="webTrackingProtectionActivityTitle">Προστασία παρακολούθησης ιστού</string>
191191
<string name="webTrackingProtectionLearnMoreTitle">Προστασία παρακολούθησης ιστού</string>
192192
<string name="webTrackingProtectionTitle">Προστασία παρακολούθησης ιστού</string>
193-
<string name="webTrackingProtectionDescriptionNew"><![CDATA[Το DuckDuckGo αποκλείει αυτόματα κρυφές εφαρμογές παρακολούθησης καθώς περιηγείστε στο διαδίκτυο.\n<a href=\"\">Μάθετε περισσότερα</a>]]></string>
194193
<string name="webTrackingProtectionExplanationDescription"><![CDATA[Το πρόγραμμα περιήγησης DuckDuckGo παρέχει προστασίες παρακολούθησης, οι οποίες είναι πάντα ενεργές.\n<a href=\"\">Μάθετε περισσότερα</a>]]></string>
195194
<string name="webTrackingProtectionExplanationTitle">Πώς σας προστατεύουμε</string>
196195
<string name="webTrackingProtectionThirdPartyTrackersTitle">Αποκλείει τις εφαρμογές παρακολούθησης τρίτων</string>

app/src/main/res/values-es/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,6 @@
190190
<string name="webTrackingProtectionActivityTitle">Protección de rastreo en la web</string>
191191
<string name="webTrackingProtectionLearnMoreTitle">Protección de rastreo en la web</string>
192192
<string name="webTrackingProtectionTitle">Protección de rastreo en la web</string>
193-
<string name="webTrackingProtectionDescriptionNew"><![CDATA[DuckDuckGo bloquea automáticamente los rastreadores ocultos mientras navegas por la web.\n<a href=\"\">Más información</a>]]></string>
194193
<string name="webTrackingProtectionExplanationDescription"><![CDATA[El navegador DuckDuckGo proporciona protecciones de rastreo que están siempre activas.\n<a href=\"\">Más información</a>]]></string>
195194
<string name="webTrackingProtectionExplanationTitle">Cómo te protegemos</string>
196195
<string name="webTrackingProtectionThirdPartyTrackersTitle">Bloquea rastreadores de terceros</string>

app/src/main/res/values-et/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,6 @@
190190
<string name="webTrackingProtectionActivityTitle">Veebijälgimise kaitse</string>
191191
<string name="webTrackingProtectionLearnMoreTitle">Veebijälgimise kaitse</string>
192192
<string name="webTrackingProtectionTitle">Veebijälgimise kaitse</string>
193-
<string name="webTrackingProtectionDescriptionNew"><![CDATA[DuckDuckGo blokeerib automaatselt peidetud jälgijaid, kui sa veebis sirvid.\n<a href=\"\">Loe edasi</a>]]></string>
194193
<string name="webTrackingProtectionExplanationDescription"><![CDATA[DuckDuckGo brauser pakub jälgimiskaitseid, mis on alati aktiivsed.\n<a href=\"\">Loe edasi</a>]]></string>
195194
<string name="webTrackingProtectionExplanationTitle">Kuidas me sind kaitseme</string>
196195
<string name="webTrackingProtectionThirdPartyTrackersTitle">Blokeerib kolmanda poole jälgurid</string>

0 commit comments

Comments
 (0)