Skip to content

Commit bd53e83

Browse files
anikikianikiki
authored
Followup: New temporary pixels for "Notify Me" component / Follow-up: remove parameter for Android13 (#3007)
Task/Issue URL: https://app.asana.com/0/69071770703008/1203884929941926/f https://app.asana.com/0/69071770703008/1203353347663734/f ### Description Removed temporary pixels added as part of notifications permissions changes on Android 13. - Pixel `m_notify_me_component_notify_me_button_pressed` (AppTP & Browser) - Pixel `m_notify_me_component_close_button_pressed` (AppTP & Browser) - Param `os_version_13_or_above` set from onboarding when default browser set / not set (Browser) ### Steps to test this PR DDG set as default browser - [x] Install from this branch. - [x] Filter logcat by `Pixel sent`. - [ ] Start onboarding and notice the `Set DDG as default browser`. Choose to set it. - [x] Check that you see in the logs `Pixel sent: m_db_s with params: {fo=true}`. It does not contain the `os_version_13_or_above` param. DDG NOT set as default browser + notify me - [x] Install from this branch and don't allow notifications (if on Android 13, else disable notifications). - [x] Filter logcat by `Pixel sent`. - [x] Start onboarding and notice the `Set DDG as default browser`. Choose and set any other browser as default. - [x] Check that you see in the logs `Pixel sent: m_db_ns with params: {fo=true}`. It does not contain the `os_version_13_or_above` param. - [x] Go to the `Downloads` screen. - [x] Notice the `Notify Me` component. - [x] Tap on `Notify Me` button. Don't allow notifications. - [x] Check that the `m_notify_me_component_notify_me_button_pressed` pixel is never sent. - [x] Tap on the close button on `Notify Me` component. - [x] Check that the `m_notify_me_component_close_button_pressed` pixel is never sent. - [x] Enable AppTP. - [x] Notice the `Notify Me` component. - [x] Tap on `Notify Me` button. Don't allow notifications. - [x] Check that the `m_notify_me_component_notify_me_button_pressed` pixel is never sent. - [x] Tap on the close button on `Notify Me` component. - [x] Check that the `m_notify_me_component_close_button_pressed` pixel is never sent. ### NO UI changes
1 parent a783899 commit bd53e83

File tree

19 files changed

+14
-274
lines changed

19 files changed

+14
-274
lines changed

‎app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/pixels/DeviceShieldPixelNames.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,8 +203,5 @@ enum class DeviceShieldPixelNames(override val pixelName: String, val enqueue: B
203203
ATP_REPORT_VPN_NETWORK_STACK_CREATE_ERROR("m_atp_ev_apptp_create_network_stack_error_c"),
204204
ATP_REPORT_VPN_NETWORK_STACK_CREATE_ERROR_DAILY("m_atp_ev_apptp_create_network_stack_error_d"),
205205

206-
ATP_DID_PRESS_NOTIFY_ME_BUTTON("m_notify_me_component_notify_me_button_pressed"),
207-
ATP_DID_PRESS_NOTIFY_ME_DISMISS_BUTTON("m_notify_me_component_close_button_pressed"),
208-
209206
;
210207
}

‎app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/pixels/DeviceShieldPixels.kt

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -338,10 +338,6 @@ interface DeviceShieldPixels {
338338
fun didPressOnAppTpEnabledCtaButton()
339339

340340
fun reportErrorCreatingVpnNetworkStack()
341-
342-
fun didPressOnNotifyMeButton(metadata: Map<String, String>)
343-
344-
fun didPressOnNotifyMeDismissButton(metadata: Map<String, String>)
345341
}
346342

347343
@ContributesBinding(AppScope::class)
@@ -753,14 +749,6 @@ class RealDeviceShieldPixels @Inject constructor(
753749
firePixel(DeviceShieldPixelNames.ATP_REPORT_VPN_NETWORK_STACK_CREATE_ERROR)
754750
}
755751

756-
override fun didPressOnNotifyMeButton(metadata: Map<String, String>) {
757-
firePixel(DeviceShieldPixelNames.ATP_DID_PRESS_NOTIFY_ME_BUTTON, metadata)
758-
}
759-
760-
override fun didPressOnNotifyMeDismissButton(metadata: Map<String, String>) {
761-
firePixel(DeviceShieldPixelNames.ATP_DID_PRESS_NOTIFY_ME_DISMISS_BUTTON, metadata)
762-
}
763-
764752
private fun firePixel(
765753
p: DeviceShieldPixelNames,
766754
payload: Map<String, String> = emptyMap(),

‎app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/tracker_activity/DeviceShieldTrackerActivity.kt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -155,14 +155,6 @@ class DeviceShieldTrackerActivity :
155155
binding.ctaShowAll.setOnClickListener {
156156
viewModel.onViewEvent(ViewEvent.LaunchMostRecentActivity)
157157
}
158-
159-
binding.deviceShieldTrackerNotifyMe.onNotifyMeClicked {
160-
viewModel.onViewEvent(ViewEvent.NotifyMeClicked)
161-
}
162-
163-
binding.deviceShieldTrackerNotifyMe.onDismissClicked {
164-
viewModel.onViewEvent(ViewEvent.NotifyMeDismissClicked)
165-
}
166158
}
167159

168160
override fun onActivityResult(

‎app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/tracker_activity/DeviceShieldTrackerActivityViewModel.kt

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,6 @@ class DeviceShieldTrackerActivityViewModel @Inject constructor(
154154
ViewEvent.PromoteAlwaysOnCancelled -> onAlwaysOnPromotionDialogCancelled()
155155
is ViewEvent.AlwaysOnInitialState -> onAlwaysOnInitialState(viewEvent.alwaysOnState)
156156
ViewEvent.LaunchTrackingProtectionExclusionListActivity -> sendCommand(Command.LaunchTrackingProtectionExclusionListActivity)
157-
ViewEvent.NotifyMeClicked -> firePixel(viewEvent)
158-
ViewEvent.NotifyMeDismissClicked -> firePixel(viewEvent)
159157
}
160158
}
161159

@@ -195,15 +193,6 @@ class DeviceShieldTrackerActivityViewModel @Inject constructor(
195193
}
196194
}
197195

198-
private fun firePixel(viewEvent: ViewEvent) {
199-
val metadata = mapOf(PIXEL_PARAM_NOTIFY_ME_FROM_SCREEN_NAME to PIXEL_PARAM_NOTIFY_ME_FROM_SCREEN_VALUE)
200-
if (viewEvent == ViewEvent.NotifyMeClicked) {
201-
deviceShieldPixels.didPressOnNotifyMeButton(metadata)
202-
} else if (viewEvent == ViewEvent.NotifyMeDismissClicked) {
203-
deviceShieldPixels.didPressOnNotifyMeDismissButton(metadata)
204-
}
205-
}
206-
207196
fun bannerState(): BannerState {
208197
return if (vpnStore.getAndSetOnboardingSession()) {
209198
BannerState.OnboardingBanner
@@ -245,8 +234,6 @@ class DeviceShieldTrackerActivityViewModel @Inject constructor(
245234
object RemoveFeature : ViewEvent()
246235
object StartVpn : ViewEvent()
247236
object AskToRemoveFeature : ViewEvent()
248-
object NotifyMeClicked : ViewEvent()
249-
object NotifyMeDismissClicked : ViewEvent()
250237

251238
object PromoteAlwaysOnOpenSettings : ViewEvent()
252239
object PromoteAlwaysOnCancelled : ViewEvent()
@@ -274,11 +261,6 @@ class DeviceShieldTrackerActivityViewModel @Inject constructor(
274261
object OpenVpnSettings : Command()
275262
object ShowAppTpEnabledCta : Command()
276263
}
277-
278-
companion object {
279-
internal const val PIXEL_PARAM_NOTIFY_ME_FROM_SCREEN_NAME = "from_screen"
280-
internal const val PIXEL_PARAM_NOTIFY_ME_FROM_SCREEN_VALUE = "apptp"
281-
}
282264
}
283265

284266
internal inline class TrackerCount(val value: Int)

‎app-tracking-protection/vpn-impl/src/test/java/com/duckduckgo/mobile/android/vpn/pixels/DeviceShieldPixelNamesTest.kt

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,14 @@
1616

1717
package com.duckduckgo.mobile.android.vpn.pixels
1818

19-
import com.duckduckgo.mobile.android.vpn.pixels.DeviceShieldPixelNames.ATP_DID_PRESS_NOTIFY_ME_BUTTON
20-
import com.duckduckgo.mobile.android.vpn.pixels.DeviceShieldPixelNames.ATP_DID_PRESS_NOTIFY_ME_DISMISS_BUTTON
2119
import org.junit.Assert.assertTrue
2220
import org.junit.Test
2321

2422
class DeviceShieldPixelNamesTest {
2523
@Test
2624
fun allAppTrackingProtectionPixelsShallBePrefixed() {
27-
DeviceShieldPixelNames.values()
28-
// These 2 pixels have the same names across browser and AppTP and should not have the "m_atp" prefix.
29-
.filter { it != ATP_DID_PRESS_NOTIFY_ME_BUTTON && it != ATP_DID_PRESS_NOTIFY_ME_DISMISS_BUTTON }
30-
.map { it.pixelName }.forEach { pixel ->
31-
assertTrue(pixel.startsWith("m_atp"))
32-
}
25+
DeviceShieldPixelNames.values().map { it.pixelName }.forEach { pixel ->
26+
assertTrue(pixel.startsWith("m_atp"))
27+
}
3328
}
3429
}

‎app-tracking-protection/vpn-impl/src/test/java/com/duckduckgo/mobile/android/vpn/ui/tracker_activity/DeviceShieldTrackerActivityViewModelTest.kt

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ import com.duckduckgo.mobile.android.vpn.state.VpnStateMonitor
2929
import com.duckduckgo.mobile.android.vpn.stats.AppTrackerBlockingStatsRepository
3030
import com.duckduckgo.mobile.android.vpn.ui.onboarding.VpnStore
3131
import com.duckduckgo.mobile.android.vpn.ui.tracker_activity.DeviceShieldTrackerActivityViewModel.BannerState
32-
import com.duckduckgo.mobile.android.vpn.ui.tracker_activity.DeviceShieldTrackerActivityViewModel.Companion.PIXEL_PARAM_NOTIFY_ME_FROM_SCREEN_NAME
33-
import com.duckduckgo.mobile.android.vpn.ui.tracker_activity.DeviceShieldTrackerActivityViewModel.Companion.PIXEL_PARAM_NOTIFY_ME_FROM_SCREEN_VALUE
3432
import com.duckduckgo.mobile.android.vpn.ui.tracker_activity.DeviceShieldTrackerActivityViewModel.ViewEvent
3533
import kotlin.time.ExperimentalTime
3634
import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -342,30 +340,4 @@ class DeviceShieldTrackerActivityViewModelTest {
342340

343341
assertEquals(BannerState.OnboardingBanner, bannerState)
344342
}
345-
346-
@Test
347-
fun whenUserClickedOnNotifyMeThenPixelIsSentWithCorrectParams() = runBlocking {
348-
viewModel.commands().test {
349-
viewModel.onViewEvent(ViewEvent.NotifyMeClicked)
350-
351-
verify(deviceShieldPixels).didPressOnNotifyMeButton(
352-
mapOf(PIXEL_PARAM_NOTIFY_ME_FROM_SCREEN_NAME to PIXEL_PARAM_NOTIFY_ME_FROM_SCREEN_VALUE),
353-
)
354-
355-
cancelAndConsumeRemainingEvents()
356-
}
357-
}
358-
359-
@Test
360-
fun whenUserClickedOnDismissNotifyMeThenPixelIsSentWithCorrectParams() = runBlocking {
361-
viewModel.commands().test {
362-
viewModel.onViewEvent(ViewEvent.NotifyMeDismissClicked)
363-
364-
verify(deviceShieldPixels).didPressOnNotifyMeDismissButton(
365-
mapOf(PIXEL_PARAM_NOTIFY_ME_FROM_SCREEN_NAME to PIXEL_PARAM_NOTIFY_ME_FROM_SCREEN_VALUE),
366-
)
367-
368-
cancelAndConsumeRemainingEvents()
369-
}
370-
}
371343
}

‎app/src/main/java/com/duckduckgo/app/downloads/DownloadsAdapter.kt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -192,14 +192,6 @@ class DownloadsAdapter @Inject constructor(
192192
}
193193
},
194194
)
195-
196-
binding.root.onNotifyMeClicked {
197-
listener.onNotifyMeButtonClicked()
198-
}
199-
200-
binding.root.onDismissClicked {
201-
listener.onNotifyMeDismissButtonClicked()
202-
}
203195
}
204196
}
205197

‎app/src/main/java/com/duckduckgo/app/downloads/DownloadsItemListener.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,4 @@ interface DownloadsItemListener {
2929
fun onCancelItemClicked(item: DownloadItem)
3030

3131
fun onItemVisibilityChanged(visible: Boolean)
32-
33-
fun onNotifyMeButtonClicked()
34-
35-
fun onNotifyMeDismissButtonClicked()
3632
}

‎app/src/main/java/com/duckduckgo/app/downloads/DownloadsViewModel.kt

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,6 @@ import com.duckduckgo.app.downloads.DownloadsViewModel.Command.OpenFile
3232
import com.duckduckgo.app.downloads.DownloadsViewModel.Command.ShareFile
3333
import com.duckduckgo.app.global.DispatcherProvider
3434
import com.duckduckgo.app.global.formatters.time.TimeDiffFormatter
35-
import com.duckduckgo.app.pixels.AppPixelName
36-
import com.duckduckgo.app.statistics.pixels.Pixel
37-
import com.duckduckgo.app.statistics.pixels.Pixel.PixelParameter.NOTIFY_ME_FROM_SCREEN
38-
import com.duckduckgo.app.statistics.pixels.Pixel.PixelValues.NOTIFY_ME_DOWNLOADS_SCREEN
3935
import com.duckduckgo.di.scopes.ActivityScope
4036
import com.duckduckgo.downloads.api.DownloadsRepository
4137
import com.duckduckgo.downloads.api.model.DownloadItem
@@ -60,7 +56,6 @@ class DownloadsViewModel @Inject constructor(
6056
private val timeDiffFormatter: TimeDiffFormatter,
6157
private val downloadsRepository: DownloadsRepository,
6258
private val dispatcher: DispatcherProvider,
63-
private val pixel: Pixel,
6459
) : ViewModel(), DownloadsItemListener {
6560

6661
data class ViewState(
@@ -205,14 +200,6 @@ class DownloadsViewModel @Inject constructor(
205200
}
206201
}
207202

208-
override fun onNotifyMeButtonClicked() {
209-
pixel.fire(AppPixelName.NOTIFY_ME_BUTTON_PRESSED, mapOf(NOTIFY_ME_FROM_SCREEN to NOTIFY_ME_DOWNLOADS_SCREEN))
210-
}
211-
212-
override fun onNotifyMeDismissButtonClicked() {
213-
pixel.fire(AppPixelName.NOTIFY_ME_DISMISS_BUTTON_PRESSED, mapOf(NOTIFY_ME_FROM_SCREEN to NOTIFY_ME_DOWNLOADS_SCREEN))
214-
}
215-
216203
private fun DownloadItem.mapToDownloadViewItem(): DownloadViewItem = Item(this)
217204

218205
private fun List<DownloadItem>.mapToDownloadViewItems(): List<DownloadViewItem> {

‎app/src/main/java/com/duckduckgo/app/onboarding/di/WelcomePageModule.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ class WelcomePageModule {
3535
context: Context,
3636
pixel: Pixel,
3737
defaultRoleBrowserDialog: DefaultRoleBrowserDialog,
38-
appBuildConfig: AppBuildConfig,
39-
) = WelcomePageViewModelFactory(appInstallStore, context, pixel, defaultRoleBrowserDialog, appBuildConfig)
38+
) = WelcomePageViewModelFactory(appInstallStore, context, pixel, defaultRoleBrowserDialog)
4039

4140
@Provides
4241
fun defaultRoleBrowserDialog(

‎app/src/main/java/com/duckduckgo/app/onboarding/ui/page/DefaultBrowserPageViewModel.kt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import com.duckduckgo.app.global.SingleLiveEvent
2424
import com.duckduckgo.app.global.install.AppInstallStore
2525
import com.duckduckgo.app.pixels.AppPixelName
2626
import com.duckduckgo.app.statistics.pixels.Pixel
27-
import com.duckduckgo.appbuildconfig.api.AppBuildConfig
2827
import com.duckduckgo.di.scopes.FragmentScope
2928
import javax.inject.Inject
3029

@@ -33,7 +32,6 @@ class DefaultBrowserPageViewModel @Inject constructor(
3332
private val defaultBrowserDetector: DefaultBrowserDetector,
3433
private val pixel: Pixel,
3534
private val installStore: AppInstallStore,
36-
private val appBuildConfig: AppBuildConfig,
3735
) : ViewModel() {
3836

3937
sealed class ViewState {
@@ -173,7 +171,6 @@ class DefaultBrowserPageViewModel @Inject constructor(
173171
val params = mapOf(
174172
Pixel.PixelParameter.DEFAULT_BROWSER_SET_FROM_ONBOARDING to true.toString(),
175173
Pixel.PixelParameter.DEFAULT_BROWSER_SET_ORIGIN to originValue,
176-
Pixel.PixelParameter.DEFAULT_BROWSER_SET_ON_ANDROID_13_OR_ABOVE to appBuildConfig.isAndroid13OrAbove().toString(),
177174
)
178175
pixel.fire(AppPixelName.DEFAULT_BROWSER_SET, params)
179176
} else {
@@ -199,8 +196,6 @@ class DefaultBrowserPageViewModel @Inject constructor(
199196
}
200197
}
201198

202-
private fun AppBuildConfig.isAndroid13OrAbove(): Boolean = sdkInt >= android.os.Build.VERSION_CODES.TIRAMISU
203-
204199
companion object {
205200
const val MAX_DIALOG_ATTEMPTS = 2
206201
const val DEFAULT_URL = "https://duckduckgo.com"

‎app/src/main/java/com/duckduckgo/app/onboarding/ui/page/WelcomePageViewModel.kt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import com.duckduckgo.app.global.DefaultRoleBrowserDialog
2424
import com.duckduckgo.app.global.install.AppInstallStore
2525
import com.duckduckgo.app.pixels.AppPixelName
2626
import com.duckduckgo.app.statistics.pixels.Pixel
27-
import com.duckduckgo.appbuildconfig.api.AppBuildConfig
2827
import kotlinx.coroutines.flow.Flow
2928
import kotlinx.coroutines.flow.flow
3029

@@ -34,7 +33,6 @@ class WelcomePageViewModel(
3433
private val context: Context,
3534
private val pixel: Pixel,
3635
private val defaultRoleBrowserDialog: DefaultRoleBrowserDialog,
37-
private val appBuildConfig: AppBuildConfig,
3836
) : ViewModel() {
3937

4038
fun reduce(event: WelcomePageView.Event): Flow<WelcomePageView.State> {
@@ -68,7 +66,6 @@ class WelcomePageViewModel(
6866
AppPixelName.DEFAULT_BROWSER_SET,
6967
mapOf(
7068
Pixel.PixelParameter.DEFAULT_BROWSER_SET_FROM_ONBOARDING to true.toString(),
71-
Pixel.PixelParameter.DEFAULT_BROWSER_SET_ON_ANDROID_13_OR_ABOVE to appBuildConfig.isAndroid13OrAbove().toString(),
7269
),
7370
)
7471

@@ -84,14 +81,11 @@ class WelcomePageViewModel(
8481
AppPixelName.DEFAULT_BROWSER_NOT_SET,
8582
mapOf(
8683
Pixel.PixelParameter.DEFAULT_BROWSER_SET_FROM_ONBOARDING to true.toString(),
87-
Pixel.PixelParameter.DEFAULT_BROWSER_SET_ON_ANDROID_13_OR_ABOVE to appBuildConfig.isAndroid13OrAbove().toString(),
8884
),
8985
)
9086

9187
emit(WelcomePageView.State.Finish)
9288
}
93-
94-
private fun AppBuildConfig.isAndroid13OrAbove(): Boolean = sdkInt >= android.os.Build.VERSION_CODES.TIRAMISU
9589
}
9690

9791
@Suppress("UNCHECKED_CAST")
@@ -100,7 +94,6 @@ class WelcomePageViewModelFactory(
10094
private val context: Context,
10195
private val pixel: Pixel,
10296
private val defaultRoleBrowserDialog: DefaultRoleBrowserDialog,
103-
private val appBuildConfig: AppBuildConfig,
10497
) : ViewModelProvider.NewInstanceFactory() {
10598

10699
override fun <T : ViewModel> create(modelClass: Class<T>): T {
@@ -111,7 +104,6 @@ class WelcomePageViewModelFactory(
111104
context,
112105
pixel,
113106
defaultRoleBrowserDialog,
114-
appBuildConfig,
115107
)
116108
else -> throw IllegalArgumentException("Unknown ViewModel class: ${modelClass.name}")
117109
}

‎app/src/main/java/com/duckduckgo/app/pixels/AppPixelName.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,4 @@ enum class AppPixelName(override val pixelName: String) : Pixel.PixelName {
247247
REMOTE_MESSAGE_SECONDARY_ACTION_CLICKED("m_remote_message_secondary_action_clicked"),
248248

249249
CREATE_BLOOM_FILTER_ERROR("m_create_bloom_filter_error"),
250-
251-
NOTIFY_ME_BUTTON_PRESSED("m_notify_me_component_notify_me_button_pressed"),
252-
NOTIFY_ME_DISMISS_BUTTON_PRESSED("m_notify_me_component_close_button_pressed"),
253250
}

‎app/src/test/java/com/duckduckgo/app/downloads/DownloadsViewModelTest.kt

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,6 @@ import com.duckduckgo.app.downloads.DownloadsViewModel.Command.ShareFile
3333
import com.duckduckgo.app.global.R as CommonR
3434
import com.duckduckgo.app.global.formatters.time.RealTimeDiffFormatter
3535
import com.duckduckgo.app.global.formatters.time.TimeDiffFormatter
36-
import com.duckduckgo.app.pixels.AppPixelName
37-
import com.duckduckgo.app.statistics.pixels.Pixel
38-
import com.duckduckgo.app.statistics.pixels.Pixel.PixelParameter.NOTIFY_ME_FROM_SCREEN
39-
import com.duckduckgo.app.statistics.pixels.Pixel.PixelValues.NOTIFY_ME_DOWNLOADS_SCREEN
4036
import com.duckduckgo.downloads.api.DownloadsRepository
4137
import com.duckduckgo.downloads.api.model.DownloadItem
4238
import com.duckduckgo.downloads.store.DownloadStatus.FINISHED
@@ -64,7 +60,6 @@ class DownloadsViewModelTest {
6460
var coroutineRule = CoroutineTestRule()
6561

6662
private val mockDownloadsRepository: DownloadsRepository = mock()
67-
private val mockPixel: Pixel = mock()
6863

6964
private val context: Context = mock()
7065

@@ -74,7 +69,6 @@ class DownloadsViewModelTest {
7469
FakeTimeDiffFormatter(TODAY, RealTimeDiffFormatter(context)),
7570
mockDownloadsRepository,
7671
coroutineRule.testDispatcherProvider,
77-
mockPixel,
7872
)
7973
model
8074
}
@@ -342,24 +336,6 @@ class DownloadsViewModelTest {
342336
}
343337
}
344338

345-
@Test
346-
fun whenNotifyMeButtonClickedThenPixelIsSentWithCorrectParams() = runTest {
347-
testee.onNotifyMeButtonClicked()
348-
349-
testee.commands().test {
350-
verify(mockPixel).fire(AppPixelName.NOTIFY_ME_BUTTON_PRESSED, mapOf(NOTIFY_ME_FROM_SCREEN to NOTIFY_ME_DOWNLOADS_SCREEN))
351-
}
352-
}
353-
354-
@Test
355-
fun whenNotifyMeDismissButtonClickedThenPixelIsSentWithCorrectParams() = runTest {
356-
testee.onNotifyMeDismissButtonClicked()
357-
358-
testee.commands().test {
359-
verify(mockPixel).fire(AppPixelName.NOTIFY_ME_DISMISS_BUTTON_PRESSED, mapOf(NOTIFY_ME_FROM_SCREEN to NOTIFY_ME_DOWNLOADS_SCREEN))
360-
}
361-
}
362-
363339
@Test
364340
fun whenRemoveFromDownloadManagerThenRemoveIt() = runTest {
365341
val downloadId = 1L

‎app/src/test/java/com/duckduckgo/app/global/api/AtpPixelRemovalInterceptorTest.kt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,6 @@ class AtpPixelRemovalInterceptorTest {
4343
companion object {
4444
private const val PIXEL_TEMPLATE = "https://improving.duckduckgo.com/t/%s_android_phone?atb=v255-7zu&appVersion=5.74.0&test=1"
4545

46-
private val PIXELS_WITH_ATB_INFO = listOf<String>(
47-
DeviceShieldPixelNames.ATP_DID_PRESS_NOTIFY_ME_BUTTON.pixelName,
48-
DeviceShieldPixelNames.ATP_DID_PRESS_NOTIFY_ME_DISMISS_BUTTON.pixelName,
49-
)
46+
private val PIXELS_WITH_ATB_INFO = listOf<String>()
5047
}
5148
}

0 commit comments

Comments
 (0)