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 70301b75871..5f409ed11b5 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 javax.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 d3702ed33ea..3807cc04a8e 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 javax.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 28d024fd4b0..4241d14bec9 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java @@ -305,7 +305,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);