@capacitor-community/stripe-terminal 6.0.2 → 6.2.0

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

@@ -3,7 +3,6 @@ package com.getcapacitor.community.stripe.terminal;
 import android.Manifest;
 import android.os.Build;
 import android.util.Log;
-
 import androidx.annotation.RequiresApi;
 import com.getcapacitor.PermissionState;
 import com.getcapacitor.Plugin;
@@ -13,7 +12,6 @@ import com.getcapacitor.annotation.CapacitorPlugin;
 import com.getcapacitor.annotation.Permission;
 import com.getcapacitor.annotation.PermissionCallback;
 import com.stripe.stripeterminal.external.models.TerminalException;
-
 import java.util.Objects;
 
 @RequiresApi(api = Build.VERSION_CODES.S)
@@ -47,6 +45,11 @@ public class StripeTerminalPlugin extends Plugin {
         this.implementation.setConnectionToken(call);
     }
 
+    @PluginMethod
+    public void setSimulatorConfiguration(PluginCall call) {
+        this.implementation.setSimulatorConfiguration(call);
+    }
+
     @PermissionCallback
     private void locationPermsCallback(PluginCall call) throws TerminalException {
         if (getPermissionState("location") == PermissionState.GRANTED) {
@@ -59,7 +62,11 @@ public class StripeTerminalPlugin extends Plugin {
     @PermissionCallback
     private void bluetoothOldPermsCallback(PluginCall call) throws TerminalException {
         if (getPermissionState("bluetooth_old") == PermissionState.GRANTED) {
-            this.connectReader(call);
+            if (Objects.equals(call.getMethodName(), "discoverReaders")) {
+                this.discoverReaders(call);
+            } else {
+                this.connectReader(call);
+            }
         } else {
             requestPermissionForAlias("bluetooth_old", call, "bluetoothOldPermsCallback");
         }
@@ -68,7 +75,11 @@ public class StripeTerminalPlugin extends Plugin {
     @PermissionCallback
     private void bluetoothPermsCallback(PluginCall call) throws TerminalException {
         if (getPermissionState("bluetooth") == PermissionState.GRANTED) {
-            this.connectReader(call);
+            if (Objects.equals(call.getMethodName(), "discoverReaders")) {
+                this.discoverReaders(call);
+            } else {
+                this.connectReader(call);
+            }
         } else {
             requestPermissionForAlias("bluetooth", call, "bluetoothPermsCallback");
         }
@@ -85,7 +96,22 @@ public class StripeTerminalPlugin extends Plugin {
 
     @PluginMethod
     public void discoverReaders(PluginCall call) {
-        this.implementation.onDiscoverReaders(call);
+        if (
+            Objects.equals(call.getString("type"), TerminalConnectTypes.Bluetooth.getWebEventName()) ||
+            Objects.equals(call.getString("type"), TerminalConnectTypes.Simulated.getWebEventName())
+        ) {
+            Log.d("Capacitor:permission bluetooth_old", getPermissionState("bluetooth_old").toString());
+            Log.d("Capacitor:permission bluetooth", getPermissionState("bluetooth").toString());
+            if (Build.VERSION.SDK_INT <= 30 && getPermissionState("bluetooth_old") != PermissionState.GRANTED) {
+                requestPermissionForAlias("bluetooth_old", call, "bluetoothOldPermsCallback");
+            } else if (Build.VERSION.SDK_INT > 30 && getPermissionState("bluetooth") != PermissionState.GRANTED) {
+                requestPermissionForAlias("bluetooth", call, "bluetoothPermsCallback");
+            } else {
+                this.implementation.onDiscoverReaders(call);
+            }
+        } else {
+            this.implementation.onDiscoverReaders(call);
+        }
     }
 
     @PluginMethod
@@ -134,4 +160,34 @@ public class StripeTerminalPlugin extends Plugin {
     public void confirmPaymentIntent(PluginCall call) {
         this.implementation.confirmPaymentIntent(call);
     }
+
+    @PluginMethod
+    public void installAvailableUpdate(PluginCall call) {
+        this.implementation.installAvailableUpdate(call);
+    }
+
+    @PluginMethod
+    public void cancelInstallUpdate(PluginCall call) {
+        this.implementation.cancelInstallUpdate(call);
+    }
+
+    @PluginMethod
+    public void setReaderDisplay(PluginCall call) {
+        this.implementation.setReaderDisplay(call);
+    }
+
+    @PluginMethod
+    public void clearReaderDisplay(PluginCall call) {
+        this.implementation.clearReaderDisplay(call);
+    }
+
+    @PluginMethod
+    public void rebootReader(PluginCall call) {
+        this.implementation.rebootReader(call);
+    }
+
+    @PluginMethod
+    public void cancelReaderReconnection(PluginCall call) {
+        this.implementation.cancelReaderReconnection(call);
+    }
 }

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

@@ -6,9 +6,23 @@ enum class TerminalEnumEvent(val webEventName: String) {
     CancelDiscoveredReaders("terminalCancelDiscoveredReaders"),
     ConnectedReader("terminalConnectedReader"),
     DisconnectedReader("terminalDisconnectedReader"),
+    ConnectionStatusChange("terminalConnectionStatusChange"),
+    UnexpectedReaderDisconnect("terminalUnexpectedReaderDisconnect"),
     ConfirmedPaymentIntent("terminalConfirmedPaymentIntent"),
     CollectedPaymentIntent("terminalCollectedPaymentIntent"),
     Canceled("terminalCanceled"),
     Failed("terminalFailed"),
     RequestedConnectionToken("terminalRequestedConnectionToken"),
+    ReportAvailableUpdate("terminalReportAvailableUpdate"),
+    StartInstallingUpdate("terminalStartInstallingUpdate"),
+    ReaderSoftwareUpdateProgress("terminalReaderSoftwareUpdateProgress"),
+    FinishInstallingUpdate("terminalFinishInstallingUpdate"),
+    BatteryLevel("terminalBatteryLevel"),
+    ReaderEvent("terminalReaderEvent"),
+    RequestDisplayMessage("terminalRequestDisplayMessage"),
+    RequestReaderInput("terminalRequestReaderInput"),
+    PaymentStatusChange("terminalPaymentStatusChange"),
+    ReaderReconnectStarted("terminalReaderReconnectStarted"),
+    ReaderReconnectSucceeded("terminalReaderReconnectSucceeded"),
+    ReaderReconnectFailed("terminalReaderReconnectFailed"),
 }

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

@@ -0,0 +1,96 @@
+package com.getcapacitor.community.stripe.terminal.helper;
+
+import com.getcapacitor.JSObject;
+import com.stripe.stripeterminal.external.models.DeviceType;
+import com.stripe.stripeterminal.external.models.Location;
+import com.stripe.stripeterminal.external.models.LocationStatus;
+import com.stripe.stripeterminal.external.models.Reader;
+import com.stripe.stripeterminal.external.models.ReaderSoftwareUpdate;
+
+public class TerminalMappers {
+
+    public JSObject mapFromLocation(Location location) {
+        if (location == null) {
+            return new JSObject();
+        }
+
+        JSObject address = new JSObject();
+
+        if (location.getAddress() != null) {
+            address
+                .put("country", location.getAddress().getCountry())
+                .put("city", location.getAddress().getCity())
+                .put("postalCode", location.getAddress().getPostalCode())
+                .put("line1", location.getAddress().getLine1())
+                .put("line2", location.getAddress().getLine2())
+                .put("state", location.getAddress().getState());
+        }
+
+        return new JSObject()
+            .put("id", location.getId())
+            .put("displayName", location.getDisplayName())
+            .put("address", address)
+            .put("livemode", location.getLivemode());
+    }
+
+    public JSObject mapFromReaderSoftwareUpdate(ReaderSoftwareUpdate update) {
+        if (update == null) {
+            return new JSObject();
+        }
+
+        return new JSObject()
+            .put("deviceSoftwareVersion", update.getVersion())
+            .put("estimatedUpdateTime", update.getTimeEstimate().toString())
+            .put("requiredAt", update.getRequiredAt().getTime());
+    }
+
+    public String mapFromLocationStatus(LocationStatus status) {
+        if (status == null) {
+            return "UNKNOWN";
+        }
+
+        return switch (status) {
+            case NOT_SET -> "NOT_SET";
+            case SET -> "SET";
+            case UNKNOWN -> "UNKNOWN";
+            default -> "UNKNOWN";
+        };
+    }
+
+    public String mapFromNetworkStatus(Reader.NetworkStatus status) {
+        if (status == null) {
+            return "unknown";
+        }
+
+        return switch (status) {
+            case OFFLINE -> "OFFLINE";
+            case ONLINE -> "ONLINE";
+            default -> "UNKNOWN";
+        };
+    }
+
+    public String mapFromDeviceType(DeviceType type) {
+        return switch (type) {
+            case CHIPPER_1X -> "chipper1X";
+            case CHIPPER_2X -> "chipper2X";
+            case COTS_DEVICE -> "cotsDevice";
+            case ETNA -> "etna";
+            case STRIPE_M2 -> "stripeM2";
+            case STRIPE_S700 -> "stripeS700";
+            case STRIPE_S700_DEVKIT -> "stripeS700Devkit";
+            // React Native has this model. deprecated?
+            //            case STRIPE_S710:
+            //                return "stripeS710";
+            //            case STRIPE_S710_DEVKIT:
+            //                return "stripeS710Devkit";
+            case UNKNOWN -> "unknown";
+            case VERIFONE_P400 -> "verifoneP400";
+            case WISECUBE -> "wiseCube";
+            case WISEPAD_3 -> "wisePad3";
+            case WISEPAD_3S -> "wisePad3s";
+            case WISEPOS_E -> "wisePosE";
+            case WISEPOS_E_DEVKIT -> "wisePosEDevkit";
+            default -> throw new IllegalArgumentException("Unknown DeviceType: " + type);
+        };
+    }
+}