From eb94e48cb2239b902728dce1bf884ddadb3f5af4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A6=8A=E5=8E=9F=E6=98=8C=E5=BD=A6?=
 <sakakibara@rdlabo.jp>
Date: Wed, 4 Dec 2024 17:23:52 +0900
Subject: [PATCH] feat(android): remove exclude emoji2 from payment

---
 packages/payment/android/build.gradle                         | 4 ++--
 packages/terminal/android/build.gradle                        | 4 ++--
 .../community/stripe/terminal/StripeTerminal.java             | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/payment/android/build.gradle b/packages/payment/android/build.gradle
index 65fc0123..510faec7 100644
--- a/packages/payment/android/build.gradle
+++ b/packages/payment/android/build.gradle
@@ -5,7 +5,7 @@ ext {
     androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.5.1'
 
     playServicesWalletVersion = project.hasProperty('playServicesWalletVersion') ? rootProject.ext.playServicesWalletVersion : '19.2.+'
-    stripeAndroidVersion = project.hasProperty('stripeAndroidVersion') ? rootProject.ext.stripeAndroidVersion : '20.52.+'
+    stripeAndroidVersion = project.hasProperty('stripeAndroidVersion') ? rootProject.ext.stripeAndroidVersion : '21.2.+'
     gsonVersion = project.hasProperty('gsonVersion') ? rootProject.ext.gsonVersion : '2.10.+'
 }
 
@@ -69,7 +69,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
     implementation("com.stripe:stripe-android:$stripeAndroidVersion") {
-        exclude group: 'androidx.emoji2', module: 'emoji2'
+        exclude group: 'org.bouncycastle', module: 'bcprov-jdk15to18'
     }
 
     implementation "com.google.code.gson:gson:$gsonVersion"
diff --git a/packages/terminal/android/build.gradle b/packages/terminal/android/build.gradle
index 76bf6a86..12d5f7d2 100644
--- a/packages/terminal/android/build.gradle
+++ b/packages/terminal/android/build.gradle
@@ -6,8 +6,8 @@ ext {
 
     playServicesWalletVersion = project.hasProperty('playServicesWalletVersion') ? rootProject.ext.playServicesWalletVersion : '19.2.+'
     volleyVersion = project.hasProperty('volleyVersion') ? rootProject.ext.volleyVersion : '1.2.1'
-    stripeterminalTapToPayVersion = project.hasProperty('stripeterminalTapToPayVersion') ? rootProject.ext.stripeterminalTapToPayVersion : '4.0.0'
-    stripeterminalCoreVersion = project.hasProperty('stripeterminalCoreVersion') ? rootProject.ext.stripeterminalCoreVersion : '4.0.0'
+    stripeterminalTapToPayVersion = project.hasProperty('stripeterminalTapToPayVersion') ? rootProject.ext.stripeterminalTapToPayVersion : '4.1.0'
+    stripeterminalCoreVersion = project.hasProperty('stripeterminalCoreVersion') ? rootProject.ext.stripeterminalCoreVersion : '4.1.0'
 }
 
 buildscript {
diff --git a/packages/terminal/android/src/main/java/com/getcapacitor/community/stripe/terminal/StripeTerminal.java b/packages/terminal/android/src/main/java/com/getcapacitor/community/stripe/terminal/StripeTerminal.java
index 45f0c70e..e751cde9 100644
--- a/packages/terminal/android/src/main/java/com/getcapacitor/community/stripe/terminal/StripeTerminal.java
+++ b/packages/terminal/android/src/main/java/com/getcapacitor/community/stripe/terminal/StripeTerminal.java
@@ -148,7 +148,8 @@ public void setSimulatorConfiguration(PluginCall call) {
                     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
                     )
                 );