Add export behavior to registered broadcast receivers

duckduckgo · Jan 10, 2024 · 402e249 · 402e249
1 parent c60e17b
commit 402e249
Show file tree

Hide file tree

Showing 15 changed files with 47 additions and 20 deletions.
diff --git a/.../vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/apps/NewAppBroadcastReceiver.kt b/.../vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/apps/NewAppBroadcastReceiver.kt
@@ -22,6 +22,7 @@ import android.content.Intent
 import android.content.IntentFilter
 import androidx.annotation.MainThread
 import androidx.annotation.WorkerThread
+import androidx.core.content.ContextCompat
 import com.duckduckgo.common.utils.DispatcherProvider
 import com.duckduckgo.di.scopes.AppScope
 import com.duckduckgo.di.scopes.VpnScope
@@ -81,7 +82,7 @@ class NewAppBroadcastReceiver @Inject constructor(
             addAction(Intent.ACTION_PACKAGE_ADDED)
             addDataScheme("package")
         }.run {
-            applicationContext.registerReceiver(this@NewAppBroadcastReceiver, this)
+            ContextCompat.registerReceiver(applicationContext, this@NewAppBroadcastReceiver, this, ContextCompat.RECEIVER_EXPORTED)
         }
     }
 

diff --git a/...in/java/com/duckduckgo/mobile/android/vpn/debug/DeviceShieldNotificationsDebugReceiver.kt b/...in/java/com/duckduckgo/mobile/android/vpn/debug/DeviceShieldNotificationsDebugReceiver.kt
@@ -21,6 +21,7 @@ import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import androidx.core.app.NotificationManagerCompat
+import androidx.core.content.ContextCompat
 import androidx.lifecycle.LifecycleOwner
 import com.duckduckgo.app.di.AppCoroutineScope
 import com.duckduckgo.app.lifecycle.MainProcessLifecycleObserver
@@ -49,7 +50,7 @@ class DeviceShieldNotificationsDebugReceiver(
 ) : BroadcastReceiver() {
 
     init {
-        context.registerReceiver(this, IntentFilter(intentAction))
+        ContextCompat.registerReceiver(context, this, IntentFilter(intentAction), ContextCompat.RECEIVER_NOT_EXPORTED)
     }
 
     override fun onReceive(

diff --git a/...pn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/debug/SendTrackerDebugReceiver.kt b/...pn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/debug/SendTrackerDebugReceiver.kt
@@ -20,6 +20,7 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
+import androidx.core.content.ContextCompat
 import com.duckduckgo.appbuildconfig.api.AppBuildConfig
 import com.duckduckgo.common.utils.DispatcherProvider
 import com.duckduckgo.common.utils.formatters.time.DatabaseDateFormatter
@@ -66,7 +67,7 @@ class SendTrackerDebugReceiver @Inject constructor(
         }
 
         logcat { "Debug receiver SendTrackerDebugReceiver registered" }
-        context.registerReceiver(this, IntentFilter(INTENT_ACTION))
+        ContextCompat.registerReceiver(context, this, IntentFilter(INTENT_ACTION), ContextCompat.RECEIVER_NOT_EXPORTED)
     }
 
     private fun unregister() {

diff --git a/...ction/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/service/RestartReceiver.kt b/...ction/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/service/RestartReceiver.kt
@@ -20,6 +20,7 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
+import androidx.core.content.ContextCompat
 import com.duckduckgo.app.di.AppCoroutineScope
 import com.duckduckgo.appbuildconfig.api.AppBuildConfig
 import com.duckduckgo.appbuildconfig.api.isInternalBuild
@@ -56,7 +57,7 @@ class RestartReceiver @Inject constructor(
         if (appBuildConfig.isInternalBuild()) {
             logcat { "Starting vpn-service receiver" }
             unregister()
-            context.registerReceiver(this, IntentFilter("vpn-service"))
+            ContextCompat.registerReceiver(context, this, IntentFilter("vpn-service"), ContextCompat.RECEIVER_NOT_EXPORTED)
         }
     }
 

diff --git a/...n/vpn-impl/src/test/java/com/duckduckgo/mobile/android/vpn/service/RestartReceiverTest.kt b/...n/vpn-impl/src/test/java/com/duckduckgo/mobile/android/vpn/service/RestartReceiverTest.kt
@@ -56,7 +56,7 @@ class RestartReceiverTest {
         receiver.onVpnStarted(coroutineRule.testScope)
 
         verify(context).unregisterReceiver(any())
-        verify(context).registerReceiver(any(), any())
+        verify(context).registerReceiver(any(), any(), isNull(), isNull(), any())
     }
 
     @Test
@@ -66,7 +66,7 @@ class RestartReceiverTest {
         receiver.onVpnStarted(coroutineRule.testScope)
 
         verify(context, never()).unregisterReceiver(any())
-        verify(context, never()).registerReceiver(any(), any())
+        verify(context, never()).registerReceiver(any(), any(), isNull(), isNull(), any())
     }
 
     @Test
@@ -76,7 +76,7 @@ class RestartReceiverTest {
         receiver.onVpnStopped(coroutineRule.testScope, VpnStateMonitor.VpnStopReason.SELF_STOP())
 
         verify(context).unregisterReceiver(any())
-        verify(context, never()).registerReceiver(any(), any())
+        verify(context, never()).registerReceiver(any(), any(), isNull(), isNull(), any())
     }
 
     @Test
@@ -86,6 +86,6 @@ class RestartReceiverTest {
         receiver.onVpnStopped(coroutineRule.testScope, VpnStateMonitor.VpnStopReason.SELF_STOP())
 
         verify(context).unregisterReceiver(any())
-        verify(context, never()).registerReceiver(any(), any())
+        verify(context, never()).registerReceiver(any(), any(), isNull(), isNull(), any())
     }
 }
diff --git a/...vpn-internal/src/main/java/com/duckduckgo/vpn/internal/feature/InternalFeatureReceiver.kt b/...vpn-internal/src/main/java/com/duckduckgo/vpn/internal/feature/InternalFeatureReceiver.kt
@@ -20,6 +20,7 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
+import androidx.core.content.ContextCompat
 
 /**
  * Abstract class to create generic receivers for internal features accessible through
@@ -44,7 +45,7 @@ abstract class InternalFeatureReceiver(
 
     fun register() {
         unregister()
-        context.registerReceiver(this, IntentFilter(intentAction()))
+        ContextCompat.registerReceiver(context, this, IntentFilter(intentAction()), ContextCompat.RECEIVER_NOT_EXPORTED)
     }
 
     fun unregister() {

diff --git a/...al/src/main/java/com/duckduckgo/vpn/internal/feature/rules/ExceptionRulesDebugReceiver.kt b/...al/src/main/java/com/duckduckgo/vpn/internal/feature/rules/ExceptionRulesDebugReceiver.kt
@@ -20,6 +20,7 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
+import androidx.core.content.ContextCompat
 import com.duckduckgo.common.utils.DispatcherProvider
 import com.duckduckgo.di.scopes.VpnScope
 import com.duckduckgo.mobile.android.vpn.service.VpnServiceCallbacks
@@ -48,7 +49,7 @@ class ExceptionRulesDebugReceiver(
 
     init {
         kotlin.runCatching { context.unregisterReceiver(this) }
-        context.registerReceiver(this, IntentFilter(intentAction))
+        ContextCompat.registerReceiver(context, this, IntentFilter(intentAction), ContextCompat.RECEIVER_NOT_EXPORTED)
     }
 
     override fun onReceive(

diff --git a/app/src/internal/java/com/duckduckgo/app/dev/settings/privacy/TrackerDataDevReceiver.kt b/app/src/internal/java/com/duckduckgo/app/dev/settings/privacy/TrackerDataDevReceiver.kt
@@ -19,9 +19,11 @@ package com.duckduckgo.app.dev.settings.privacy
 import android.annotation.SuppressLint
 import android.content.BroadcastReceiver
 import android.content.Context
+import android.content.Context.RECEIVER_NOT_EXPORTED
 import android.content.Intent
 import android.content.IntentFilter
 import android.widget.Toast
+import androidx.core.content.ContextCompat
 import androidx.lifecycle.LifecycleOwner
 import com.duckduckgo.app.lifecycle.MainProcessLifecycleObserver
 import com.duckduckgo.app.trackerdetection.api.TrackerDataDownloader
@@ -39,7 +41,7 @@ class TrackerDataDevReceiver(
     private val receiver: (Intent) -> Unit,
 ) : BroadcastReceiver() {
     init {
-        context.registerReceiver(this, IntentFilter(intentAction))
+        ContextCompat.registerReceiver(context, this, IntentFilter(intentAction), ContextCompat.RECEIVER_NOT_EXPORTED)
     }
 
     override fun onReceive(

diff --git a/app/src/main/java/com/duckduckgo/app/widget/WidgetAddedReceiver.kt b/app/src/main/java/com/duckduckgo/app/widget/WidgetAddedReceiver.kt
@@ -22,6 +22,7 @@ import android.content.Intent
 import android.content.IntentFilter
 import android.os.Build
 import android.widget.Toast
+import androidx.core.content.ContextCompat
 import androidx.lifecycle.LifecycleOwner
 import com.duckduckgo.app.browser.R
 import com.duckduckgo.app.lifecycle.MainProcessLifecycleObserver
@@ -46,7 +47,7 @@ class WidgetAddedReceiver @Inject constructor(
 
     override fun onCreate(owner: LifecycleOwner) {
         super.onCreate(owner)
-        context.registerReceiver(this, IntentFilter(ACTION_ADD_WIDGET))
+        ContextCompat.registerReceiver(context, this, IntentFilter(ACTION_ADD_WIDGET), ContextCompat.RECEIVER_NOT_EXPORTED)
     }
 
     override fun onDestroy(owner: LifecycleOwner) {

diff --git a/...mpl/src/main/java/com/duckduckgo/downloads/impl/FileDownloadNotificationActionReceiver.kt b/...mpl/src/main/java/com/duckduckgo/downloads/impl/FileDownloadNotificationActionReceiver.kt
@@ -21,6 +21,7 @@ import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.os.Environment
+import androidx.core.content.ContextCompat
 import androidx.lifecycle.LifecycleOwner
 import com.duckduckgo.app.di.AppCoroutineScope
 import com.duckduckgo.app.lifecycle.MainProcessLifecycleObserver
@@ -55,7 +56,7 @@ class FileDownloadNotificationActionReceiver @Inject constructor(
     override fun onCreate(owner: LifecycleOwner) {
         super.onCreate(owner)
         Timber.v("Registering file download notification action receiver")
-        context.registerReceiver(this, IntentFilter(INTENT_DOWNLOADS_NOTIFICATION_ACTION))
+        ContextCompat.registerReceiver(context, this, IntentFilter(INTENT_DOWNLOADS_NOTIFICATION_ACTION), ContextCompat.RECEIVER_NOT_EXPORTED)
 
         // When the app process is killed and restarted, this onCreate method is called and we take the opportunity
         // to clean up the pending downloads that were in progress and will be no longer downloading.

diff --git a/...-impl/src/main/java/com/duckduckgo/networkprotection/impl/timezone/NetPTimezoneMonitor.kt b/...-impl/src/main/java/com/duckduckgo/networkprotection/impl/timezone/NetPTimezoneMonitor.kt
@@ -20,6 +20,7 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
+import androidx.core.content.ContextCompat
 import com.duckduckgo.di.scopes.VpnScope
 import com.duckduckgo.mobile.android.vpn.VpnFeaturesRegistry
 import com.duckduckgo.mobile.android.vpn.service.VpnServiceCallbacks
@@ -76,7 +77,7 @@ class NetPTimezoneMonitor @Inject constructor(
         IntentFilter().apply {
             addAction(Intent.ACTION_TIMEZONE_CHANGED)
         }.run {
-            context.registerReceiver(this@NetPTimezoneMonitor, this)
+            ContextCompat.registerReceiver(context, this@NetPTimezoneMonitor, this, ContextCompat.RECEIVER_NOT_EXPORTED)
         }
     }
 

diff --git a/...rc/main/java/com/duckduckgo/networkprotection/internal/feature/InternalFeatureReceiver.kt b/...rc/main/java/com/duckduckgo/networkprotection/internal/feature/InternalFeatureReceiver.kt
@@ -20,6 +20,7 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
+import androidx.core.content.ContextCompat
 
 /**
  * Abstract class to create generic receivers for internal features accessible through
@@ -44,7 +45,7 @@ abstract class InternalFeatureReceiver(
 
     fun register() {
         unregister()
-        context.registerReceiver(this, IntentFilter(intentAction()))
+        ContextCompat.registerReceiver(context, this, IntentFilter(intentAction()), ContextCompat.RECEIVER_NOT_EXPORTED)
     }
 
     fun unregister() {

diff --git a/...ain/java/com/duckduckgo/networkprotection/internal/feature/snooze/VpnCallStateReceiver.kt b/...ain/java/com/duckduckgo/networkprotection/internal/feature/snooze/VpnCallStateReceiver.kt
@@ -20,6 +20,7 @@ import android.annotation.SuppressLint
 import android.content.*
 import android.telephony.PhoneStateListener
 import android.telephony.TelephonyManager
+import androidx.core.content.ContextCompat
 import androidx.core.content.edit
 import androidx.lifecycle.LifecycleOwner
 import com.duckduckgo.anvil.annotations.InjectWith
@@ -75,7 +76,10 @@ class VpnCallStateReceiver @Inject constructor(
     private val _listener: PhoneStateListener =
         object : PhoneStateListener() {
             @Deprecated("Deprecated in Java")
-            override fun onCallStateChanged(state: Int, phoneNumber: String?) {
+            override fun onCallStateChanged(
+                state: Int,
+                phoneNumber: String?
+            ) {
                 appCoroutineScope.launch(dispatcherProvider.io()) {
                     logcat { "Call state: $state" }
                     if (state == TelephonyManager.CALL_STATE_IDLE) {
@@ -128,12 +132,14 @@ class VpnCallStateReceiver @Inject constructor(
                     registerListener()
                 }
             }
+
             ACTION_UNREGISTER_STATE_CALL_LISTENER -> {
                 logcat { "ACTION_UNREGISTER_STATE_CALL_LISTENER" }
                 goAsync(pendingResult) {
                     unregisterListener()
                 }
             }
+
             else -> {
                 logcat { "Unknown action ${intent.action}" }
             }
@@ -155,12 +161,14 @@ class VpnCallStateReceiver @Inject constructor(
     private fun register() {
         unregister()
         logcat { "Registering vpn call state receiver" }
-        context.registerReceiver(
+        ContextCompat.registerReceiver(
+            context,
             this,
             IntentFilter().apply {
                 addAction(ACTION_REGISTER_STATE_CALL_LISTENER)
                 addAction(ACTION_UNREGISTER_STATE_CALL_LISTENER)
             },
+            ContextCompat.RECEIVER_NOT_EXPORTED,
         )
     }
 

diff --git a/...ernal/src/main/java/com/duckduckgo/networkprotection/internal/rekey/DebugRekeyReceiver.kt b/...ernal/src/main/java/com/duckduckgo/networkprotection/internal/rekey/DebugRekeyReceiver.kt
@@ -21,6 +21,7 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
+import androidx.core.content.ContextCompat
 import com.duckduckgo.anvil.annotations.InjectWith
 import com.duckduckgo.app.di.ProcessName
 import com.duckduckgo.di.scopes.VpnScope
@@ -61,6 +62,7 @@ class DebugRekeyReceiver @Inject constructor(
                     rekeyer.forceRekey()
                 }
             }
+
             else -> {
                 logcat(LogPriority.WARN) { "Unknown action" }
                 pendingResult?.finish()
@@ -72,7 +74,10 @@ class DebugRekeyReceiver @Inject constructor(
         register()
     }
 
-    override fun onVpnStopped(coroutineScope: CoroutineScope, vpnStopReason: VpnStateMonitor.VpnStopReason) {
+    override fun onVpnStopped(
+        coroutineScope: CoroutineScope,
+        vpnStopReason: VpnStateMonitor.VpnStopReason
+    ) {
         logcat { "Unregistering debug re-keying receiver" }
         unregister()
     }
@@ -81,11 +86,13 @@ class DebugRekeyReceiver @Inject constructor(
     private fun register() {
         unregister()
         logcat { "Registering debug re-keying receiver" }
-        context.registerReceiver(
+        ContextCompat.registerReceiver(
+            context,
             this,
             IntentFilter().apply {
                 addAction(ACTION_FORCE_REKEY)
             },
+            ContextCompat.RECEIVER_NOT_EXPORTED,
         )
     }
 

diff --git a/versions.properties b/versions.properties
@@ -23,7 +23,7 @@ version.androidx.localbroadcastmanager=1.1.0
 
 version.androidx.recyclerview=1.3.2
 
-version.androidx.core=1.8.0
+version.androidx.core=1.9.0
 
 version.androidx.fragment=1.5.2