Fix broadcast receiver on Android 14

authgear · Jul 10, 2024 · 3778c6b · 3778c6b
1 parent be4a9e0
commit 3778c6b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/sdk/src/main/java/com/oursky/authgear/latte/Latte.kt b/sdk/src/main/java/com/oursky/authgear/latte/Latte.kt
@@ -240,6 +240,7 @@ class Latte(
         val listener = object : LatteFragmentListener<Uri> {
             override fun onResetPasswordCompleted(resumeWith: (Result<Uri>) -> Unit) {
                 val broadcastIntent = Intent(BroadcastType.RESET_PASSWORD_COMPLETED.action)
+                broadcastIntent.setPackage(authgear.core.application.applicationContext.packageName)
                 authgear.core.application.sendOrderedBroadcast(broadcastIntent, null)
             }
         }

diff --git a/sdk/src/main/java/com/oursky/authgear/latte/fragment/LatteFragment.kt b/sdk/src/main/java/com/oursky/authgear/latte/fragment/LatteFragment.kt
@@ -7,6 +7,7 @@ import android.content.Intent
 import android.content.IntentFilter
 import android.graphics.Color
 import android.net.Uri
+import android.os.Build
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -194,34 +195,39 @@ internal class LatteFragment() : Fragment() {
     private fun broadcastOnOpenEmailClientIntent() {
         val ctx = context ?: return
         val broadcastIntent = Intent(latteID)
+        broadcastIntent.setPackage(ctx.applicationContext.packageName)
         broadcastIntent.putExtra(INTENT_KEY_TYPE, BroadcastType.OPEN_EMAIL_CLIENT.toString())
         ctx.sendOrderedBroadcast(broadcastIntent, null)
     }
 
     private fun broadcastOnOpenSMSClientIntent() {
         val ctx = context ?: return
         val broadcastIntent = Intent(latteID)
+        broadcastIntent.setPackage(ctx.applicationContext.packageName)
         broadcastIntent.putExtra(INTENT_KEY_TYPE, BroadcastType.OPEN_SMS_CLIENT.toString())
         ctx.sendOrderedBroadcast(broadcastIntent, null)
     }
 
     private fun broadcastOnReauthWithBiometricIntent() {
         val ctx = context ?: return
         val broadcastIntent = Intent(latteID)
+        broadcastIntent.setPackage(ctx.applicationContext.packageName)
         broadcastIntent.putExtra(INTENT_KEY_TYPE, BroadcastType.REAUTH_WITH_BIOMETRIC.toString())
         ctx.sendOrderedBroadcast(broadcastIntent, null)
     }
 
     private fun broadcastOnResetPasswordCompletedIntent() {
         val ctx = context ?: return
         val broadcastIntent = Intent(latteID)
+        broadcastIntent.setPackage(ctx.applicationContext.packageName)
         broadcastIntent.putExtra(INTENT_KEY_TYPE, BroadcastType.RESET_PASSWORD_COMPLETED.toString())
         ctx.sendOrderedBroadcast(broadcastIntent, null)
     }
 
     private fun broadcastTrackingIntent(event: LatteTrackingEvent) {
         val ctx = context ?: return
         val broadcastIntent = Intent(latteID)
+        broadcastIntent.setPackage(ctx.applicationContext.packageName)
         broadcastIntent.putExtra(INTENT_KEY_TYPE, BroadcastType.TRACKING.toString())
         broadcastIntent.putExtra(INTENT_KEY_EVENT, Json.encodeToString(event))
         ctx.sendOrderedBroadcast(broadcastIntent, null)
@@ -230,6 +236,7 @@ internal class LatteFragment() : Fragment() {
     private fun broadcastCompleteIntent(result: Result<WebViewResult>) {
         val ctx = context ?: return
         val broadcastIntent = Intent(latteID)
+        broadcastIntent.setPackage(ctx.applicationContext.packageName)
         broadcastIntent.putExtra(INTENT_KEY_TYPE, BroadcastType.COMPLETE.toString())
         val latteResult: LatteResult = try {
             val webViewResult = result.getOrThrow()
@@ -306,7 +313,11 @@ internal class LatteFragment() : Fragment() {
         constructWebViewIfNeeded(ctx, webViewStateBundle)
         removeWebViewFromParent(webView)
         val intentFilter = IntentFilter(Latte.BroadcastType.RESET_PASSWORD_COMPLETED.action)
-        ctx.registerReceiver(broadcastReceiver, intentFilter)
+        if (Build.VERSION.SDK_INT >= 33) {
+            ctx.registerReceiver(broadcastReceiver, intentFilter, Context.RECEIVER_NOT_EXPORTED)
+        } else {
+            ctx.registerReceiver(broadcastReceiver, intentFilter)
+        }
 
         return FrameLayout(requireContext(), null, 0, R.style.LatteFragmentTheme).apply {
             addView(webView)
@@ -375,7 +386,11 @@ internal class LatteFragment() : Fragment() {
             }
         }
         handle = ListenHandle(ctx, br)
-        ctx.registerReceiver(br, intentFilter)
+        if (Build.VERSION.SDK_INT >= 33) {
+            ctx.registerReceiver(br, intentFilter, Context.RECEIVER_NOT_EXPORTED)
+        } else {
+            ctx.registerReceiver(br, intentFilter)
+        }
         return handle
     }