From 8f5a98a14f2046413f51957d04fdca26981add51 Mon Sep 17 00:00:00 2001
From: sshropshire <58225613+sshropshire@users.noreply.github.com>
Date: Mon, 8 Jul 2024 13:13:24 -0500
Subject: [PATCH] Update Braintree Core to 4.48.0 (#478)

* Bump Braintree Core version to 4.48.0.

* Update CHANGELOG.

* Fix compilation error.

* Fix broken unit tests.
---
 CHANGELOG.md                                          |  4 ++++
 .../java/com/braintreepayments/api/DropInClient.java  | 11 +++++++++--
 .../braintreepayments/api/DropInInternalClient.java   | 11 +++++++++--
 .../braintreepayments/api/DropInActivityUnitTest.kt   |  2 +-
 .../api/DropInInternalClientUnitTest.java             |  2 +-
 build.gradle                                          |  2 +-
 6 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 99154fd5..836519d4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Braintree Android Drop-In Release Notes
 
+## unreleased
+
+* Bump braintree_android module dependency versions to `4.48.0`
+
 ## 6.16.0
 
 * Bump braintree_android module dependency versions to `4.45.0`
diff --git a/Drop-In/src/main/java/com/braintreepayments/api/DropInClient.java b/Drop-In/src/main/java/com/braintreepayments/api/DropInClient.java
index 92fbe631..35b0b63b 100644
--- a/Drop-In/src/main/java/com/braintreepayments/api/DropInClient.java
+++ b/Drop-In/src/main/java/com/braintreepayments/api/DropInClient.java
@@ -44,8 +44,15 @@ private static DropInClientParams createDefaultParams(Context context, String au
             customUrlScheme = dropInRequest.getCustomUrlScheme();
         }
 
-        BraintreeOptions braintreeOptions =
-                new BraintreeOptions(context, null, customUrlScheme, authorization, clientTokenProvider, IntegrationType.DROP_IN);
+        BraintreeOptions braintreeOptions = new BraintreeOptions(
+                context,
+                null,
+                customUrlScheme,
+                null,
+                authorization,
+                clientTokenProvider,
+                IntegrationType.DROP_IN
+        );
 
         BraintreeClient braintreeClient = new BraintreeClient(braintreeOptions);
         return new DropInClientParams()
diff --git a/Drop-In/src/main/java/com/braintreepayments/api/DropInInternalClient.java b/Drop-In/src/main/java/com/braintreepayments/api/DropInInternalClient.java
index e6a79e83..bcad2bff 100644
--- a/Drop-In/src/main/java/com/braintreepayments/api/DropInInternalClient.java
+++ b/Drop-In/src/main/java/com/braintreepayments/api/DropInInternalClient.java
@@ -40,8 +40,15 @@ class DropInInternalClient {
     private static DropInInternalClientParams createDefaultParams(Context context, String authorization, DropInRequest dropInRequest, String sessionId) {
 
         String customUrlScheme = dropInRequest.getCustomUrlScheme();
-        BraintreeOptions braintreeOptions =
-                new BraintreeOptions(context, sessionId, customUrlScheme, authorization, null, IntegrationType.DROP_IN);
+        BraintreeOptions braintreeOptions = new BraintreeOptions(
+                context,
+                sessionId,
+                customUrlScheme,
+                null,
+                authorization,
+                null,
+                IntegrationType.DROP_IN
+        );
 
         BraintreeClient braintreeClient = new BraintreeClient(braintreeOptions);
 
diff --git a/Drop-In/src/test/java/com/braintreepayments/api/DropInActivityUnitTest.kt b/Drop-In/src/test/java/com/braintreepayments/api/DropInActivityUnitTest.kt
index f5ac588a..53adfb60 100644
--- a/Drop-In/src/test/java/com/braintreepayments/api/DropInActivityUnitTest.kt
+++ b/Drop-In/src/test/java/com/braintreepayments/api/DropInActivityUnitTest.kt
@@ -1200,7 +1200,7 @@ class DropInActivityUnitTest {
         val metadata = JSONObject()
         val returnUrlScheme = "sample-scheme"
         val browserSwitchRequest =
-            BrowserSwitchRequest(requestCode, url, metadata, returnUrlScheme, true)
+            BrowserSwitchRequest(requestCode, url, metadata, returnUrlScheme, null, true)
         return BrowserSwitchResult(BrowserSwitchStatus.SUCCESS, browserSwitchRequest)
     }
 
diff --git a/Drop-In/src/test/java/com/braintreepayments/api/DropInInternalClientUnitTest.java b/Drop-In/src/test/java/com/braintreepayments/api/DropInInternalClientUnitTest.java
index 7cec8598..119cc5e8 100644
--- a/Drop-In/src/test/java/com/braintreepayments/api/DropInInternalClientUnitTest.java
+++ b/Drop-In/src/test/java/com/braintreepayments/api/DropInInternalClientUnitTest.java
@@ -1591,7 +1591,7 @@ private static BrowserSwitchResult createSuccessfulBrowserSwitchResult() {
         Uri url = Uri.parse("www.example.com");
         String returnUrlScheme = "sample-scheme";
         BrowserSwitchRequest browserSwitchRequest = new BrowserSwitchRequest(
-                requestCode, url, new JSONObject(), returnUrlScheme, true);
+                requestCode, url, new JSONObject(), returnUrlScheme, null, true);
         return new BrowserSwitchResult(BrowserSwitchStatus.SUCCESS, browserSwitchRequest);
     }
 }
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index b6d99b77..89033a0b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         }
     }
 
-    ext.brainTreeVersion = "4.45.0"
+    ext.brainTreeVersion = "4.48.0"
 
     ext.deps = [
             "braintreeCore" : "com.braintreepayments.api:braintree-core:$brainTreeVersion",