Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix bug is disabled notif after beta #3875

Merged
merged 1 commit into from
Nov 16, 2023
Merged

Fix bug is disabled notif after beta #3875

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions ...a/com/duckduckgo/networkprotection/impl/notification/NetPDisabledNotificationScheduler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import com.duckduckgo.mobile.android.vpn.service.VpnServiceCallbacks
import com.duckduckgo.mobile.android.vpn.state.VpnStateMonitor.VpnStopReason
import com.duckduckgo.networkprotection.api.NetworkProtectionState
import com.duckduckgo.networkprotection.impl.settings.NetPSettingsLocalConfig
import com.duckduckgo.networkprotection.impl.waitlist.NetPRemoteFeature
import com.squareup.anvil.annotations.ContributesMultibinding
import java.util.concurrent.atomic.AtomicReference
import javax.inject.Inject
Expand All @@ -43,6 +44,7 @@ class NetPDisabledNotificationScheduler @Inject constructor(
private val netPSettingsLocalConfig: NetPSettingsLocalConfig,
@AppCoroutineScope private val coroutineScope: CoroutineScope,
private val dispatcherProvider: DispatcherProvider,
private val netPRemoteFeature: NetPRemoteFeature,
) : VpnServiceCallbacks {

private var isNetPEnabled: AtomicReference<Boolean> = AtomicReference(false)
Expand Down Expand Up @@ -77,7 +79,7 @@ class NetPDisabledNotificationScheduler @Inject constructor(

private suspend fun shouldShowImmediateNotification(): Boolean {
// When VPN is stopped and if AppTP has been enabled AND user has been onboarded, then we show the disabled notif
return isNetPEnabled.get() && networkProtectionState.isOnboarded()
return isNetPEnabled.get() && networkProtectionState.isOnboarded() && netPRemoteFeature.waitlistBetaActive().isEnabled()
}

private suspend fun onVPNManuallyStopped() {
Expand All @@ -91,7 +93,7 @@ class NetPDisabledNotificationScheduler @Inject constructor(
override fun onVpnReconfigured(coroutineScope: CoroutineScope) {
coroutineScope.launch(dispatcherProvider.io()) {
val reconfiguredNetPState = networkProtectionState.isEnabled()
if (isNetPEnabled.getAndSet(reconfiguredNetPState) != reconfiguredNetPState) {
if (isNetPEnabled.getAndSet(reconfiguredNetPState) != reconfiguredNetPState && netPRemoteFeature.waitlistBetaActive().isEnabled()) {
if (!reconfiguredNetPState) {
logcat { "VPN has been reconfigured, showing disabled notification for NetP" }
showDisabledNotification()
Expand Down
Loading