revert D2602236

fb-gh-sync-id: 251cc97cea632db68d742d51f9ecd6de335b7a23

ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java

@@ -14,10 +14,8 @@ import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.List;
 
-import android.app.Activity;
 import android.app.Application;
 import android.content.Context;
-import android.content.Intent;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.view.View;
@@ -90,7 +88,6 @@ public class ReactInstanceManager {
   private final Context mApplicationContext;
   private @Nullable DefaultHardwareBackBtnHandler mDefaultBackButtonImpl;
   private String mSourceUrl;
-  private @Nullable Activity mCurrentActivity;
 
   private final ReactInstanceDevCommandsHandler mDevInterface =
       new ReactInstanceDevCommandsHandler() {
@@ -320,7 +317,6 @@ public class ReactInstanceManager {
       mDevSupportManager.setDevSupportEnabled(false);
     }
 
-    mCurrentActivity = null;
     if (mCurrentReactContext != null) {
       mCurrentReactContext.onPause();
     }
@@ -337,7 +333,7 @@ public class ReactInstanceManager {
    * @param defaultBackButtonImpl a {@link DefaultHardwareBackBtnHandler} from an Activity that owns
    * this instance of {@link ReactInstanceManager}.
    */
-  public void onResume(Activity activity, DefaultHardwareBackBtnHandler defaultBackButtonImpl) {
+  public void onResume(DefaultHardwareBackBtnHandler defaultBackButtonImpl) {
     UiThreadUtil.assertOnUiThread();
 
     mLifecycleState = LifecycleState.RESUMED;
@@ -347,9 +343,8 @@ public class ReactInstanceManager {
       mDevSupportManager.setDevSupportEnabled(true);
     }
 
-    mCurrentActivity = activity;
     if (mCurrentReactContext != null) {
-      mCurrentReactContext.onResume(activity);
+      mCurrentReactContext.onResume();
     }
   }
 
@@ -365,12 +360,6 @@ public class ReactInstanceManager {
     }
   }
 
-  public void onActivityResult(int requestCode, int resultCode, Intent data) {
-    if (mCurrentReactContext != null) {
-      mCurrentReactContext.onActivityResult(requestCode, resultCode, data);
-    }
-  }
-
   public void showDevOptionsDialog() {
     UiThreadUtil.assertOnUiThread();
     mDevSupportManager.showDevOptionsDialog();
@@ -588,7 +577,7 @@ public class ReactInstanceManager {
 
   private void moveReactContextToCurrentLifecycleState(ReactApplicationContext reactContext) {
     if (mLifecycleState == LifecycleState.RESUMED) {
-      reactContext.onResume(mCurrentActivity);
+      reactContext.onResume();
     }
   }
 

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

@@ -1,16 +0,0 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
-
-package com.facebook.react.bridge;
-
-import android.content.Intent;
-
-/**
- * Listener for receiving activity events.
- */
-public interface ActivityEventListener {
-
-  /**
-   * Called when host (activity/service) receives an {@link Activity#onActivityResult} call.
-   */
-  void onActivityResult(int requestCode, int resultCode, Intent data);
-}

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

@@ -13,16 +13,13 @@ import javax.annotation.Nullable;
 
 import java.util.concurrent.CopyOnWriteArraySet;
 
-import android.app.Activity;
 import android.content.Context;
 import android.content.ContextWrapper;
-import android.content.Intent;
-import android.os.Bundle;
 import android.view.LayoutInflater;
 
-import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.bridge.queue.CatalystQueueConfiguration;
 import com.facebook.react.bridge.queue.MessageQueueThread;
+import com.facebook.infer.annotation.Assertions;
 
 /**
  * Abstract ContextWrapper for Android applicaiton or activity {@link Context} and
@@ -32,8 +29,6 @@ public class ReactContext extends ContextWrapper {
 
   private final CopyOnWriteArraySet<LifecycleEventListener> mLifecycleEventListeners =
       new CopyOnWriteArraySet<>();
-  private final CopyOnWriteArraySet<ActivityEventListener> mActivityEventListeners =
-      new CopyOnWriteArraySet<>();
 
   private @Nullable CatalystInstance mCatalystInstance;
   private @Nullable LayoutInflater mInflater;
@@ -41,7 +36,6 @@ public class ReactContext extends ContextWrapper {
   private @Nullable MessageQueueThread mNativeModulesMessageQueueThread;
   private @Nullable MessageQueueThread mJSMessageQueueThread;
   private @Nullable NativeModuleCallExceptionHandler mNativeModuleCallExceptionHandler;
-  private @Nullable Activity mCurrentActivity;
 
   public ReactContext(Context base) {
     super(base);
@@ -122,20 +116,11 @@ public class ReactContext extends ContextWrapper {
     mLifecycleEventListeners.remove(listener);
   }
 
-  public void addActivityEventListener(ActivityEventListener listener) {
-    mActivityEventListeners.add(listener);
-  }
-
-  public void removeActivityEventListener(ActivityEventListener listener) {
-    mActivityEventListeners.remove(listener);
-  }
-
   /**
    * Should be called by the hosting Fragment in {@link Fragment#onResume}
    */
-  public void onResume(@Nullable Activity activity) {
+  public void onResume() {
     UiThreadUtil.assertOnUiThread();
-    mCurrentActivity = activity;
     for (LifecycleEventListener listener : mLifecycleEventListeners) {
       listener.onHostResume();
     }
@@ -146,7 +131,6 @@ public class ReactContext extends ContextWrapper {
    */
   public void onPause() {
     UiThreadUtil.assertOnUiThread();
-    mCurrentActivity = null;
     for (LifecycleEventListener listener : mLifecycleEventListeners) {
       listener.onHostPause();
     }
@@ -165,15 +149,6 @@ public class ReactContext extends ContextWrapper {
     }
   }
 
-  /**
-   * Should be called by the hosting Fragment in {@link Fragment#onActivityResult}
-   */
-  public void onActivityResult(int requestCode, int resultCode, Intent data) {
-    for (ActivityEventListener listener : mActivityEventListeners) {
-      listener.onActivityResult(requestCode, resultCode, data);
-    }
-  }
-
   public void assertOnUiQueueThread() {
     Assertions.assertNotNull(mUiMessageQueueThread).assertIsOnThread();
   }
@@ -224,13 +199,4 @@ public class ReactContext extends ContextWrapper {
       throw e;
     }
   }
-
-  /**
-   * Same as {@link Activity#startActivityForResult(Intent, int)}, this just redirects the call to
-   * the current activity.
-   */
-  public void startActivityForResult(Intent intent, int code, Bundle bundle) {
-    Assertions.assertNotNull(mCurrentActivity);
-    mCurrentActivity.startActivityForResult(intent, code, bundle);
-  }
 }