From c69c862b9e77a273dc8cdd90b8204d264ed0ab5f Mon Sep 17 00:00:00 2001 From: Aaron Chiu Date: Fri, 30 Oct 2015 15:20:47 -0700 Subject: [PATCH] revert D2602236 fb-gh-sync-id: 251cc97cea632db68d742d51f9ecd6de335b7a23 --- .../facebook/react/ReactInstanceManager.java | 17 ++------- .../react/bridge/ActivityEventListener.java | 16 -------- .../facebook/react/bridge/ReactContext.java | 38 +------------------ 3 files changed, 5 insertions(+), 66 deletions(-) delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/bridge/ActivityEventListener.java diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java index 5ab2f725a..e526076e7 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java +++ b/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(); } } diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ActivityEventListener.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ActivityEventListener.java deleted file mode 100644 index 3f45b4ce8..000000000 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ActivityEventListener.java +++ /dev/null @@ -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); -} 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 47486d3c2..27363232b 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java +++ b/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 mLifecycleEventListeners = new CopyOnWriteArraySet<>(); - private final CopyOnWriteArraySet 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); - } }