For #10968 - Don't show ETP CFR if toolbar doesn't have window focus
parent
4da22c605a
commit
9ef4d9bdae
|
@ -44,6 +44,7 @@ class TrackingProtectionOverlay(
|
||||||
|
|
||||||
@Suppress("MagicNumber", "InflateParams")
|
@Suppress("MagicNumber", "InflateParams")
|
||||||
private fun showTrackingProtectionOnboarding() {
|
private fun showTrackingProtectionOnboarding() {
|
||||||
|
if (!getToolbar().hasWindowFocus()) return
|
||||||
val trackingOnboardingDialog = Dialog(context)
|
val trackingOnboardingDialog = Dialog(context)
|
||||||
val layout = LayoutInflater.from(context)
|
val layout = LayoutInflater.from(context)
|
||||||
.inflate(R.layout.tracking_protection_onboarding_popup, null)
|
.inflate(R.layout.tracking_protection_onboarding_popup, null)
|
||||||
|
|
|
@ -80,6 +80,7 @@ class TrackingProtectionOverlayTest {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun `show onboarding when trackers are blocked`() {
|
fun `show onboarding when trackers are blocked`() {
|
||||||
|
every { toolbar.hasWindowFocus() } returns true
|
||||||
every { settings.shouldShowTrackingProtectionOnboarding } returns true
|
every { settings.shouldShowTrackingProtectionOnboarding } returns true
|
||||||
every { session.trackerBlockingEnabled } returns true
|
every { session.trackerBlockingEnabled } returns true
|
||||||
every { session.trackersBlocked } returns listOf(mockk())
|
every { session.trackersBlocked } returns listOf(mockk())
|
||||||
|
@ -87,4 +88,15 @@ class TrackingProtectionOverlayTest {
|
||||||
overlay.onLoadingStateChanged(session, loading = false)
|
overlay.onLoadingStateChanged(session, loading = false)
|
||||||
verify { settings.incrementTrackingProtectionOnboardingCount() }
|
verify { settings.incrementTrackingProtectionOnboardingCount() }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `no-op when toolbar doesn't have focus`() {
|
||||||
|
every { toolbar.hasWindowFocus() } returns false
|
||||||
|
every { settings.shouldShowTrackingProtectionOnboarding } returns true
|
||||||
|
every { session.trackerBlockingEnabled } returns true
|
||||||
|
every { session.trackersBlocked } returns listOf(mockk())
|
||||||
|
|
||||||
|
overlay.onLoadingStateChanged(session, loading = false)
|
||||||
|
verify(exactly = 0) { settings.incrementTrackingProtectionOnboardingCount() }
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue