From a46e1854c7805a9727656b1c0abbe1c39f3751f0 Mon Sep 17 00:00:00 2001
From: Isabel Martin <arkariang@gmail.com>
Date: Thu, 7 Mar 2024 21:46:47 +0100
Subject: [PATCH] MBL-1262: QA party bug fixes (#1971)

* - Navigation issues when changing between app to log in

* - Chrome Tab does not get killed when going to background
- Removed task affinity, StrandHogg Attack affecting android 10 or lower devices do not affect now as loggin/signup happens on  chrome tab

* - change password triggers oauth flow is feature flag enabled

* - linter
---
 app/src/main/AndroidManifest.xml                       |  7 ++-----
 .../ui/activities/ChangePasswordActivity.kt            | 10 +++++++++-
 .../com/kickstarter/ui/activities/LoginToutActivity.kt |  1 -
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4e2915aefd..146f75f77b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -70,7 +70,6 @@
             android:label="@string/app_name"
             android:exported="true"
             android:launchMode="singleTop"
-            android:taskAffinity=""
             android:theme="@style/SplashTheme">
             <intent-filter android:autoVerify="true">
                 <action android:name="android.intent.action.VIEW" />
@@ -111,7 +110,6 @@
             android:name=".ui.activities.ResetPasswordActivity"
             android:parentActivityName=".ui.activities.LoginActivity"
             android:windowSoftInputMode="adjustResize"
-            android:taskAffinity=""
             android:theme="@style/Login" />
         <activity
             android:name=".ui.activities.SetPasswordActivity"
@@ -149,7 +147,7 @@
             android:name=".ui.activities.LoginToutActivity"
             android:parentActivityName=".ui.activities.DiscoveryActivity"
             android:theme="@style/Login"
-            android:launchMode="singleInstancePerTask"
+            android:launchMode="singleTop"
             android:exported="true">
             <intent-filter android:autoVerify="true">
                 <action android:name="android.intent.action.VIEW"/>
@@ -213,7 +211,6 @@
             android:theme="@style/SettingsActivity" />
         <activity
             android:name=".ui.activities.SignupActivity"
-            android:taskAffinity=""
             android:parentActivityName=".ui.activities.LoginToutActivity"
             android:windowSoftInputMode="adjustResize"
             android:theme="@style/Login" />
@@ -256,7 +253,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
                 <data
-                    android:host="*.kickstarter.com"
+                    android:host="www.kickstarter.com"
                     android:scheme="https" />
             </intent-filter>
             <!-- Website Main page deeplink  -->
diff --git a/app/src/main/java/com/kickstarter/ui/activities/ChangePasswordActivity.kt b/app/src/main/java/com/kickstarter/ui/activities/ChangePasswordActivity.kt
index 8112dec659..b1adc40768 100644
--- a/app/src/main/java/com/kickstarter/ui/activities/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/kickstarter/ui/activities/ChangePasswordActivity.kt
@@ -33,6 +33,7 @@ class ChangePasswordActivity : ComponentActivity() {
     private val viewModel: ChangePasswordViewModel by viewModels {
         viewModelFactory
     }
+    private var oAuthIsEnabled = false
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -46,6 +47,8 @@ class ChangePasswordActivity : ComponentActivity() {
             theme = env.sharedPreferences()
                 ?.getInt(SharedPreferenceKey.APP_THEME, AppThemes.MATCH_SYSTEM.ordinal)
                 ?: AppThemes.MATCH_SYSTEM.ordinal
+
+            oAuthIsEnabled = env.featureFlagClient()?.getBoolean(FlagKey.ANDROID_OAUTH) ?: false
         }
 
         setContent {
@@ -98,10 +101,15 @@ class ChangePasswordActivity : ComponentActivity() {
     private fun logout(email: String) {
         this.logout?.execute()
         ApplicationUtils.startNewDiscoveryActivity(this)
-        startActivity(
+        val intent = if (oAuthIsEnabled) {
+            Intent(this, LoginToutActivity::class.java)
+        } else {
             Intent(this, LoginActivity::class.java)
                 .putExtra(IntentKey.LOGIN_REASON, LoginReason.CHANGE_PASSWORD)
                 .putExtra(IntentKey.EMAIL, email)
+        }
+        startActivity(
+            intent
         )
     }
 
diff --git a/app/src/main/java/com/kickstarter/ui/activities/LoginToutActivity.kt b/app/src/main/java/com/kickstarter/ui/activities/LoginToutActivity.kt
index 22307fb73d..0dbfc41fbb 100644
--- a/app/src/main/java/com/kickstarter/ui/activities/LoginToutActivity.kt
+++ b/app/src/main/java/com/kickstarter/ui/activities/LoginToutActivity.kt
@@ -275,7 +275,6 @@ class LoginToutActivity : ComponentActivity() {
         val authorizationUri = Uri.parse(url)
 
         val tabIntent = CustomTabsIntent.Builder().build()
-        tabIntent.intent.flags = Intent.FLAG_ACTIVITY_NO_HISTORY
 
         val packageName = ChromeTabsHelper.getPackageNameToUse(this)
         tabIntent.intent.setPackage(packageName)