Skip to content

Commit 5ffa0b0

Browse files
luluwu2032facebook-github-bot
authored andcommitted
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
1 parent 7e993a7 commit 5ffa0b0

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

ReactAndroid/src/main/java/com/facebook/react/bridge/ActivityEventListener.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
import android.app.Activity;
1111
import android.content.Intent;
12+
import androidx.annotation.Nullable;
1213

1314
/**
1415
* Listener for receiving activity events. Consider using {@link BaseActivityEventListener} if
@@ -17,7 +18,7 @@
1718
public interface ActivityEventListener {
1819

1920
/** Called when host (activity/service) receives an {@link Activity#onActivityResult} call. */
20-
void onActivityResult(Activity activity, int requestCode, int resultCode, Intent data);
21+
void onActivityResult(Activity activity, int requestCode, int resultCode, @Nullable Intent data);
2122

2223
/** Called when a new intent is passed to the activity */
2324
void onNewIntent(Intent intent);

ReactAndroid/src/main/java/com/facebook/react/bridge/BaseActivityEventListener.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
import android.app.Activity;
1111
import android.content.Intent;
12+
import androidx.annotation.Nullable;
1213

1314
/** An empty implementation of {@link ActivityEventListener} */
1415
public class BaseActivityEventListener implements ActivityEventListener {
@@ -18,7 +19,8 @@ public class BaseActivityEventListener implements ActivityEventListener {
1819
public void onActivityResult(int requestCode, int resultCode, Intent data) {}
1920

2021
@Override
21-
public void onActivityResult(Activity activity, int requestCode, int resultCode, Intent data) {}
22+
public void onActivityResult(
23+
Activity activity, int requestCode, int resultCode, @Nullable Intent data) {}
2224

2325
@Override
2426
public void onNewIntent(Intent intent) {}

ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,8 @@ public void destroy() {
324324
}
325325

326326
/** Should be called by the hosting Fragment in {@link Fragment#onActivityResult} */
327-
public void onActivityResult(Activity activity, int requestCode, int resultCode, Intent data) {
327+
public void onActivityResult(
328+
Activity activity, int requestCode, int resultCode, @Nullable Intent data) {
328329
for (ActivityEventListener listener : mActivityEventListeners) {
329330
try {
330331
listener.onActivityResult(activity, requestCode, resultCode, data);

0 commit comments

Comments
 (0)