From 9edfd945d141bdcb428ad3387c08a362883dbe17 Mon Sep 17 00:00:00 2001 From: Dave Miller Date: Fri, 26 Feb 2016 06:45:37 -0800 Subject: [PATCH] Fix minor code nit from D2977441 Reviewed By: andreicoman11 Differential Revision: D2982182 fb-gh-sync-id: dba3c6ea0dfbd375e3c27d3ad2ba3481d05e06e8 shipit-source-id: dba3c6ea0dfbd375e3c27d3ad2ba3481d05e06e8 --- .../com/facebook/react/modules/intent/IntentModule.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/intent/IntentModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/intent/IntentModule.java index 6a84f50cd..8139797ae 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/intent/IntentModule.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/intent/IntentModule.java @@ -86,16 +86,15 @@ public class IntentModule extends ReactContextBaseJavaModule { getReactApplicationContext().getPackageManager()); String otherPackageName = (componentName != null ? componentName.getPackageName() : ""); - // Always add the FLAG_ACTIVITY_NEW_TASK if we are launching to a different package - if (!selfPackageName.equals(otherPackageName)) { + // If there is no currentActivity or we are launching to a different package we need to set + // the FLAG_ACTIVITY_NEW_TASK flag + if (currentActivity == null || !selfPackageName.equals(otherPackageName)) { intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); } if (currentActivity != null) { currentActivity.startActivity(intent); } else { - // If no currentActivity, we want to always start a new task regardless of logic above - intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); getReactApplicationContext().startActivity(intent); }