Merge pull request #2484 from brandonpage/LoginActivity-SingleTop

Change launch mode of LoginActivity from singleInstance to singleTop.

Author: brandonpage

hybrid/HybridSampleApps/AccountEditor/AndroidManifest.xml

@@ -30,11 +30,6 @@
         </activity>
 
         <!-- Login activity -->
-        <!--
-            Launch mode of "singleInstance" ensures that the activity isn't restarted
-            by a callback from Chrome custom tab when auth flow is complete. This is
-            required for the Chrome custom tab auth flow to work correctly.
-        -->
         <!--
             To enable browser based authentication, uncomment the lines below and replace
             'scheme', 'host' and 'path' with their corresponding values from your connected app.
@@ -51,7 +46,7 @@
         <!--
         <activity android:name="com.salesforce.androidsdk.ui.LoginActivity"
             android:theme="@style/SalesforceSDK"
-            android:launchMode="singleInstance"
+            android:launchMode="singleTop"
             android:exported="true">
 
             <intent-filter>

hybrid/HybridSampleApps/MobileSyncExplorerHybrid/AndroidManifest.xml

@@ -31,11 +31,6 @@
         </activity>
 
         <!-- Login activity -->
-        <!--
-            Launch mode of "singleInstance" ensures that the activity isn't restarted
-            by a callback from Chrome custom tab when auth flow is complete. This is
-            required for the Chrome custom tab auth flow to work correctly.
-        -->
         <!--
             To enable browser based authentication, uncomment the lines below and replace
             'scheme', 'host' and 'path' with their corresponding values from your connected app.
@@ -52,7 +47,7 @@
         <!--
         <activity android:name="com.salesforce.androidsdk.ui.LoginActivity"
             android:theme="@style/SalesforceSDK"
-            android:launchMode="singleInstance"
+            android:launchMode="singleTop"
             android:exported="true">
 
             <intent-filter>

libs/SalesforceSDK/AndroidManifest.xml

@@ -37,14 +37,9 @@
         </service>
 
         <!-- Login activity -->
-        <!--
-            Launch mode of "singleInstance" ensures that the activity isn't restarted
-            by a callback from Chrome custom tab when auth flow is complete. This is
-            required for the Chrome custom tab auth flow to work correctly.
-        -->
         <activity android:name="com.salesforce.androidsdk.ui.LoginActivity"
             android:theme="@style/SalesforceSDK"
-            android:launchMode="singleInstance"
+            android:launchMode="singleTop"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustNothing"
             android:exported="true" />

native/NativeSampleApps/ConfiguredApp/AndroidManifest.xml

@@ -24,11 +24,6 @@
 
 		<!-- Login activity -->
 		<!--
-            Launch mode of "singleInstance" ensures that the activity isn't restarted
-            by a callback from Chrome custom tab when auth flow is complete. This is
-            required for the Chrome custom tab auth flow to work correctly.
-        -->
-		<!--
             To enable browser based authentication, uncomment the lines below and replace
             'scheme', 'host' and 'path' with their corresponding values from your connected app.
 
@@ -44,7 +39,7 @@
 		<!--
         <activity android:name="com.salesforce.androidsdk.ui.LoginActivity"
             android:theme="@style/SalesforceSDK"
-            android:launchMode="singleInstance"
+            android:launchMode="singleTop"
             android:exported="true">
 
             <intent-filter>

native/NativeSampleApps/MobileSyncExplorer/AndroidManifest.xml

@@ -24,11 +24,6 @@
 		</activity>
 
         <!-- Login activity -->
-        <!--
-            Launch mode of "singleInstance" ensures that the activity isn't restarted
-            by a callback from Chrome custom tab when auth flow is complete. This is
-            required for the Chrome custom tab auth flow to work correctly.
-        -->
         <!--
             To enable browser based authentication, uncomment the lines below and replace
             'scheme', 'host' and 'path' with their corresponding values from your connected app.
@@ -45,7 +40,7 @@
         <!--
         <activity android:name="com.salesforce.androidsdk.ui.LoginActivity"
             android:theme="@style/SalesforceSDK"
-            android:launchMode="singleInstance"
+            android:launchMode="singleTop"
             android:exported="true">
 
             <intent-filter>

native/NativeSampleApps/RestExplorer/AndroidManifest.xml

@@ -30,11 +30,6 @@
 
 		<!-- Login activity -->
 		<!--
-            Launch mode of "singleInstance" ensures that the activity isn't restarted
-            by a callback from Chrome custom tab when auth flow is complete. This is
-            required for the Chrome custom tab auth flow to work correctly.
-        -->
-		<!--
             To enable browser based authentication, uncomment the lines below and replace
             'scheme', 'host' and 'path' with their corresponding values from your connected app.
 
@@ -49,7 +44,7 @@
         -->
         <activity android:name="com.salesforce.androidsdk.ui.LoginActivity"
             android:theme="@style/SalesforceSDK"
-            android:launchMode="singleInstance"
+            android:launchMode="singleTop"
 			android:exported="true">
 
             <intent-filter>