@capacitor-community/stripe-terminal 6.2.1 → 6.4.0

package/android/src/main/java/com/getcapacitor/community/stripe/terminal/StripeTerminal.java

@@ -6,6 +6,7 @@ import android.app.Application;
 import android.bluetooth.BluetoothAdapter;
 import android.content.Context;
 import android.content.pm.PackageManager;
+import android.os.Build;
 import android.util.Log;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -22,26 +23,25 @@ import com.stripe.stripeterminal.TerminalApplicationDelegate;
 import com.stripe.stripeterminal.external.callable.Callback;
 import com.stripe.stripeterminal.external.callable.Cancelable;
 import com.stripe.stripeterminal.external.callable.DiscoveryListener;
+import com.stripe.stripeterminal.external.callable.InternetReaderListener;
+import com.stripe.stripeterminal.external.callable.MobileReaderListener;
 import com.stripe.stripeterminal.external.callable.PaymentIntentCallback;
 import com.stripe.stripeterminal.external.callable.ReaderCallback;
-import com.stripe.stripeterminal.external.callable.ReaderListener;
-import com.stripe.stripeterminal.external.callable.ReaderReconnectionListener;
+//import com.stripe.stripeterminal.external.callable.ReaderReconnectionListener;
+import com.stripe.stripeterminal.external.callable.TapToPayReaderListener;
 import com.stripe.stripeterminal.external.callable.TerminalListener;
 import com.stripe.stripeterminal.external.models.BatteryStatus;
 import com.stripe.stripeterminal.external.models.CardPresentDetails;
 import com.stripe.stripeterminal.external.models.Cart;
 import com.stripe.stripeterminal.external.models.CartLineItem;
 import com.stripe.stripeterminal.external.models.CollectConfiguration;
+import com.stripe.stripeterminal.external.models.ConnectionConfiguration;
 import com.stripe.stripeterminal.external.models.ConnectionConfiguration.BluetoothConnectionConfiguration;
 import com.stripe.stripeterminal.external.models.ConnectionConfiguration.InternetConnectionConfiguration;
-import com.stripe.stripeterminal.external.models.ConnectionConfiguration.LocalMobileConnectionConfiguration;
 import com.stripe.stripeterminal.external.models.ConnectionConfiguration.UsbConnectionConfiguration;
 import com.stripe.stripeterminal.external.models.ConnectionStatus;
-import com.stripe.stripeterminal.external.models.DeviceType;
 import com.stripe.stripeterminal.external.models.DisconnectReason;
 import com.stripe.stripeterminal.external.models.DiscoveryConfiguration;
-import com.stripe.stripeterminal.external.models.Location;
-import com.stripe.stripeterminal.external.models.LocationStatus;
 import com.stripe.stripeterminal.external.models.PaymentIntent;
 import com.stripe.stripeterminal.external.models.PaymentMethod;
 import com.stripe.stripeterminal.external.models.PaymentStatus;
@@ -106,22 +106,12 @@ public class StripeTerminal extends Executor {
         }
 
         this.activitySupplier.get()
-            .runOnUiThread(
-                () -> {
-                    TerminalApplicationDelegate.onCreate((Application) this.contextSupplier.get().getApplicationContext());
-                    notifyListeners(TerminalEnumEvent.Loaded.getWebEventName(), emptyObject);
-                    call.resolve();
-                }
-            );
+            .runOnUiThread(() -> {
+                TerminalApplicationDelegate.onCreate((Application) this.contextSupplier.get().getApplicationContext());
+                notifyListeners(TerminalEnumEvent.Loaded.getWebEventName(), emptyObject);
+                call.resolve();
+            });
         TerminalListener listener = new TerminalListener() {
-            @Override
-            public void onUnexpectedReaderDisconnect(@NonNull Reader reader) {
-                notifyListeners(
-                    TerminalEnumEvent.UnexpectedReaderDisconnect.getWebEventName(),
-                    new JSObject().put("reader", convertReaderInterface(reader))
-                );
-            }
-
             @Override
             public void onConnectionStatusChange(@NonNull ConnectionStatus status) {
                 notifyListeners(
@@ -136,8 +126,11 @@ public class StripeTerminal extends Executor {
             }
         };
         LogLevel logLevel = LogLevel.VERBOSE;
-        this.tokenProvider =
-            new TokenProvider(this.contextSupplier, call.getString("tokenProviderEndpoint", ""), this.notifyListenersFunction);
+        this.tokenProvider = new TokenProvider(
+            this.contextSupplier,
+            call.getString("tokenProviderEndpoint", ""),
+            this.notifyListenersFunction
+        );
         if (!Terminal.isInitialized()) {
             Terminal.initTerminal(this.contextSupplier.get().getApplicationContext(), logLevel, this.tokenProvider, listener);
         }
@@ -150,13 +143,13 @@ public class StripeTerminal extends Executor {
 
     public void setSimulatorConfiguration(PluginCall call) {
         try {
-            Terminal
-                .getInstance()
+            Terminal.getInstance()
                 .setSimulatorConfiguration(
                     new SimulatorConfiguration(
                         SimulateReaderUpdate.valueOf(call.getString("update", "UPDATE_AVAILABLE")),
                         new SimulatedCard(SimulatedCardType.valueOf(call.getString("simulatedCard", "VISA"))),
-                        call.getLong("simulatedTipAmount", null)
+                        call.getLong("simulatedTipAmount", null),
+                        false
                     )
                 );
 
@@ -179,10 +172,10 @@ public class StripeTerminal extends Executor {
         this.locationId = call.getString("locationId");
         final DiscoveryConfiguration config;
         if (Objects.equals(call.getString("type"), TerminalConnectTypes.TapToPay.getWebEventName())) {
-            config = new DiscoveryConfiguration.LocalMobileDiscoveryConfiguration(this.isTest);
+            config = new DiscoveryConfiguration.TapToPayDiscoveryConfiguration(this.isTest);
             this.terminalConnectType = TerminalConnectTypes.TapToPay;
         } else if (Objects.equals(call.getString("type"), TerminalConnectTypes.Internet.getWebEventName())) {
-            config = new DiscoveryConfiguration.InternetDiscoveryConfiguration(this.locationId, this.isTest);
+            config = new DiscoveryConfiguration.InternetDiscoveryConfiguration(0, this.locationId, this.isTest);
             this.terminalConnectType = TerminalConnectTypes.Internet;
         } else if (Objects.equals(call.getString("type"), TerminalConnectTypes.Usb.getWebEventName())) {
             config = new DiscoveryConfiguration.UsbDiscoveryConfiguration(0, this.isTest);
@@ -211,29 +204,27 @@ public class StripeTerminal extends Executor {
             this.notifyListeners(TerminalEnumEvent.DiscoveredReaders.getWebEventName(), new JSObject().put("readers", readersJSObject));
             call.resolve(new JSObject().put("readers", readersJSObject));
         };
-        discoveryCancelable =
-            Terminal
-                .getInstance()
-                .discoverReaders(
-                    config,
-                    discoveryListener,
-                    new Callback() {
-                        @Override
-                        public void onSuccess() {
-                            Log.d(logTag, "Finished discovering readers");
-                        }
-
-                        @Override
-                        public void onFailure(@NonNull TerminalException ex) {
-                            Log.d(logTag, ex.getLocalizedMessage());
-                        }
+        discoveryCancelable = Terminal.getInstance()
+            .discoverReaders(
+                config,
+                discoveryListener,
+                new Callback() {
+                    @Override
+                    public void onSuccess() {
+                        Log.d(logTag, "Finished discovering readers");
                     }
-                );
+
+                    @Override
+                    public void onFailure(@NonNull TerminalException ex) {
+                        Log.d(logTag, ex.getLocalizedMessage());
+                    }
+                }
+            );
     }
 
     public void connectReader(final PluginCall call) {
         if (this.terminalConnectType == TerminalConnectTypes.TapToPay) {
-            this.connectLocalMobileReader(call);
+            this.connectTapToPayReader(call);
         } else if (this.terminalConnectType == TerminalConnectTypes.Internet) {
             this.connectInternetReader(call);
         } else if (this.terminalConnectType == TerminalConnectTypes.Usb) {
@@ -260,8 +251,7 @@ public class StripeTerminal extends Executor {
             return;
         }
 
-        Terminal
-            .getInstance()
+        Terminal.getInstance()
             .disconnectReader(
                 new Callback() {
                     @Override
@@ -278,32 +268,47 @@ public class StripeTerminal extends Executor {
             );
     }
 
-    private void connectLocalMobileReader(final PluginCall call) {
+    private void connectTapToPayReader(final PluginCall call) {
         JSObject reader = call.getObject("reader");
         String serialNumber = reader.getString("serialNumber");
+        this.locationId = call.getString("locationId", this.locationId);
 
-        Reader foundReader =
-            this.discoveredReadersList.stream().filter(device -> serialNumber.equals(device.getSerialNumber())).findFirst().orElse(null);
+        Reader foundReader = this.findReader(this.discoveredReadersList, serialNumber);
 
         if (serialNumber == null || foundReader == null) {
             call.reject("The reader value is not set correctly.");
             return;
         }
 
-        Boolean autoReconnectOnUnexpectedDisconnect = call.getBoolean("autoReconnectOnUnexpectedDisconnect", false);
+        Boolean autoReconnectOnUnexpectedDisconnect = Objects.requireNonNullElse(
+            call.getBoolean("autoReconnectOnUnexpectedDisconnect", false),
+            false
+        );
 
-        LocalMobileConnectionConfiguration config = new LocalMobileConnectionConfiguration(
+        ConnectionConfiguration.TapToPayConnectionConfiguration config = new ConnectionConfiguration.TapToPayConnectionConfiguration(
             this.locationId,
             autoReconnectOnUnexpectedDisconnect,
-            this.readerReconnectionListener
+            this.tapToPayReaderListener
         );
-        Terminal.getInstance().connectLocalMobileReader(foundReader, config, this.readerCallback(call));
+        Terminal.getInstance().connectReader(foundReader, config, this.readerCallback(call));
     }
 
-    ReaderReconnectionListener readerReconnectionListener = new ReaderReconnectionListener() {
+    TapToPayReaderListener tapToPayReaderListener = new TapToPayReaderListener() {
+        @Override
+        public void onReaderReconnectFailed(@NonNull Reader reader) {
+            notifyListeners(
+                TerminalEnumEvent.ReaderReconnectFailed.getWebEventName(),
+                new JSObject().put("reader", convertReaderInterface(reader))
+            );
+        }
+
         @Override
-        public void onReaderReconnectStarted(@NonNull Reader reader, @NonNull Cancelable cancelable, @NonNull DisconnectReason reason) {
-            cancelReaderConnectionCancellable = cancelable;
+        public void onReaderReconnectStarted(
+            @NonNull Reader reader,
+            @NonNull Cancelable cancelReconnect,
+            @NonNull DisconnectReason reason
+        ) {
+            cancelReaderConnectionCancellable = cancelReconnect;
             notifyListeners(
                 TerminalEnumEvent.ReaderReconnectStarted.getWebEventName(),
                 new JSObject().put("reason", reason.toString()).put("reader", convertReaderInterface(reader))
@@ -319,65 +324,99 @@ public class StripeTerminal extends Executor {
         }
 
         @Override
-        public void onReaderReconnectFailed(@NonNull Reader reader) {
-            notifyListeners(
-                TerminalEnumEvent.ReaderReconnectFailed.getWebEventName(),
-                new JSObject().put("reader", convertReaderInterface(reader))
-            );
+        public void onDisconnect(@NonNull DisconnectReason reason) {
+            notifyListeners(TerminalEnumEvent.DisconnectedReader.getWebEventName(), new JSObject().put("reason", reason.toString()));
         }
     };
 
+    InternetReaderListener internetReaderListener = new InternetReaderListener() {
+        @Override
+        public void onDisconnect(@NonNull DisconnectReason reason) {
+            notifyListeners(TerminalEnumEvent.DisconnectedReader.getWebEventName(), new JSObject().put("reason", reason.toString()));
+        }
+    };
+
+    //    ReaderReconnectionListener readerReconnectionListener = new ReaderReconnectionListener() {
+    //        @Override
+    //        public void onReaderReconnectStarted(@NonNull Reader reader, @NonNull Cancelable cancelable, @NonNull DisconnectReason reason) {
+    //            cancelReaderConnectionCancellable = cancelable;
+    //            notifyListeners(
+    //                TerminalEnumEvent.ReaderReconnectStarted.getWebEventName(),
+    //                new JSObject().put("reason", reason.toString()).put("reader", convertReaderInterface(reader))
+    //            );
+    //        }
+    //
+    //        @Override
+    //        public void onReaderReconnectSucceeded(@NonNull Reader reader) {
+    //            notifyListeners(
+    //                TerminalEnumEvent.ReaderReconnectSucceeded.getWebEventName(),
+    //                new JSObject().put("reader", convertReaderInterface(reader))
+    //            );
+    //        }
+    //
+    //        @Override
+    //        public void onReaderReconnectFailed(@NonNull Reader reader) {
+    //            notifyListeners(
+    //                TerminalEnumEvent.ReaderReconnectFailed.getWebEventName(),
+    //                new JSObject().put("reader", convertReaderInterface(reader))
+    //            );
+    //        }
+    //    };
+
     private void connectInternetReader(final PluginCall call) {
         JSObject reader = call.getObject("reader");
         String serialNumber = reader.getString("serialNumber");
+        this.locationId = call.getString("locationId", this.locationId);
 
-        Reader foundReader =
-            this.discoveredReadersList.stream().filter(device -> serialNumber.equals(device.getSerialNumber())).findFirst().orElse(null);
+        Reader foundReader = this.findReader(this.discoveredReadersList, serialNumber);
 
         if (serialNumber == null || foundReader == null) {
             call.reject("The reader value is not set correctly.");
             return;
         }
 
-        InternetConnectionConfiguration config = new InternetConnectionConfiguration();
-        Terminal.getInstance().connectInternetReader(foundReader, config, this.readerCallback(call));
+        InternetConnectionConfiguration config = new InternetConnectionConfiguration(true, this.internetReaderListener);
+        Terminal.getInstance().connectReader(foundReader, config, this.readerCallback(call));
     }
 
     private void connectUsbReader(final PluginCall call) {
         JSObject reader = call.getObject("reader");
         String serialNumber = reader.getString("serialNumber");
+        this.locationId = call.getString("locationId", this.locationId);
 
-        Reader foundReader =
-            this.discoveredReadersList.stream().filter(device -> serialNumber.equals(device.getSerialNumber())).findFirst().orElse(null);
+        Reader foundReader = this.findReader(this.discoveredReadersList, serialNumber);
 
         if (serialNumber == null || foundReader == null) {
             call.reject("The reader value is not set correctly.");
             return;
         }
 
-        UsbConnectionConfiguration config = new UsbConnectionConfiguration(this.locationId);
-        Terminal.getInstance().connectUsbReader(foundReader, config, this.readerListener(), this.readerCallback(call));
+        UsbConnectionConfiguration config = new UsbConnectionConfiguration(this.locationId, true, this.readerListener());
+        Terminal.getInstance().connectReader(foundReader, config, this.readerCallback(call));
     }
 
     private void connectBluetoothReader(final PluginCall call) {
         JSObject reader = call.getObject("reader");
         String serialNumber = reader.getString("serialNumber");
+        this.locationId = call.getString("locationId", this.locationId);
 
-        Reader foundReader =
-            this.discoveredReadersList.stream().filter(device -> serialNumber.equals(device.getSerialNumber())).findFirst().orElse(null);
+        Reader foundReader = this.findReader(this.discoveredReadersList, serialNumber);
 
         if (serialNumber == null || foundReader == null) {
             call.reject("The reader value is not set correctly.");
             return;
         }
-        Boolean autoReconnectOnUnexpectedDisconnect = call.getBoolean("autoReconnectOnUnexpectedDisconnect", false);
+        Boolean autoReconnectOnUnexpectedDisconnect = Objects.requireNonNullElse(
+            call.getBoolean("autoReconnectOnUnexpectedDisconnect", false),
+            false
+        );
 
         BluetoothConnectionConfiguration config = new BluetoothConnectionConfiguration(
             this.locationId,
             autoReconnectOnUnexpectedDisconnect,
-            this.readerReconnectionListener
+            this.readerListener()
         );
-        Terminal.getInstance().connectBluetoothReader(foundReader, config, this.readerListener(), this.readerCallback(call));
+        Terminal.getInstance().connectReader(foundReader, config, this.readerCallback(call));
     }
 
     public void cancelDiscoverReaders(final PluginCall call) {
@@ -402,12 +441,13 @@ public class StripeTerminal extends Executor {
     }
 
     public void collectPaymentMethod(final PluginCall call) {
-        if (call.getString("paymentIntent") == null) {
+        String paymentIntent = call.getString("paymentIntent");
+        if (paymentIntent == null) {
             call.reject("The value of paymentIntent is not set correctly.");
             return;
         }
         this.collectCall = call;
-        Terminal.getInstance().retrievePaymentIntent(call.getString("paymentIntent"), createPaymentIntentCallback);
+        Terminal.getInstance().retrievePaymentIntent(paymentIntent, createPaymentIntentCallback);
     }
 
     public void cancelCollectPaymentMethod(final PluginCall call) {
@@ -440,9 +480,15 @@ public class StripeTerminal extends Executor {
         }
 
         @Override
-        public void onFailure(@NonNull TerminalException ex) {
+        public void onFailure(@NonNull TerminalException exception) {
             notifyListeners(TerminalEnumEvent.Failed.getWebEventName(), emptyObject);
-            collectCall.reject(ex.getLocalizedMessage(), ex);
+            var returnObject = new JSObject();
+            returnObject.put("message", exception.getLocalizedMessage());
+            if (exception.getApiError() != null) {
+                returnObject.put("code", exception.getApiError().getCode());
+                returnObject.put("declineCode", exception.getApiError().getDeclineCode());
+            }
+            collectCall.reject(exception.getLocalizedMessage(), (String) null, returnObject);
         }
     };
 
@@ -453,7 +499,11 @@ public class StripeTerminal extends Executor {
             notifyListeners(TerminalEnumEvent.CollectedPaymentIntent.getWebEventName(), emptyObject);
 
             PaymentMethod pm = paymentIntent.getPaymentMethod();
-            CardPresentDetails card = pm.getCardPresentDetails() != null ? pm.getCardPresentDetails() : pm.getInteracPresentDetails();
+            CardPresentDetails card = null;
+
+            if (pm != null) {
+                card = pm.getCardPresentDetails() != null ? pm.getCardPresentDetails() : pm.getInteracPresentDetails();
+            }
 
             if (card != null) {
                 collectCall.resolve(
@@ -477,9 +527,19 @@ public class StripeTerminal extends Executor {
         }
 
         @Override
-        public void onFailure(@NonNull TerminalException ex) {
+        public void onFailure(@NonNull TerminalException exception) {
             notifyListeners(TerminalEnumEvent.Failed.getWebEventName(), emptyObject);
-            collectCall.reject(ex.getLocalizedMessage(), ex);
+            String errorCode = "generic_error";
+            if (exception.getApiError() != null && exception.getApiError().getCode() != null) {
+                errorCode = exception.getApiError().getCode();
+            }
+            var returnObject = new JSObject();
+            returnObject.put("message", exception.getLocalizedMessage());
+            if (exception.getApiError() != null) {
+                returnObject.put("code", exception.getApiError().getCode());
+                returnObject.put("declineCode", exception.getApiError().getDeclineCode());
+            }
+            collectCall.reject(exception.getLocalizedMessage(), errorCode, returnObject);
         }
     };
 
@@ -526,8 +586,8 @@ public class StripeTerminal extends Executor {
             return;
         }
 
-        int tax = call.getInt("tax", 0);
-        int total = call.getInt("total", 0);
+        int tax = Objects.requireNonNullElse(call.getInt("tax", 0), 0);
+        int total = Objects.requireNonNullElse(call.getInt("total", 0), 0);
         if (total == 0) {
             call.reject("You must provide a total value");
             return;
@@ -561,8 +621,7 @@ public class StripeTerminal extends Executor {
 
         Cart cart = new Cart.Builder(currency, tax, total, cartLineItems).build();
 
-        Terminal
-            .getInstance()
+        Terminal.getInstance()
             .setReaderDisplay(
                 cart,
                 new Callback() {
@@ -580,8 +639,7 @@ public class StripeTerminal extends Executor {
     }
 
     public void clearReaderDisplay(final PluginCall call) {
-        Terminal
-            .getInstance()
+        Terminal.getInstance()
             .clearReaderDisplay(
                 new Callback() {
                     @Override
@@ -598,8 +656,7 @@ public class StripeTerminal extends Executor {
     }
 
     public void rebootReader(final PluginCall call) {
-        Terminal
-            .getInstance()
+        Terminal.getInstance()
             .rebootReader(
                 new Callback() {
                     @Override
@@ -638,7 +695,7 @@ public class StripeTerminal extends Executor {
 
     private final PaymentIntentCallback confirmPaymentMethodCallback = new PaymentIntentCallback() {
         @Override
-        public void onSuccess(PaymentIntent paymentIntent) {
+        public void onSuccess(@NonNull PaymentIntent paymentIntent) {
             notifyListeners(TerminalEnumEvent.ConfirmedPaymentIntent.getWebEventName(), emptyObject);
             paymentIntentInstance = null;
             confirmPaymentIntentCall.resolve();
@@ -647,7 +704,13 @@ public class StripeTerminal extends Executor {
         @Override
         public void onFailure(TerminalException exception) {
             notifyListeners(TerminalEnumEvent.Failed.getWebEventName(), emptyObject);
-            confirmPaymentIntentCall.reject(exception.getLocalizedMessage());
+            var returnObject = new JSObject();
+            returnObject.put("message", exception.getLocalizedMessage());
+            if (exception.getApiError() != null) {
+                returnObject.put("code", exception.getApiError().getCode());
+                returnObject.put("declineCode", exception.getApiError().getDeclineCode());
+            }
+            confirmPaymentIntentCall.reject(exception.getLocalizedMessage(), (String) null, returnObject);
         }
     };
 
@@ -667,8 +730,8 @@ public class StripeTerminal extends Executor {
         };
     }
 
-    private ReaderListener readerListener() {
-        return new ReaderListener() {
+    private MobileReaderListener readerListener() {
+        return new MobileReaderListener() {
             @Override
             public void onStartInstallingUpdate(@NotNull ReaderSoftwareUpdate update, @NotNull Cancelable cancelable) {
                 // Show UI communicating that a required update has started installing
@@ -760,7 +823,7 @@ public class StripeTerminal extends Executor {
             .put("serialNumber", reader.getSerialNumber())
             .put("id", reader.getId())
             .put("locationId", reader.getLocation() != null ? reader.getLocation().getId() : null)
-            .put("deviceSoftwareVersion", reader.getDeviceSwVersion$external_publish())
+            .put("deviceSoftwareVersion", reader.getDeviceSwVersion$public_release())
             .put("simulated", reader.isSimulated())
             .put("serialNumber", reader.getSerialNumber())
             .put("ipAddress", reader.getIpAddress())
@@ -786,4 +849,24 @@ public class StripeTerminal extends Executor {
     private JSObject convertReaderSoftwareUpdate(ReaderSoftwareUpdate update) {
         return terminalMappers.mapFromReaderSoftwareUpdate(update);
     }
+
+    private Reader findReader(List<Reader> discoveredReadersList, String serialNumber) {
+        Reader foundReader = null;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            foundReader = discoveredReadersList
+                .stream()
+                .filter(device -> serialNumber != null && serialNumber.equals(device.getSerialNumber()))
+                .findFirst()
+                .orElse(null);
+        } else {
+            for (Reader device : discoveredReadersList) {
+                if (serialNumber != null && serialNumber.equals(device.getSerialNumber())) {
+                    foundReader = device;
+                    break;
+                }
+            }
+        }
+
+        return foundReader;
+    }
 }

package/android/src/main/java/com/getcapacitor/community/stripe/terminal/StripeTerminalPlugin.java

@@ -94,7 +94,7 @@ public class StripeTerminalPlugin extends Plugin {
         }
     }
 
-    @PluginMethod
+    @PluginMethod(returnType = PluginMethod.RETURN_CALLBACK)
     public void discoverReaders(PluginCall call) {
         if (
             Objects.equals(call.getString("type"), TerminalConnectTypes.Bluetooth.getWebEventName()) ||

package/android/src/main/java/com/getcapacitor/community/stripe/terminal/TerminalEvent.kt

@@ -2,6 +2,7 @@ package com.getcapacitor.community.stripe.terminal;
 
 enum class TerminalEnumEvent(val webEventName: String) {
     Loaded("terminalLoaded"),
+    DiscoveringReaders("terminalDiscoveringReaders"),
     DiscoveredReaders("terminalDiscoveredReaders"),
     CancelDiscoveredReaders("terminalCancelDiscoveredReaders"),
     ConnectedReader("terminalConnectedReader"),

package/android/src/main/java/com/getcapacitor/community/stripe/terminal/TokenProvider.java

@@ -15,6 +15,7 @@ import com.google.android.gms.common.util.BiConsumer;
 import com.stripe.stripeterminal.external.callable.ConnectionTokenCallback;
 import com.stripe.stripeterminal.external.callable.ConnectionTokenProvider;
 import com.stripe.stripeterminal.external.models.ConnectionTokenException;
+import java.util.ArrayList;
 import java.util.Objects;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -24,7 +25,7 @@ public class TokenProvider implements ConnectionTokenProvider {
     protected Supplier<Context> contextSupplier;
     protected final String tokenProviderEndpoint;
     protected BiConsumer<String, JSObject> notifyListenersFunction;
-    ConnectionTokenCallback pendingCallback = null;
+    ArrayList<ConnectionTokenCallback> pendingCallback = new ArrayList<>();
 
     public TokenProvider(
         Supplier<Context> contextSupplier,
@@ -38,15 +39,15 @@ public class TokenProvider implements ConnectionTokenProvider {
 
     public void setConnectionToken(PluginCall call) {
         String token = call.getString("token", "");
-        if (pendingCallback != null) {
+        if (!pendingCallback.isEmpty()) {
+            ConnectionTokenCallback pending = pendingCallback.remove(0);
             if (Objects.equals(token, "")) {
-                pendingCallback.onFailure(new ConnectionTokenException("Missing `token` is empty"));
+                pending.onFailure(new ConnectionTokenException("Missing `token` is empty"));
                 call.reject("Missing `token` is empty");
             } else {
-                pendingCallback.onSuccess(token);
+                pending.onSuccess(token);
                 call.resolve();
             }
-            pendingCallback = null;
         } else {
             call.reject("Stripe Terminal do not pending fetchConnectionToken");
         }
@@ -55,7 +56,7 @@ public class TokenProvider implements ConnectionTokenProvider {
     @Override
     public void fetchConnectionToken(ConnectionTokenCallback callback) {
         if (Objects.equals(this.tokenProviderEndpoint, "")) {
-            pendingCallback = callback;
+            pendingCallback.add(callback);
             this.notifyListeners(TerminalEnumEvent.RequestedConnectionToken.getWebEventName(), new JSObject());
         } else {
             try {

package/android/src/main/java/com/getcapacitor/community/stripe/terminal/helper/TerminalMappers.java

@@ -40,8 +40,8 @@ public class TerminalMappers {
 
         return new JSObject()
             .put("deviceSoftwareVersion", update.getVersion())
-            .put("estimatedUpdateTime", update.getTimeEstimate().toString())
-            .put("requiredAt", update.getRequiredAt().getTime());
+            .put("estimatedUpdateTime", update.getDurationEstimate().toString())
+            .put("requiredAt", update.getRequiredAtMs());
     }
 
     public String mapFromLocationStatus(LocationStatus status) {
@@ -73,7 +73,7 @@ public class TerminalMappers {
         return switch (type) {
             case CHIPPER_1X -> "chipper1X";
             case CHIPPER_2X -> "chipper2X";
-            case COTS_DEVICE -> "cotsDevice";
+            case TAP_TO_PAY_DEVICE -> "tapToPayDevice";
             case ETNA -> "etna";
             case STRIPE_M2 -> "stripeM2";
             case STRIPE_S700 -> "stripeS700";