Add cancelReconnection to properly cancel auto-reconnect

Author: kidinov

WooCommerce/src/androidTest/kotlin/com/woocommerce/android/di/MockCardReaderManagerModule.kt

@@ -100,6 +100,8 @@ class MockCardReaderManagerModule {
 
         override fun cancelPayment(paymentData: PaymentData) {}
 
+        override fun cancelReconnection() {}
+
         override suspend fun startAsyncSoftwareUpdate() {}
 
         override suspend fun clearCachedCredentials() {}

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/cardreader/WooPosCardReaderFacade.kt

@@ -49,6 +49,10 @@ class WooPosCardReaderFacade @Inject constructor(
         cardReaderManager.disconnectReader()
     }
 
+    fun cancelReconnection() {
+        cardReaderManager.cancelReconnection()
+    }
+
     @Suppress("DEPRECATION")
     private fun startActivity(intent: Intent) {
         val options = ActivityOptionsCompat.makeCustomAnimation(

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/toolbar/WooPosHomeFloatingToolbarViewModel.kt

@@ -131,9 +131,7 @@ class WooPosHomeFloatingToolbarViewModel @Inject constructor(
             }
 
             WooPosHomeFloatingToolbarState.WooPosCardReaderStatus.Reconnecting -> {
-                viewModelScope.launch {
-                    cardReaderFacade.disconnectFromReader()
-                }
+                cardReaderFacade.cancelReconnection()
             }
         }
     }

libs/cardreader/src/main/java/com/woocommerce/android/cardreader/CardReaderManager.kt

@@ -47,6 +47,7 @@ interface CardReaderManager {
 
     fun startConnectionToReader(cardReader: CardReader, locationId: String)
     suspend fun disconnectReader(): Boolean
+    fun cancelReconnection()
 
     suspend fun collectPayment(paymentInfo: PaymentInfo): Flow<CardPaymentStatus>
     suspend fun refundInteracPayment(

libs/cardreader/src/main/java/com/woocommerce/android/cardreader/internal/CardReaderManagerImpl.kt

@@ -103,6 +103,11 @@ internal class CardReaderManagerImpl(
         return connectionManager.disconnectReader()
     }
 
+    override fun cancelReconnection() {
+        if (!terminal.isInitialized()) error("Terminal not initialized")
+        connectionManager.cancelReconnection()
+    }
+
     override suspend fun collectPayment(paymentInfo: PaymentInfo): Flow<CardPaymentStatus> {
         resetBluetoothDisplayMessage()
         return paymentManager.acceptPayment(paymentInfo)

libs/cardreader/src/main/java/com/woocommerce/android/cardreader/internal/connection/BluetoothReaderListenerImpl.kt

@@ -1,5 +1,6 @@
 package com.woocommerce.android.cardreader.internal.connection
 
+import com.stripe.stripeterminal.external.callable.Callback
 import com.stripe.stripeterminal.external.callable.Cancelable
 import com.stripe.stripeterminal.external.callable.MobileReaderListener
 import com.stripe.stripeterminal.external.models.BatteryStatus
@@ -47,6 +48,7 @@ internal class BluetoothReaderListenerImpl(
     val batteryStatusEvents = _batteryStatusEvents.asStateFlow()
 
     var cancelUpdateAction: Cancelable? = null
+    var cancelReconnectAction: Cancelable? = null
 
     override fun onFinishInstallingUpdate(update: ReaderSoftwareUpdate?, e: TerminalException?) {
         logWrapper.d(LOG_TAG, "onFinishInstallingUpdate: $update $e")
@@ -121,6 +123,7 @@ internal class BluetoothReaderListenerImpl(
 
     override fun onReaderReconnectFailed(reader: Reader) {
         logWrapper.d(LOG_TAG, "onReaderReconnectFailed")
+        cancelReconnectAction = null
         terminalListenerImpl.updateReaderStatus(CardReaderStatus.NotConnected())
     }
 
@@ -130,11 +133,13 @@ internal class BluetoothReaderListenerImpl(
         reason: DisconnectReason
     ) {
         logWrapper.d(LOG_TAG, "onReaderReconnectStarted: reason=$reason")
+        cancelReconnectAction = cancelReconnect
         terminalListenerImpl.updateReaderStatus(CardReaderStatus.Reconnecting)
     }
 
     override fun onReaderReconnectSucceeded(reader: Reader) {
         logWrapper.d(LOG_TAG, "onReaderReconnectSucceeded")
+        cancelReconnectAction = null
         terminalListenerImpl.updateReaderStatus(CardReaderStatus.Connected(CardReaderImpl(reader)))
     }
 
@@ -146,4 +151,9 @@ internal class BluetoothReaderListenerImpl(
     fun resetDisplayMessage() {
         _displayMessagesEvents.value = CardReaderNoMessage
     }
+
+    fun cancelReconnection(callback: Callback) {
+        cancelReconnectAction?.cancel(callback)
+        cancelReconnectAction = null
+    }
 }

libs/cardreader/src/main/java/com/woocommerce/android/cardreader/internal/connection/ConnectionManager.kt

@@ -163,6 +163,20 @@ internal class ConnectionManager(
         })
     }
 
+    fun cancelReconnection() {
+        val callback = object : Callback {
+            override fun onFailure(e: TerminalException) {
+                updateReaderStatus(CardReaderStatus.NotConnected())
+            }
+
+            override fun onSuccess() {
+                updateReaderStatus(CardReaderStatus.NotConnected())
+            }
+        }
+        bluetoothReaderListener.cancelReconnection(callback)
+        tapToPayReaderListener.cancelReconnection(callback)
+    }
+
     private fun startStateResettingJobIfNeeded(currentStatus: CardReaderStatus) {
         if (currentStatus !is CardReaderStatus.Connecting) return
 

libs/cardreader/src/main/java/com/woocommerce/android/cardreader/internal/connection/TapToPayReaderListenerImpl.kt

@@ -1,5 +1,6 @@
 package com.woocommerce.android.cardreader.internal.connection
 
+import com.stripe.stripeterminal.external.callable.Callback
 import com.stripe.stripeterminal.external.callable.Cancelable
 import com.stripe.stripeterminal.external.callable.TapToPayReaderListener
 import com.stripe.stripeterminal.external.models.DisconnectReason
@@ -13,13 +14,16 @@ internal class TapToPayReaderListenerImpl(
     private val logWrapper: LogWrapper,
     private val terminalListenerImpl: TerminalListenerImpl
 ) : TapToPayReaderListener {
+    var cancelReconnectAction: Cancelable? = null
+
     override fun onDisconnect(reason: DisconnectReason) {
         logWrapper.d(LOG_TAG, "onDisconnect: reason=$reason")
         terminalListenerImpl.updateReaderStatus(CardReaderStatus.NotConnected())
     }
 
     override fun onReaderReconnectFailed(reader: Reader) {
         logWrapper.d(LOG_TAG, "onReaderReconnectFailed")
+        cancelReconnectAction = null
         terminalListenerImpl.updateReaderStatus(CardReaderStatus.NotConnected())
     }
 
@@ -29,11 +33,18 @@ internal class TapToPayReaderListenerImpl(
         reason: DisconnectReason
     ) {
         logWrapper.d(LOG_TAG, "onReaderReconnectStarted: reason=$reason")
+        cancelReconnectAction = cancelReconnect
         terminalListenerImpl.updateReaderStatus(CardReaderStatus.Reconnecting)
     }
 
     override fun onReaderReconnectSucceeded(reader: Reader) {
         logWrapper.d(LOG_TAG, "onReaderReconnectSucceeded")
+        cancelReconnectAction = null
         terminalListenerImpl.updateReaderStatus(CardReaderStatus.Connected(CardReaderImpl(reader)))
     }
+
+    fun cancelReconnection(callback: Callback) {
+        cancelReconnectAction?.cancel(callback)
+        cancelReconnectAction = null
+    }
 }