Merge pull request #553 from SM2A/v3.x

Fix android 14 implicit intent for not exported broadcast receivers
hannesa2 · Jan 18, 2024 · b48ef71 · b48ef71
2 parents a80aaef + 89dd3e4
commit b48ef71
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/serviceLibrary/src/main/java/info/mqtt/android/service/MqttAndroidClient.kt b/serviceLibrary/src/main/java/info/mqtt/android/service/MqttAndroidClient.kt
@@ -239,7 +239,7 @@ class MqttAndroidClient @JvmOverloads constructor(
  val filter = IntentFilter()
  filter.addAction(MqttServiceConstants.CALLBACK_TO_ACTIVITY)
  if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU)
- context.registerReceiver(receiver, filter, Context.RECEIVER_EXPORTED)
+ context.registerReceiver(receiver, filter, Context.RECEIVER_NOT_EXPORTED)
  else
  context.registerReceiver(receiver, filter)
  receiverRegistered = true

diff --git a/serviceLibrary/src/main/java/info/mqtt/android/service/MqttService.kt b/serviceLibrary/src/main/java/info/mqtt/android/service/MqttService.kt
@@ -246,7 +246,9 @@ class MqttService : Service(), MqttTraceHandler {
  */
  fun callbackToActivity(clientHandle: String, status: Status, dataBundle: Bundle) {
  // Don't call traceDebug, as it will try to callbackToActivity leading to recursion.
- val callbackIntent = Intent(MqttServiceConstants.CALLBACK_TO_ACTIVITY)
+ val callbackIntent = Intent(MqttServiceConstants.CALLBACK_TO_ACTIVITY).apply {
+ setPackage(applicationContext.packageName)
+ }
  clientHandle.let {
  callbackIntent.putExtra(MqttServiceConstants.CALLBACK_CLIENT_HANDLE, it)
  }