Introduced custom interaction blocked flag (#255)

* Introduced custom interaction blocked flag * Moved from UIApplicationMain to main
Adyen · Aug 30, 2024 · fb5d486 · fb5d486
1 parent 50dcc3f
commit fb5d486
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 30 deletions.
diff --git a/android/src/main/kotlin/com/adyen/checkout/flutter/components/ComponentPlatformApi.kt b/android/src/main/kotlin/com/adyen/checkout/flutter/components/ComponentPlatformApi.kt
@@ -25,8 +25,6 @@ import com.adyen.checkout.flutter.components.instant.InstantComponentManager
 import com.adyen.checkout.flutter.components.view.ComponentLoadingBottomSheet
 import com.adyen.checkout.flutter.session.SessionHolder
 import com.adyen.checkout.flutter.utils.Constants
-import com.adyen.checkout.flutter.utils.Constants.Companion.CARD_SESSION_COMPONENT_KEY
-import com.adyen.checkout.flutter.utils.Constants.Companion.CARD_ADVANCED_COMPONENT_KEY
 import com.adyen.checkout.redirect.RedirectComponent
 import io.flutter.embedding.engine.plugins.FlutterPlugin
 import org.json.JSONObject
@@ -154,7 +152,6 @@ class ComponentPlatformApi(
         resultCode: String?,
         componentId: String
     ) {
-        resetPaymentInProgress(componentId)
         val model =
             ComponentCommunicationModel(
                 ComponentCommunicationType.RESULT,
@@ -180,7 +177,6 @@ class ComponentPlatformApi(
         error: ErrorDTO?,
         componentId: String
     ) {
-        resetPaymentInProgress(componentId)
         val model =
             ComponentCommunicationModel(
                 ComponentCommunicationType.RESULT,
@@ -215,11 +211,4 @@ class ComponentPlatformApi(
             currentComponent?.handleIntent(intent)
         }
     }
-
-    // Reset isPaymentInProgress to false again. We can remove this when the pay button handles the pressed state itself.
-    private fun resetPaymentInProgress(componentId: String) {
-        when (componentId) {
-            CARD_ADVANCED_COMPONENT_KEY, CARD_SESSION_COMPONENT_KEY -> cardComponentManager.setPaymentInProgress(false)
-        }
-    }
 }
diff --git a/android/src/main/kotlin/com/adyen/checkout/flutter/components/card/BaseCardComponent.kt b/android/src/main/kotlin/com/adyen/checkout/flutter/components/card/BaseCardComponent.kt
@@ -54,8 +54,6 @@ abstract class BaseCardComponent(
 
     fun setCurrentCardComponent() = setCurrentCardComponent(this)
 
-    fun setPaymentInProgress(isLoading: Boolean) = cardComponent?.setInteractionBlocked(isLoading)
-
     companion object {
         const val CARD_COMPONENT_CONFIGURATION_KEY = "cardComponentConfiguration"
         const val PAYMENT_METHOD_KEY = "paymentMethod"

diff --git a/android/src/main/kotlin/com/adyen/checkout/flutter/components/card/CardComponentManager.kt b/android/src/main/kotlin/com/adyen/checkout/flutter/components/card/CardComponentManager.kt
@@ -42,8 +42,6 @@ internal class CardComponentManager(
         )
     }
 
-    fun setPaymentInProgress(isLoading: Boolean) = currentCardComponent?.setPaymentInProgress(isLoading)
-
     private fun setCurrentCardComponent(currentCardComponent: BaseCardComponent) {
         this.currentCardComponent = currentCardComponent
         assignCurrentComponent(currentCardComponent.cardComponent)

diff --git a/...c/main/kotlin/com/adyen/checkout/flutter/components/card/advanced/CardAdvancedCallback.kt b/...c/main/kotlin/com/adyen/checkout/flutter/components/card/advanced/CardAdvancedCallback.kt
@@ -9,16 +9,13 @@ internal class CardAdvancedCallback(
     private val componentFlutterApi: ComponentFlutterInterface,
     private val componentId: String,
     private val assignCurrentComponent: () -> Unit,
-    private val setPaymentInProgress: (Boolean) -> Unit,
 ) : ComponentAdvancedCallback<CardComponentState>(componentFlutterApi, componentId) {
     override fun onSubmit(state: CardComponentState) {
         assignCurrentComponent.invoke()
-        setPaymentInProgress.invoke(true)
         super.onSubmit(state)
     }
 
     override fun onError(componentError: ComponentError) {
-        setPaymentInProgress.invoke(false)
         super.onError(componentError)
     }
 }
diff --git a/.../main/kotlin/com/adyen/checkout/flutter/components/card/advanced/CardAdvancedComponent.kt b/.../main/kotlin/com/adyen/checkout/flutter/components/card/advanced/CardAdvancedComponent.kt
@@ -40,7 +40,6 @@ internal class CardAdvancedComponent(
                             componentFlutterApi,
                             componentId,
                             ::setCurrentCardComponent,
-                            ::setPaymentInProgress
                         ),
                     key = UUID.randomUUID().toString()
                 )
@@ -57,7 +56,6 @@ internal class CardAdvancedComponent(
                             componentFlutterApi,
                             componentId,
                             ::setCurrentCardComponent,
-                            ::setPaymentInProgress
                         ),
                     key = UUID.randomUUID().toString()
                 )

diff --git a/...src/main/kotlin/com/adyen/checkout/flutter/components/card/session/CardSessionCallback.kt b/...src/main/kotlin/com/adyen/checkout/flutter/components/card/session/CardSessionCallback.kt
@@ -10,15 +10,9 @@ internal class CardSessionCallback(
     private val componentId: String,
     private val onActionCallback: (Action) -> Unit,
     private val assignCurrentComponent: () -> Unit,
-    private val setPaymentInProgress: (Boolean) -> Unit,
 ) : ComponentSessionCallback<CardComponentState>(componentFlutterApi, componentId, onActionCallback) {
     override fun onSubmit(state: CardComponentState): Boolean {
         assignCurrentComponent()
         return super.onSubmit(state)
     }
-
-    override fun onLoading(isLoading: Boolean) {
-        setPaymentInProgress.invoke(isLoading)
-        super.onLoading(isLoading)
-    }
 }
diff --git a/...rc/main/kotlin/com/adyen/checkout/flutter/components/card/session/CardSessionComponent.kt b/...rc/main/kotlin/com/adyen/checkout/flutter/components/card/session/CardSessionComponent.kt
@@ -57,7 +57,6 @@ internal class CardSessionComponent(
                             componentId,
                             ::onAction,
                             ::setCurrentCardComponent,
-                            ::setPaymentInProgress
                         ),
                     key = UUID.randomUUID().toString()
                 )
@@ -76,7 +75,6 @@ internal class CardSessionComponent(
                             componentId,
                             ::onAction,
                             ::setCurrentCardComponent,
-                            ::setPaymentInProgress
                         ),
                     key = UUID.randomUUID().toString()
                 )

diff --git a/android/src/main/kotlin/com/adyen/checkout/flutter/components/view/DynamicComponentView.kt b/android/src/main/kotlin/com/adyen/checkout/flutter/components/view/DynamicComponentView.kt
@@ -30,6 +30,7 @@ class DynamicComponentView
         private var componentFlutterApi: ComponentFlutterInterface? = null
         private var componentId: String = ""
         private var ignoreLayoutChanges = false
+        private var interactionBlocked = false
 
         constructor(
             componentActivity: ComponentActivity,
@@ -81,6 +82,7 @@ class DynamicComponentView
             activity = null
             componentFlutterApi = null
             ignoreLayoutChanges = false
+            interactionBlocked = false
         }
 
         private fun <T> onComponentViewGlobalLayout(
@@ -105,7 +107,11 @@ class DynamicComponentView
             payButton?.setOnClickListener {
                 isHintAnimationEnabledOnTextInputFields(this, false)
                 ignoreLayoutChanges = true
-                component.submit()
+                if (!interactionBlocked) {
+                    interactionBlocked = true
+                    component.submit()
+                }
+                resetInteractionBlocked()
                 postDelayed(100) {
                     resizeFlutterViewport(calculateFlutterViewportHeight())
                 }
@@ -143,4 +149,11 @@ class DynamicComponentView
                 }
             }
         }
+
+        // TODO - We can use cardComponent.setInteractionBlocked() when the fix for releasing the blocked interaction is available in then native SDK
+        private fun resetInteractionBlocked() {
+            postDelayed(1000) {
+                interactionBlocked = false
+            }
+        }
     }
diff --git a/example/ios/Runner/AppDelegate.swift b/example/ios/Runner/AppDelegate.swift
@@ -3,7 +3,7 @@ import adyen_checkout
 import Flutter
 import UIKit
 
-@UIApplicationMain
+@main
 @objc class AppDelegate: FlutterAppDelegate {
     override func application(
         _ application: UIApplication,