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
This commit is contained in:
Lulu Wu
2022-03-29 11:25:37 -07:00
committed by Facebook GitHub Bot
parent 7e993a7a87
commit 5ffa0b0aa6
3 changed files with 7 additions and 3 deletions
@@ -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);
@@ -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) {}
@@ -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);