1
0
Fork 0

For #10968 - Don't show ETP CFR if toolbar doesn't have window focus

master
ekager 2020-05-29 17:49:44 -04:00 committed by Jeff Boek
parent 4da22c605a
commit 9ef4d9bdae
2 changed files with 13 additions and 0 deletions

View File

@ -44,6 +44,7 @@ class TrackingProtectionOverlay(
@Suppress("MagicNumber", "InflateParams")
private fun showTrackingProtectionOnboarding() {
if (!getToolbar().hasWindowFocus()) return
val trackingOnboardingDialog = Dialog(context)
val layout = LayoutInflater.from(context)
.inflate(R.layout.tracking_protection_onboarding_popup, null)

View File

@ -80,6 +80,7 @@ class TrackingProtectionOverlayTest {
@Test
fun `show onboarding when trackers are blocked`() {
every { toolbar.hasWindowFocus() } returns true
every { settings.shouldShowTrackingProtectionOnboarding } returns true
every { session.trackerBlockingEnabled } returns true
every { session.trackersBlocked } returns listOf(mockk())
@ -87,4 +88,15 @@ class TrackingProtectionOverlayTest {
overlay.onLoadingStateChanged(session, loading = false)
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() }
}
}