From 5ffa0b0aa6c523234c634167be1f94b0d9edb0f7 Mon Sep 17 00:00:00 2001
From: Lulu Wu <luluwu@fb.com>
Date: Tue, 29 Mar 2022 11:25:37 -0700
Subject: [PATCH] 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
---
 .../java/com/facebook/react/bridge/ActivityEventListener.java | 3 ++-
 .../com/facebook/react/bridge/BaseActivityEventListener.java  | 4 +++-
 .../src/main/java/com/facebook/react/bridge/ReactContext.java | 3 ++-
 3 files changed, 7 insertions(+), 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
index a591f118c2f..cf6c9bbffe6 100644
--- 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 @@ package com.facebook.react.bridge;
 
 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 @@ import android.content.Intent;
 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
index 9f6914e0e85..507d1ed5cae 100644
--- 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 @@ package com.facebook.react.bridge;
 
 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
index aadcadfa72c..59cbfb9ec62 100644
--- 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 class ReactContext extends ContextWrapper {
   }
 
   /** 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);