Merge pull request #67 from NordicPlayground/broadcast-receivers-fix

Adding flags to broadcast received registration
NordicPlayground · Sep 20, 2023 · 4d5a59b · 4d5a59b
2 parents 75e06e0 + 4b604d8
commit 4d5a59b
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -59,4 +59,5 @@ android {
 dependencies {
     implementation(platform(libs.androidx.compose.bom))
     implementation(libs.androidx.compose.ui)
+    implementation(libs.androidx.core)
 }
diff --git a/core/src/main/java/no/nordicsemi/android/common/core/BroadcastReceiver+Compose.kt b/core/src/main/java/no/nordicsemi/android/common/core/BroadcastReceiver+Compose.kt
@@ -39,10 +39,15 @@ import android.content.IntentFilter
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.ui.platform.LocalContext
+import androidx.core.content.ContextCompat
 
 @SuppressLint("ComposableNaming")
 @Composable
-fun registerReceiver(intentFilter: IntentFilter, onEvent: (Intent?) -> Unit) {
+fun registerReceiver(
+    intentFilter: IntentFilter,
+    @ContextCompat.RegisterReceiverFlags flags: Int = ContextCompat.RECEIVER_NOT_EXPORTED,
+    onEvent: (Intent?) -> Unit
+) {
     val context = LocalContext.current
 
     DisposableEffect(context) {
@@ -51,7 +56,7 @@ fun registerReceiver(intentFilter: IntentFilter, onEvent: (Intent?) -> Unit) {
                 onEvent(intent)
             }
         }
-        context.registerReceiver(broadcast, intentFilter)
+        ContextCompat.registerReceiver(context, broadcast, intentFilter, flags)
         onDispose {
             context.unregisterReceiver(broadcast)
         }

diff --git a/...main/java/no/nordicsemi/android/common/permissions/ble/bluetooth/BluetoothStateManager.kt b/...main/java/no/nordicsemi/android/common/permissions/ble/bluetooth/BluetoothStateManager.kt
@@ -36,6 +36,7 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
+import androidx.core.content.ContextCompat
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.flow.callbackFlow
@@ -67,7 +68,7 @@ class BluetoothStateManager @Inject constructor(
             addAction(BluetoothAdapter.ACTION_STATE_CHANGED)
             addAction(REFRESH_PERMISSIONS)
         }
-        context.registerReceiver(bluetoothStateChangeHandler, filter)
+        ContextCompat.registerReceiver(context, bluetoothStateChangeHandler, filter, ContextCompat.RECEIVER_NOT_EXPORTED)
         awaitClose {
             context.unregisterReceiver(bluetoothStateChangeHandler)
         }

diff --git a/...c/main/java/no/nordicsemi/android/common/permissions/ble/location/LocationStateManager.kt b/...c/main/java/no/nordicsemi/android/common/permissions/ble/location/LocationStateManager.kt
@@ -36,6 +36,7 @@ import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.location.LocationManager
+import androidx.core.content.ContextCompat
 import androidx.core.location.LocationManagerCompat
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.channels.awaitClose
@@ -69,7 +70,7 @@ internal class LocationStateManager @Inject constructor(
             addAction(LocationManager.MODE_CHANGED_ACTION)
             addAction(REFRESH_PERMISSIONS)
         }
-        context.registerReceiver(locationStateChangeHandler, filter)
+        ContextCompat.registerReceiver(context, locationStateChangeHandler, filter, ContextCompat.RECEIVER_NOT_EXPORTED)
         awaitClose {
             context.unregisterReceiver(locationStateChangeHandler)
         }

diff --git a/...c/src/main/java/no/nordicsemi/android/common/permissions/nfc/repostory/NfcStateManager.kt b/...c/src/main/java/no/nordicsemi/android/common/permissions/nfc/repostory/NfcStateManager.kt
@@ -36,6 +36,7 @@ import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.nfc.NfcAdapter
+import androidx.core.content.ContextCompat
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.flow.callbackFlow
@@ -72,7 +73,7 @@ internal class NfcStateManager @Inject constructor(
         val filter = IntentFilter().apply {
             addAction(NfcAdapter.ACTION_ADAPTER_STATE_CHANGED)
         }
-        context.registerReceiver(nfcStateChangeHandler, filter)
+        ContextCompat.registerReceiver(context, nfcStateChangeHandler, filter, ContextCompat.RECEIVER_NOT_EXPORTED)
         awaitClose {
             context.unregisterReceiver(nfcStateChangeHandler)
         }