Merge branch 'master' into fix-null-navigator-randomly-on-android

wix · Nov 9, 2023 · a720283 · a720283
2 parents eae064a + 58edd09
commit a720283
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/lib/android/app/src/main/java/com/reactnativenavigation/react/JsDevReloadHandler.java b/lib/android/app/src/main/java/com/reactnativenavigation/react/JsDevReloadHandler.java
@@ -7,6 +7,7 @@
 import android.content.IntentFilter;
 import android.view.KeyEvent;
 import android.widget.EditText;
+import android.os.Build;
 
 import com.facebook.react.devsupport.interfaces.DevSupportManager;
 import com.reactnativenavigation.utils.UiUtils;
@@ -49,7 +50,11 @@ public void removeReloadListener(ReloadListener listener) {
     }
 
 	public void onActivityResumed(Activity activity) {
-		activity.registerReceiver(reloadReceiver, new IntentFilter(RELOAD_BROADCAST));
+		if (Build.VERSION.SDK_INT >= 34 && activity.getApplicationInfo().targetSdkVersion >= 34) {
+            activity.registerReceiver(reloadReceiver, new IntentFilter(RELOAD_BROADCAST), Context.RECEIVER_EXPORTED);
+        } else {
+            activity.registerReceiver(reloadReceiver, new IntentFilter(RELOAD_BROADCAST));
+        }
 	}
 
 	public void onActivityPaused(Activity activity) {