[6_0_X][TIMOB-24497][TIMOB-24316][TIMOB-24527] Backport

android/cli/commands/_build.js

@@ -3593,6 +3593,16 @@ AndroidBuilder.prototype.generateAndroidManifest = function generateAndroidManif
 		}, this);
 	}, this);
 
+	// TIMOB-15253: Titanium Android cannot be used with 'android:launchMode' as it can dispose the KrollRuntime instance
+	// prevent 'android:launchMode' from being defined in the AndroidManifest.xml
+	for (var activity in tiappAndroidManifest.application.activity) {
+		var parameters = tiappAndroidManifest.application.activity[activity];
+		if (parameters['launchMode']) {
+			delete parameters['launchMode'];
+			this.logger.warn(__('%s should not be used. Ignoring definition from %s', 'android:launchMode'.red, activity.cyan));
+		}
+	}
+
 	// gather activities
 	var tiappActivities = this.tiapp.android && this.tiapp.android.activities;
 	tiappActivities && Object.keys(tiappActivities).forEach(function (filename) {

android/runtime/common/src/java/org/appcelerator/kroll/KrollRuntime.java

@@ -372,6 +372,8 @@ private static void syncInit()
 	// to execute on the runtime, and we can therefore dispose of it.
 	public static void incrementActivityRefCount()
 	{
+		waitForInit();
+
 		activityRefCount++;
 		if ((activityRefCount + serviceReceiverRefCount) == 1 && instance != null) {
 			syncInit();
@@ -399,6 +401,8 @@ public static int getActivityRefCount()
 	// Similar to {@link #incrementActivityRefCount} but for a Titanium Service.
 	public static void incrementServiceReceiverRefCount()
 	{
+		waitForInit();
+
 		serviceReceiverRefCount++;
 		if ((activityRefCount + serviceReceiverRefCount) == 1 && instance != null) {
 			syncInit();

android/titanium/src/java/org/appcelerator/titanium/TiActivity.java

@@ -47,6 +47,7 @@ protected void onResume()
 				if (intent.getComponent().getClassName().equals(TiActivity.class.getName())) {
 					Intent newIntent = new Intent(intent);
 					newIntent.putExtras(rootIntent);
+					newIntent.setData(rootIntent.getData());
 					setIntent(newIntent);
 
 					// fire 'newintent'

android/titanium/src/java/org/appcelerator/titanium/TiRootActivity.java

@@ -7,6 +7,7 @@
 package org.appcelerator.titanium;
 
 import org.appcelerator.kroll.common.Log;
+import org.appcelerator.kroll.KrollRuntime;
 import org.appcelerator.titanium.util.TiActivitySupport;
 import org.appcelerator.titanium.util.TiRHelper;
 
@@ -18,6 +19,8 @@
 import android.os.Bundle;
 import android.view.Window;
 
+import java.util.Set;
+
 public class TiRootActivity extends TiLaunchActivity
 	implements TiActivitySupport
 {
@@ -78,8 +81,45 @@ protected void onCreate(Bundle savedInstanceState)
 
 		if (intent != null) {
 			if (rootActivity != null) {
+
+				// TIMOB-24527: FLAG_ACTIVITY_NEW_DOCUMENT creates a new activity instance
+				// which overrides any previous event handlers and prevents resumed instances
+				// from functioning correctly. We need to ignore this flag.
+				if ((intent.getFlags() & Intent.FLAG_ACTIVITY_NEW_DOCUMENT) != 0) {
+					intent.setFlags(intent.getFlags() & ~Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
+					finish();
+					startActivity(intent);
+
+					KrollRuntime.incrementActivityRefCount();
+					activityOnCreate(savedInstanceState);
+					return;
+				}
 				rootActivity.setIntent(intent);
+			} else {
+
+				// TIMOB-24497: launching as CATEGORY_HOME or CATEGORY_DEFAULT prevents intent data from
+				// being passed to our resumed activity. Re-launch using CATEGORY_LAUNCHER.
+				Set<String> categories = intent.getCategories();
+				if (categories == null || categories.contains(Intent.CATEGORY_HOME) || !categories.contains(Intent.CATEGORY_LAUNCHER)) {
+					finish();
+
+					if (categories != null) {
+						for (String category : categories) {
+							intent.removeCategory(category);
+						}
+					}
+					intent.addCategory(Intent.CATEGORY_LAUNCHER);
+					startActivity(intent);
+
+					restartActivity(100, 0);
+
+					KrollRuntime.incrementActivityRefCount();
+					activityOnCreate(savedInstanceState);
+					return;
+				}
 			}
+
+			// TIMOB-15253: implement 'singleTask' like launchMode as android:launchMode cannot be used with Titanium
 			if (tiApp.intentFilterNewTask() &&
 				intent.getAction() != null && intent.getAction().equals(Intent.ACTION_VIEW) &&
 				intent.getDataString() != null &&
@@ -92,7 +132,8 @@ protected void onCreate(Bundle savedInstanceState)
 				startActivity(intent);
 				finish();
 
-				super.onCreate(savedInstanceState);
+				KrollRuntime.incrementActivityRefCount();
+				activityOnCreate(savedInstanceState);
 				return;
 			}
 		}

apidoc/Titanium/Android/Android.yml

@@ -56,6 +56,11 @@ description: |
     For more information about intent filters, see the
     [Android Intent Filters guide](http://docs.appcelerator.com/platform/latest/#!/guide/Android_Intent_Filters).
 
+    #### Launch Modes
+
+    Defining launch modes using `android:launchMode` is not supported by Titanium Android.
+    However, `singleTask` behaviour can be accomplished when using [intent filters](http://docs.appcelerator.com/platform/latest/#!/guide/Android_Intent_Filters).
+
     #### Notifications
 
     Notifications alert the user that something is happening to your application while it is