Fix Disconnect/re-connect from notification when both VPN and AppTP a…

…re enabled
duckduckgo · Oct 18, 2024 · 5f36fbf · 5f36fbf
1 parent 1cec8c1
commit 5f36fbf
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/...ion/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/service/VpnActionReceiver.kt b/...ion/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/service/VpnActionReceiver.kt
@@ -25,8 +25,10 @@ import android.os.SystemClock
 import com.duckduckgo.anvil.annotations.InjectWith
 import com.duckduckgo.common.utils.DispatcherProvider
 import com.duckduckgo.di.scopes.ReceiverScope
+import com.duckduckgo.mobile.android.app.tracking.AppTrackingProtection
 import com.duckduckgo.mobile.android.vpn.Vpn
 import com.duckduckgo.mobile.android.vpn.pixels.DeviceShieldPixels
+import com.duckduckgo.networkprotection.api.NetworkProtectionState
 import dagger.android.AndroidInjection
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
@@ -38,6 +40,10 @@ import logcat.logcat
 class VpnActionReceiver : BroadcastReceiver() {
     @Inject lateinit var vpn: Vpn
 
+    @Inject lateinit var networkProtectionState: NetworkProtectionState
+
+    @Inject lateinit var appTrackingProtection: AppTrackingProtection
+
     @Inject lateinit var dispatcherProvider: DispatcherProvider
 
     @Inject lateinit var context: Context
@@ -65,7 +71,10 @@ class VpnActionReceiver : BroadcastReceiver() {
             ACTION_VPN_DISABLE -> {
                 logcat { "Entire VPN will disabled because the user asked it" }
                 goAsync(pendingResult) {
+                    // instead of stopping the VPN, we stop the VPN features individually
                     vpn.stop()
+                    appTrackingProtection.stop()
+                    networkProtectionState.stop()
                 }
             }
 

diff --git a/...o/mobile/android/vpn/service/notification/AppTPAndNetPEnabledNotificationContentPlugin.kt b/...o/mobile/android/vpn/service/notification/AppTPAndNetPEnabledNotificationContentPlugin.kt
@@ -33,6 +33,7 @@ import com.squareup.anvil.annotations.ContributesMultibinding
 import dagger.SingleInstanceIn
 import javax.inject.Inject
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.runBlocking
 
@@ -77,6 +78,7 @@ class AppTPAndNetPEnabledNotificationContentPlugin @Inject constructor(
         }
 
         return repository.getVpnTrackers({ dateOfLastHour() })
+            .filter { isActive() } // make sure we only emit when this plugin is active
             .map { trackersBlocked ->
                 val trackingApps = trackersBlocked.trackingApps()
                 val location = networkProtectionState.serverLocation()

diff --git a/...ckduckgo/mobile/android/vpn/service/notification/AppTpEnabledNotificationContentPlugin.kt b/...ckduckgo/mobile/android/vpn/service/notification/AppTpEnabledNotificationContentPlugin.kt
@@ -79,6 +79,7 @@ class AppTpEnabledNotificationContentPlugin @Inject constructor(
         }
 
         return repository.getVpnTrackers({ dateOfLastHour() })
+            .filter { isActive() } // make sure we only emit when this plugin is active
             .map { trackersBlocked ->
                 val trackingApps = trackersBlocked.trackingApps()
                 val isEnabled = appTrackingProtection.isEnabled()