Move assertion for intent FbReactFragment's onActivityResult

Summary: Changelog: [Android][Changed] - Mark intent as nullable Reviewed By: rahulraj Differential Revision: D35058290 fbshipit-source-id: 3025de8b01660358a010c6886893d860ed4573fb
facebook · Mar 29, 2022 · 5ffa0b0 · 5ffa0b0
1 parent 7e993a7
commit 5ffa0b0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ActivityEventListener.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ActivityEventListener.java
@@ -9,6 +9,7 @@
 
 import android.app.Activity;
 import android.content.Intent;
+import androidx.annotation.Nullable;
 
 /**
  * Listener for receiving activity events. Consider using {@link BaseActivityEventListener} if
@@ -17,7 +18,7 @@
 public interface ActivityEventListener {
 
   /** Called when host (activity/service) receives an {@link Activity#onActivityResult} call. */
-  void onActivityResult(Activity activity, int requestCode, int resultCode, Intent data);
+  void onActivityResult(Activity activity, int requestCode, int resultCode, @Nullable Intent data);
 
   /** Called when a new intent is passed to the activity */
   void onNewIntent(Intent intent);

diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/BaseActivityEventListener.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/BaseActivityEventListener.java
@@ -9,6 +9,7 @@
 
 import android.app.Activity;
 import android.content.Intent;
+import androidx.annotation.Nullable;
 
 /** An empty implementation of {@link ActivityEventListener} */
 public class BaseActivityEventListener implements ActivityEventListener {
@@ -18,7 +19,8 @@ public class BaseActivityEventListener implements ActivityEventListener {
   public void onActivityResult(int requestCode, int resultCode, Intent data) {}
 
   @Override
-  public void onActivityResult(Activity activity, int requestCode, int resultCode, Intent data) {}
+  public void onActivityResult(
+      Activity activity, int requestCode, int resultCode, @Nullable Intent data) {}
 
   @Override
   public void onNewIntent(Intent intent) {}

diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java
@@ -324,7 +324,8 @@ public void destroy() {
   }
 
   /** Should be called by the hosting Fragment in {@link Fragment#onActivityResult} */
-  public void onActivityResult(Activity activity, int requestCode, int resultCode, Intent data) {
+  public void onActivityResult(
+      Activity activity, int requestCode, int resultCode, @Nullable Intent data) {
     for (ActivityEventListener listener : mActivityEventListeners) {
       try {
         listener.onActivityResult(activity, requestCode, resultCode, data);