From 7fc542ec3be6f46b398431d6713a212b9b167500 Mon Sep 17 00:00:00 2001 From: saperi Date: Fri, 13 Mar 2026 13:25:10 -0700 Subject: [PATCH 1/2] Add UUID to registry key to have separate registry keys for separate instances of BrowserSwitchClient --- .../java/com/braintreepayments/api/BrowserSwitchClient.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/browser-switch/src/main/java/com/braintreepayments/api/BrowserSwitchClient.java b/browser-switch/src/main/java/com/braintreepayments/api/BrowserSwitchClient.java index e11db2c4..edf3926e 100644 --- a/browser-switch/src/main/java/com/braintreepayments/api/BrowserSwitchClient.java +++ b/browser-switch/src/main/java/com/braintreepayments/api/BrowserSwitchClient.java @@ -19,6 +19,8 @@ import org.json.JSONObject; +import java.util.UUID; + /** * Client that manages the logic for browser switching. */ @@ -29,7 +31,7 @@ public class BrowserSwitchClient { private ActivityResultLauncher authTabLauncher; private BrowserSwitchRequest pendingAuthTabRequest; - final String registryKey = "BrowserSwitchActivityRegistryKey"; + final String registryKey = "BrowserSwitchActivityRegistryKey"+ UUID.randomUUID(); @Nullable private BrowserSwitchFinalResult authTabCallbackResult; From baf199961533921e7f67d6eb8c234309112674a3 Mon Sep 17 00:00:00 2001 From: saperi Date: Fri, 13 Mar 2026 13:31:01 -0700 Subject: [PATCH 2/2] Add a CHANGELOG.md entry --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index defeb1ea..ae237dc5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # browser-switch-android Release Notes +## unreleased + * Add a UUID to `BrowserSwitchActivityRegistryKey` used to start AuthTab flows to allow for multiple instances of + BrowserSwitchClient to have separate keys to deliver results to. Fixes an issue where multiple + BrowserSwitchClient instances are not supported. + ## 3.5.0 * Add parameterized constructor `BrowserSwitchClient(ActivityResultRegistry)` for AuthTab support on Jetpack Compose * Bump `androidx.browser` to `1.10.0-alpha02`