Prevent Browser Switch Results From Being Parsed Twice (#55)

* Fix issue that causes browser switch results from being parsed twice. * Update changelog. * Update comments. * Update changelog.
braintree · Oct 17, 2022 · f0b20f7 · f0b20f7
1 parent 5b2b4ec
commit f0b20f7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # browser-switch-android Release Notes
 
+## unreleased
+
+* Fix issue that causes successful deep links to be parsed multiple times
+
 ## 2.3.0
 
 * Add BrowserSwitchClient#getResult() method to peek at a pending browser switch result before it is delivered

diff --git a/browser-switch/src/main/java/com/braintreepayments/api/BrowserSwitchClient.java b/browser-switch/src/main/java/com/braintreepayments/api/BrowserSwitchClient.java
@@ -118,6 +118,9 @@ public BrowserSwitchResult deliverResult(@NonNull FragmentActivity activity) {
                 case BrowserSwitchStatus.SUCCESS:
                     // ensure that success result is delivered exactly once
                     persistentStore.clearActiveRequest(appContext);
+
+                    // clear activity intent to prevent deep links from being parsed multiple times
+                    activity.setIntent(null);
                     break;
                 case BrowserSwitchStatus.CANCELED:
                     // ensure that cancellation result is delivered exactly once, but allow for

diff --git a/browser-switch/src/test/java/com/braintreepayments/api/BrowserSwitchClientUnitTest.java b/browser-switch/src/test/java/com/braintreepayments/api/BrowserSwitchClientUnitTest.java
@@ -240,6 +240,7 @@ public void deliverResult_whenDeepLinkUrlExistsAndReturnUrlSchemeMatches_clearsR
         assertSame(deepLinkUrl, result.getDeepLinkUrl());
 
         verify(persistentStore).clearActiveRequest(applicationContext);
+        verify(activity).setIntent(null);
     }
 
     @Test