From 0a5d46f5b4953d2e9b96db85a7bc8b714cc576de Mon Sep 17 00:00:00 2001 From: David Goguen Date: Fri, 5 Apr 2024 16:11:15 -0400 Subject: [PATCH 1/2] change regex to allow for underscore in android font name --- .../java/com/reactnativestripesdk/PaymentSheetAppearance.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/src/main/java/com/reactnativestripesdk/PaymentSheetAppearance.kt b/android/src/main/java/com/reactnativestripesdk/PaymentSheetAppearance.kt index cd470e2c9..8653c924d 100644 --- a/android/src/main/java/com/reactnativestripesdk/PaymentSheetAppearance.kt +++ b/android/src/main/java/com/reactnativestripesdk/PaymentSheetAppearance.kt @@ -161,7 +161,7 @@ private fun getFontResId(bundle: Bundle?, key: String, defaultValue: Int?, conte val fontFileName = bundle.getString(key) ?: throw PaymentSheetAppearanceException("$fontErrorPrefix expected String for font.$key, but received null.") - if (Regex("[^a-z0-9]").containsMatchIn(fontFileName)) { + if (Regex("[^a-z0-9_]").containsMatchIn(fontFileName)) { throw PaymentSheetAppearanceException( "$fontErrorPrefix appearance.font.$key should only contain lowercase alphanumeric characters on Android, but received '$fontFileName'. This value must match the filename in android/app/src/main/res/font" ) From 213090470e0d2a09fd505c8254e4b10329a21164 Mon Sep 17 00:00:00 2001 From: David Goguen Date: Fri, 5 Apr 2024 16:13:35 -0400 Subject: [PATCH 2/2] update wording in error to reflect underscores being allowed --- .../java/com/reactnativestripesdk/PaymentSheetAppearance.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/src/main/java/com/reactnativestripesdk/PaymentSheetAppearance.kt b/android/src/main/java/com/reactnativestripesdk/PaymentSheetAppearance.kt index 8653c924d..b11d79501 100644 --- a/android/src/main/java/com/reactnativestripesdk/PaymentSheetAppearance.kt +++ b/android/src/main/java/com/reactnativestripesdk/PaymentSheetAppearance.kt @@ -163,7 +163,7 @@ private fun getFontResId(bundle: Bundle?, key: String, defaultValue: Int?, conte ?: throw PaymentSheetAppearanceException("$fontErrorPrefix expected String for font.$key, but received null.") if (Regex("[^a-z0-9_]").containsMatchIn(fontFileName)) { throw PaymentSheetAppearanceException( - "$fontErrorPrefix appearance.font.$key should only contain lowercase alphanumeric characters on Android, but received '$fontFileName'. This value must match the filename in android/app/src/main/res/font" + "$fontErrorPrefix appearance.font.$key should only contain lowercase alphanumeric characters and underscores on Android, but received '$fontFileName'. This value must match the filename in android/app/src/main/res/font" ) }