Remove onNewIntent Override in MainActivity (#311)

sshropshire · web-flow · commit 3ee3b8de781b · 2025-02-10T06:51:58.000-08:00
* Remove onNewIntent override.

* Rename auth challenge viewModel method.

* Fix stuck spinner in PayPalWebView.

* Remove auth state when appropriate for browser switched flows.
diff --git a/Demo/src/main/java/com/paypal/android/MainActivity.kt b/Demo/src/main/java/com/paypal/android/MainActivity.kt
@@ -1,6 +1,5 @@
 package com.paypal.android
 
-import android.content.Intent
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
@@ -22,9 +21,4 @@ class MainActivity : ComponentActivity() {
             DemoApp()
         }
     }
-
-    override fun onNewIntent(newIntent: Intent) {
-        super.onNewIntent(newIntent)
-        intent = newIntent
-    }
 }
diff --git a/Demo/src/main/java/com/paypal/android/ui/approveorder/ApproveOrderView.kt b/Demo/src/main/java/com/paypal/android/ui/approveorder/ApproveOrderView.kt
@@ -27,6 +27,7 @@ import com.paypal.android.uishared.components.OrderView
 import com.paypal.android.uishared.components.StepHeader
 import com.paypal.android.uishared.state.CompletedActionState
 import com.paypal.android.utils.OnLifecycleOwnerResumeEffect
+import com.paypal.android.utils.OnNewIntentEffect
 import com.paypal.android.utils.UIConstants
 import com.paypal.android.utils.getActivityOrNull
 
@@ -48,7 +49,11 @@ fun ApproveOrderView(
     val context = LocalContext.current
     OnLifecycleOwnerResumeEffect {
         val intent = context.getActivityOrNull()?.intent
-        intent?.let { viewModel.completeAuthChallenge(intent) }
+        intent?.let { viewModel.completeAuthChallenge(it) }
+    }
+
+    OnNewIntentEffect { newIntent ->
+        viewModel.completeAuthChallenge(newIntent)
     }
 
     val contentPadding = UIConstants.paddingMedium
diff --git a/Demo/src/main/java/com/paypal/android/ui/approveorder/ApproveOrderViewModel.kt b/Demo/src/main/java/com/paypal/android/ui/approveorder/ApproveOrderViewModel.kt
@@ -235,18 +235,25 @@ class ApproveOrderViewModel @Inject constructor(
                         OrderInfo(orderId, status, didAttemptThreeDSecureAuthentication)
                     }
                     approveOrderState = ActionState.Success(orderInfo)
+                    // discard authState
+                    authState = null
                 }
 
                 is CardFinishApproveOrderResult.Failure -> {
                     approveOrderState = ActionState.Failure(approveOrderResult.error)
+                    // discard authState
+                    authState = null
                 }
 
                 CardFinishApproveOrderResult.Canceled -> {
                     approveOrderState = ActionState.Failure(Exception("USER CANCELED"))
+                    // discard authState
+                    authState = null
                 }
 
                 CardFinishApproveOrderResult.NoResult -> {
-                    // ignore
+                    // no result; re-enable approve order button so user can retry
+                    approveOrderState = ActionState.Idle
                 }
             }
         }
diff --git a/Demo/src/main/java/com/paypal/android/ui/paypalweb/PayPalWebView.kt b/Demo/src/main/java/com/paypal/android/ui/paypalweb/PayPalWebView.kt
@@ -25,6 +25,7 @@ import com.paypal.android.uishared.components.OrderView
 import com.paypal.android.uishared.components.StepHeader
 import com.paypal.android.uishared.state.CompletedActionState
 import com.paypal.android.utils.OnLifecycleOwnerResumeEffect
+import com.paypal.android.utils.OnNewIntentEffect
 import com.paypal.android.utils.UIConstants
 import com.paypal.android.utils.getActivityOrNull
 
@@ -41,7 +42,12 @@ fun PayPalWebView(
 
     val context = LocalContext.current
     OnLifecycleOwnerResumeEffect {
-        context.getActivityOrNull()?.let { viewModel.handleBrowserSwitchResult(it) }
+        val intent = context.getActivityOrNull()?.intent
+        intent?.let { viewModel.completeAuthChallenge(it) }
+    }
+
+    OnNewIntentEffect { newIntent ->
+        viewModel.completeAuthChallenge(newIntent)
     }
 
     val contentPadding = UIConstants.paddingMedium
diff --git a/Demo/src/main/java/com/paypal/android/ui/paypalweb/PayPalWebViewModel.kt b/Demo/src/main/java/com/paypal/android/ui/paypalweb/PayPalWebViewModel.kt
@@ -1,6 +1,7 @@
 package com.paypal.android.ui.paypalweb
 
 import android.content.Context
+import android.content.Intent
 import android.util.Log
 import androidx.activity.ComponentActivity
 import androidx.lifecycle.ViewModel
@@ -148,25 +149,32 @@ class PayPalWebViewModel @Inject constructor(
         }
     }
 
-    fun handleBrowserSwitchResult(activity: ComponentActivity) {
-        val result = authState?.let { paypalClient?.finishStart(activity.intent, it) }
+    fun completeAuthChallenge(intent: Intent) {
+        val result = authState?.let { paypalClient?.finishStart(intent, it) }
         when (result) {
             is PayPalWebCheckoutFinishStartResult.Success -> {
                 payPalWebCheckoutState = ActionState.Success(result)
+                // discard authState
+                authState = null
             }
 
             is PayPalWebCheckoutFinishStartResult.Canceled -> {
                 val error = Exception("USER CANCELED")
                 payPalWebCheckoutState = ActionState.Failure(error)
+                // discard authState
+                authState = null
             }
 
             is PayPalWebCheckoutFinishStartResult.Failure -> {
                 Log.i(TAG, "Checkout Error: ${result.error.errorDescription}")
                 payPalWebCheckoutState = ActionState.Failure(result.error)
+                // discard authState
+                authState = null
             }
 
             null, PayPalWebCheckoutFinishStartResult.NoResult -> {
-                // do nothing
+                // no result; re-enable PayPal button so user can retry
+                payPalWebCheckoutState = ActionState.Idle
             }
         }
     }
diff --git a/Demo/src/main/java/com/paypal/android/ui/paypalwebvault/PayPalWebVaultView.kt b/Demo/src/main/java/com/paypal/android/ui/paypalwebvault/PayPalWebVaultView.kt
@@ -23,6 +23,7 @@ import com.paypal.android.uishared.components.PropertyView
 import com.paypal.android.uishared.components.StepHeader
 import com.paypal.android.uishared.state.CompletedActionState
 import com.paypal.android.utils.OnLifecycleOwnerResumeEffect
+import com.paypal.android.utils.OnNewIntentEffect
 import com.paypal.android.utils.UIConstants
 import com.paypal.android.utils.getActivityOrNull
 
@@ -38,7 +39,12 @@ fun PayPalWebVaultView(viewModel: PayPalWebVaultViewModel = hiltViewModel()) {
 
     val context = LocalContext.current
     OnLifecycleOwnerResumeEffect {
-        context.getActivityOrNull()?.let { viewModel.handleBrowserSwitchResult(it) }
+        val intent = context.getActivityOrNull()?.intent
+        intent?.let { viewModel.completeAuthChallenge(it) }
+    }
+
+    OnNewIntentEffect { newIntent ->
+        viewModel.completeAuthChallenge(newIntent)
     }
 
     val contentPadding = UIConstants.paddingMedium
diff --git a/Demo/src/main/java/com/paypal/android/ui/paypalwebvault/PayPalWebVaultViewModel.kt b/Demo/src/main/java/com/paypal/android/ui/paypalwebvault/PayPalWebVaultViewModel.kt
@@ -1,5 +1,6 @@
 package com.paypal.android.ui.paypalwebvault
 
+import android.content.Intent
 import androidx.activity.ComponentActivity
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
@@ -123,20 +124,30 @@ class PayPalWebVaultViewModel @Inject constructor(
         }
     }
 
-    fun handleBrowserSwitchResult(activity: ComponentActivity) {
-        val result = authState?.let { paypalClient?.finishVault(activity.intent, it) }
+    fun completeAuthChallenge(intent: Intent) {
+        val result = authState?.let { paypalClient?.finishVault(intent, it) }
         when (result) {
-            is PayPalWebCheckoutFinishVaultResult.Success ->
+            is PayPalWebCheckoutFinishVaultResult.Success -> {
                 vaultPayPalState = ActionState.Success(result)
+                // discard authState
+                authState = null
+            }
 
-            is PayPalWebCheckoutFinishVaultResult.Failure ->
+            is PayPalWebCheckoutFinishVaultResult.Failure -> {
                 vaultPayPalState = ActionState.Failure(result.error)
+                // discard authState
+                authState = null
+            }
 
-            PayPalWebCheckoutFinishVaultResult.Canceled ->
+            PayPalWebCheckoutFinishVaultResult.Canceled -> {
                 vaultPayPalState = ActionState.Failure(Exception("USER CANCELED"))
+                // discard authState
+                authState = null
+            }
 
             null, PayPalWebCheckoutFinishVaultResult.NoResult -> {
-                // do nothing
+                // no result; re-enable PayPal button so user can retry
+                vaultPayPalState = ActionState.Idle
             }
         }
     }
diff --git a/Demo/src/main/java/com/paypal/android/ui/vaultcard/VaultCardView.kt b/Demo/src/main/java/com/paypal/android/ui/vaultcard/VaultCardView.kt
@@ -30,6 +30,7 @@ import com.paypal.android.uishared.components.ErrorView
 import com.paypal.android.uishared.components.StepHeader
 import com.paypal.android.uishared.state.CompletedActionState
 import com.paypal.android.utils.OnLifecycleOwnerResumeEffect
+import com.paypal.android.utils.OnNewIntentEffect
 import com.paypal.android.utils.UIConstants
 import com.paypal.android.utils.getActivityOrNull
 
@@ -53,6 +54,10 @@ fun VaultCardView(
         intent?.let { viewModel.completeAuthChallenge(it) }
     }
 
+    OnNewIntentEffect { newIntent ->
+        viewModel.completeAuthChallenge(newIntent)
+    }
+
     val contentPadding = UIConstants.paddingMedium
     Column(
         verticalArrangement = UIConstants.spacingLarge,
diff --git a/Demo/src/main/java/com/paypal/android/ui/vaultcard/VaultCardViewModel.kt b/Demo/src/main/java/com/paypal/android/ui/vaultcard/VaultCardViewModel.kt
@@ -207,18 +207,25 @@ class VaultCardViewModel @Inject constructor(
                         )
                     }
                     updateSetupTokenState = ActionState.Success(setupTokenInfo)
+                    // discard authState
+                    authState = null
                 }
 
                 CardFinishVaultResult.Canceled -> {
                     updateSetupTokenState = ActionState.Failure(Exception("USER CANCELED"))
+                    // discard authState
+                    authState = null
                 }
 
                 is CardFinishVaultResult.Failure -> {
                     updateSetupTokenState = ActionState.Failure(vaultResult.error)
+                    // discard authState
+                    authState = null
                 }
 
                 CardFinishVaultResult.NoResult -> {
-                    // ignore
+                    // no result; re-enable vault button so user can retry
+                    updateSetupTokenState = ActionState.Idle
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`package com.paypal.android`
`2`	`2`
`3`		`-import android.content.Intent`
`4`	`3`	`import android.os.Bundle`
`5`	`4`	`import androidx.activity.ComponentActivity`
`6`	`5`	`import androidx.activity.compose.setContent`
`@@ -22,9 +21,4 @@ class MainActivity : ComponentActivity() {`
`22`	`21`	`DemoApp()`
`23`	`22`	`}`
`24`	`23`	`}`
`25`		`-`
`26`		`- override fun onNewIntent(newIntent: Intent) {`
`27`		`- super.onNewIntent(newIntent)`
`28`		`- intent = newIntent`
`29`		`- }`
`30`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -235,18 +235,25 @@ class ApproveOrderViewModel @Inject constructor(`
`235`	`235`	`OrderInfo(orderId, status, didAttemptThreeDSecureAuthentication)`
`236`	`236`	`}`
`237`	`237`	`approveOrderState = ActionState.Success(orderInfo)`
	`238`	`+ // discard authState`
	`239`	`+ authState = null`
`238`	`240`	`}`
`239`	`241`
`240`	`242`	`is CardFinishApproveOrderResult.Failure -> {`
`241`	`243`	`approveOrderState = ActionState.Failure(approveOrderResult.error)`
	`244`	`+ // discard authState`
	`245`	`+ authState = null`
`242`	`246`	`}`
`243`	`247`
`244`	`248`	`CardFinishApproveOrderResult.Canceled -> {`
`245`	`249`	`approveOrderState = ActionState.Failure(Exception("USER CANCELED"))`
	`250`	`+ // discard authState`
	`251`	`+ authState = null`
`246`	`252`	`}`
`247`	`253`
`248`	`254`	`CardFinishApproveOrderResult.NoResult -> {`
`249`		`- // ignore`
	`255`	`+ // no result; re-enable approve order button so user can retry`
	`256`	`+ approveOrderState = ActionState.Idle`
`250`	`257`	`}`
`251`	`258`	`}`
`252`	`259`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`package com.paypal.android.ui.paypalweb`
`2`	`2`
`3`	`3`	`import android.content.Context`
	`4`	`+import android.content.Intent`
`4`	`5`	`import android.util.Log`
`5`	`6`	`import androidx.activity.ComponentActivity`
`6`	`7`	`import androidx.lifecycle.ViewModel`
`@@ -148,25 +149,32 @@ class PayPalWebViewModel @Inject constructor(`
`148`	`149`	`}`
`149`	`150`	`}`
`150`	`151`
`151`		`- fun handleBrowserSwitchResult(activity: ComponentActivity) {`
`152`		`- val result = authState?.let { paypalClient?.finishStart(activity.intent, it) }`
	`152`	`+ fun completeAuthChallenge(intent: Intent) {`
	`153`	`+ val result = authState?.let { paypalClient?.finishStart(intent, it) }`
`153`	`154`	`when (result) {`
`154`	`155`	`is PayPalWebCheckoutFinishStartResult.Success -> {`
`155`	`156`	`payPalWebCheckoutState = ActionState.Success(result)`
	`157`	`+ // discard authState`
	`158`	`+ authState = null`
`156`	`159`	`}`
`157`	`160`
`158`	`161`	`is PayPalWebCheckoutFinishStartResult.Canceled -> {`
`159`	`162`	`val error = Exception("USER CANCELED")`
`160`	`163`	`payPalWebCheckoutState = ActionState.Failure(error)`
	`164`	`+ // discard authState`
	`165`	`+ authState = null`
`161`	`166`	`}`
`162`	`167`
`163`	`168`	`is PayPalWebCheckoutFinishStartResult.Failure -> {`
`164`	`169`	`Log.i(TAG, "Checkout Error: ${result.error.errorDescription}")`
`165`	`170`	`payPalWebCheckoutState = ActionState.Failure(result.error)`
	`171`	`+ // discard authState`
	`172`	`+ authState = null`
`166`	`173`	`}`
`167`	`174`
`168`	`175`	`null, PayPalWebCheckoutFinishStartResult.NoResult -> {`
`169`		`- // do nothing`
	`176`	`+ // no result; re-enable PayPal button so user can retry`
	`177`	`+ payPalWebCheckoutState = ActionState.Idle`
`170`	`178`	`}`
`171`	`179`	`}`
`172`	`180`	`}`
Original file line number	Diff line number	Diff line change
`@@ -207,18 +207,25 @@ class VaultCardViewModel @Inject constructor(`
`207`	`207`	`)`
`208`	`208`	`}`
`209`	`209`	`updateSetupTokenState = ActionState.Success(setupTokenInfo)`
	`210`	`+ // discard authState`
	`211`	`+ authState = null`
`210`	`212`	`}`
`211`	`213`
`212`	`214`	`CardFinishVaultResult.Canceled -> {`
`213`	`215`	`updateSetupTokenState = ActionState.Failure(Exception("USER CANCELED"))`
	`216`	`+ // discard authState`
	`217`	`+ authState = null`
`214`	`218`	`}`
`215`	`219`
`216`	`220`	`is CardFinishVaultResult.Failure -> {`
`217`	`221`	`updateSetupTokenState = ActionState.Failure(vaultResult.error)`
	`222`	`+ // discard authState`
	`223`	`+ authState = null`
`218`	`224`	`}`
`219`	`225`
`220`	`226`	`CardFinishVaultResult.NoResult -> {`
`221`		`- // ignore`
	`227`	`+ // no result; re-enable vault button so user can retry`
	`228`	`+ updateSetupTokenState = ActionState.Idle`
`222`	`229`	`}`
`223`	`230`	`}`
`224`	`231`	`}`