Skip to content

Commit

Permalink
Update Braintree Core to 4.48.0 (#478)
Browse files Browse the repository at this point in the history
* Bump Braintree Core version to 4.48.0.

* Update CHANGELOG.

* Fix compilation error.

* Fix broken unit tests.
  • Loading branch information
sshropshire committed Jul 8, 2024
1 parent ec77bad commit 8f5a98a
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 7 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
}
}

ext.brainTreeVersion = "4.45.0"
ext.brainTreeVersion = "4.48.0"

ext.deps = [
"braintreeCore" : "com.braintreepayments.api:braintree-core:$brainTreeVersion",
Expand Down

0 comments on commit 8f5a98a

Please sign in to comment.