Skip to content

Commit f9b516e

Browse files
committed
Also use AdBlockingStatusChecker in AdBlockingSettings
1 parent 0492f1d commit f9b516e

3 files changed

Lines changed: 18 additions & 3 deletions

File tree

ad-blocking/ad-blocking-impl/src/main/java/com/duckduckgo/adblocking/impl/domain/AdBlockingStatusChecker.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import javax.inject.Inject
3131

3232
interface AdBlockingStatusChecker {
3333
fun canInject(): Boolean
34+
fun isShownInSettings(): Boolean
3435
}
3536

3637
@SingleInstanceIn(AppScope::class)
@@ -59,4 +60,6 @@ class RealAdBlockingStatusChecker @Inject constructor(
5960
}
6061
return true
6162
}
63+
64+
override fun isShownInSettings(): Boolean = feature.isDiscoverable().isEnabled()
6265
}

ad-blocking/ad-blocking-impl/src/main/java/com/duckduckgo/adblocking/impl/ui/AdBlockingSettings.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package com.duckduckgo.adblocking.impl.ui
1919
import android.content.Context
2020
import android.view.View
2121
import com.duckduckgo.adblocking.impl.R
22-
import com.duckduckgo.adblocking.impl.remoteconfig.AdBlockingExtensionFeature
22+
import com.duckduckgo.adblocking.impl.domain.AdBlockingStatusChecker
2323
import com.duckduckgo.anvil.annotations.PriorityKey
2424
import com.duckduckgo.common.ui.view.listitem.OneLineListItem
2525
import com.duckduckgo.di.scopes.ActivityScope
@@ -33,11 +33,11 @@ import com.duckduckgo.mobile.android.R as CommonR
3333
@PriorityKey(150)
3434
class AdBlockingSettingsEntry @Inject constructor(
3535
private val globalActivityStarter: GlobalActivityStarter,
36-
private val feature: AdBlockingExtensionFeature,
36+
private val statusChecker: AdBlockingStatusChecker,
3737
) : AdBlockingSettingsPlugin {
3838

3939
override fun getView(context: Context): View {
40-
if (!feature.isDiscoverable().isEnabled()) {
40+
if (!statusChecker.isShownInSettings()) {
4141
return View(context).apply { visibility = View.GONE }
4242
}
4343
return OneLineListItem(context).apply {

ad-blocking/ad-blocking-impl/src/test/java/com/duckduckgo/adblocking/impl/domain/RealAdBlockingStatusCheckerTest.kt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,4 +93,16 @@ class RealAdBlockingStatusCheckerTest {
9393

9494
assertFalse(checker.canInject())
9595
}
96+
97+
@Test
98+
fun whenDiscoverableFlagEnabledThenIsShownInSettings() {
99+
assertTrue(checker.isShownInSettings())
100+
}
101+
102+
@Test
103+
fun whenDiscoverableFlagDisabledThenIsNotShownInSettings() {
104+
discoverableEnabled = false
105+
106+
assertFalse(checker.isShownInSettings())
107+
}
96108
}

0 commit comments

Comments
 (0)