Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Incorporate the Activity result APIs to resolve loadPaymentData calls #8381

Merged
merged 17 commits into from
May 1, 2024
Merged

Incorporate the Activity result APIs to resolve loadPaymentData calls #8381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
90eea18
Use the 19.3.0 beta version of the Google Pay API
JlUgia Feb 7, 2024
bd672e7
Replace deprecated onActivity result with the new Google Pay contract
JlUgia Feb 7, 2024
3d3712d
Upgrade to general availability
JlUgia Mar 6, 2024
acc70a1
Import VisibleForTesting from AndroidX
JlUgia Mar 11, 2024
6dc8646
Merge branch 'master' of https://github.com/stripe/stripe-android int…
JlUgia Apr 10, 2024
656c9a7
Revert changed files during merge process
JlUgia Apr 10, 2024
57f8aa9
The task needs to be completed before it can be handled by the activi…
JlUgia Apr 16, 2024
a2a39fe
Move Task extension to a separate file
JlUgia Apr 16, 2024
2ac8157
Merge branch 'master' of github.com:JlUgia/stripe-android into google…
JlUgia Apr 29, 2024
0e33d88
Merge branch 'master' into jaynewstrom/public-pr-7895
jaynewstrom-stripe Apr 30, 2024
f04b29c
Fix lint stuff.
jaynewstrom-stripe Apr 30, 2024
499affc
Add back some error handling, and fix lint.
jaynewstrom-stripe Apr 30, 2024
2f8ef43
Fix tests.
jaynewstrom-stripe Apr 30, 2024
3c2d3c8
Address code review feedback.
jaynewstrom-stripe May 1, 2024
57ada23
Send result.
jaynewstrom-stripe May 1, 2024
7609531
Fix an error message
jaynewstrom-stripe May 1, 2024
cbb0e5f
Add checks to activity result.
jaynewstrom-stripe May 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

## XX.XX.XX - 2023-XX-XX

Dependencies updated in [8381](https://github.com/stripe/stripe-android/pull/8381):
* Bumped Play Services Wallet from 19.2.1 to 19.3.0.

## 20.41.1 - 2024-04-22

### PaymentSheet
Expand Down
2 changes: 1 addition & 1 deletion dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ ext.versions = [
places : '3.3.0',
playServicesCoroutines : '1.7.3',
playServicesTfLite : '16.0.1',
playServicesWallet : '19.2.1',
playServicesWallet : '19.3.0',
retrofit : '2.9.0',
robolectric : '4.11.1',
shot : '5.14.1',
Expand Down
32 changes: 16 additions & 16 deletions example/dependencies/dependencies.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -705,30 +705,30 @@
| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.7.3
| | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3 (*)
| | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3 (*)
| | | +--- com.google.android.gms:play-services-tasks:16.0.1 -> 18.0.1
| | | | \--- com.google.android.gms:play-services-basement:18.0.0
| | | +--- com.google.android.gms:play-services-tasks:16.0.1 -> 18.1.0
| | | | \--- com.google.android.gms:play-services-basement:18.3.0
| | | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*)
| | | | +--- androidx.core:core:1.2.0 -> 1.12.0 (*)
| | | | \--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*)
| | | | \--- androidx.fragment:fragment:1.1.0 -> 1.6.2 (*)
| | | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20 -> 1.9.10 (*)
| | +--- com.google.android.material:material:1.11.0 (*)
| | +--- com.google.android.gms:play-services-wallet:19.2.1
| | +--- com.google.android.gms:play-services-wallet:19.3.0
| | | +--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*)
| | | +--- com.google.android.gms:play-services-base:18.0.1
| | | +--- com.google.android.gms:play-services-base:18.3.0
| | | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*)
| | | | +--- androidx.core:core:1.2.0 -> 1.12.0 (*)
| | | | +--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*)
| | | | +--- com.google.android.gms:play-services-basement:18.0.0 (*)
| | | | \--- com.google.android.gms:play-services-tasks:18.0.1 (*)
| | | +--- com.google.android.gms:play-services-basement:18.0.0 (*)
| | | | +--- com.google.android.gms:play-services-basement:18.3.0 (*)
| | | | \--- com.google.android.gms:play-services-tasks:18.1.0 (*)
| | | +--- com.google.android.gms:play-services-basement:18.3.0 (*)
| | | +--- com.google.android.gms:play-services-identity:18.0.1
| | | | +--- com.google.android.gms:play-services-base:18.0.1 (*)
| | | | \--- com.google.android.gms:play-services-basement:18.0.0 (*)
| | | | +--- com.google.android.gms:play-services-base:18.0.1 -> 18.3.0 (*)
| | | | \--- com.google.android.gms:play-services-basement:18.0.0 -> 18.3.0 (*)
| | | +--- com.google.android.gms:play-services-maps:18.0.2
| | | | +--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*)
| | | | +--- com.google.android.gms:play-services-base:18.0.1 (*)
| | | | \--- com.google.android.gms:play-services-basement:18.0.0 (*)
| | | \--- com.google.android.gms:play-services-tasks:18.0.1 (*)
| | | | +--- com.google.android.gms:play-services-base:18.0.1 -> 18.3.0 (*)
| | | | \--- com.google.android.gms:play-services-basement:18.0.0 -> 18.3.0 (*)
| | | \--- com.google.android.gms:play-services-tasks:18.1.0 (*)
| | +--- com.google.android.instantapps:instantapps:1.1.0
| | +--- com.stripe:stripe-3ds2-android:6.1.8
| | | +--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.9.10 -> 1.9.22 (*)
Expand Down Expand Up @@ -943,9 +943,9 @@
| | | +--- androidx.compose.ui:ui:1.5.0 -> 1.5.4 (*)
| | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 -> 1.7.3 (*)
| | | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0 -> 1.9.10 (*)
| | +--- com.google.android.gms:play-services-wallet:19.2.1 (*)
| | +--- com.google.android.gms:play-services-wallet:19.3.0 (*)
| | +--- com.google.pay.button:compose-pay-button:0.1.3
| | | +--- com.google.android.gms:play-services-wallet:19.2.1 (*)
| | | +--- com.google.android.gms:play-services-wallet:19.2.1 -> 19.3.0 (*)
| | | +--- androidx.compose.ui:ui:1.5.4 (*)
| | | +--- androidx.compose.material:material:1.5.4 (*)
| | | +--- androidx.core:core-ktx:1.12.0 (*)
Expand Down Expand Up @@ -1027,7 +1027,7 @@
| | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.21 -> 1.9.10 (*)
| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.21 -> 1.9.10 (*)
+--- com.google.android.material:material:1.11.0 (*)
+--- com.google.android.gms:play-services-wallet:19.2.1 (*)
+--- com.google.android.gms:play-services-wallet:19.3.0 (*)
+--- com.squareup.okio:okio:3.7.0 (*)
+--- com.squareup.retrofit2:retrofit:2.9.0
| \--- com.squareup.okhttp3:okhttp:3.14.9 -> 4.12.0 (*)
Expand Down
26 changes: 13 additions & 13 deletions financial-connections-example/dependencies/dependencies.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -815,30 +815,30 @@
| +--- org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.7.3
| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3 (*)
| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3 (*)
| | +--- com.google.android.gms:play-services-tasks:16.0.1 -> 18.0.1
| | | \--- com.google.android.gms:play-services-basement:18.0.0
| | +--- com.google.android.gms:play-services-tasks:16.0.1 -> 18.1.0
| | | \--- com.google.android.gms:play-services-basement:18.3.0
| | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*)
| | | +--- androidx.core:core:1.2.0 -> 1.12.0 (*)
| | | \--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*)
| | | \--- androidx.fragment:fragment:1.1.0 -> 1.6.2 (*)
| | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20 -> 1.9.10 (*)
| +--- com.google.android.material:material:1.11.0 (*)
| +--- com.google.android.gms:play-services-wallet:19.2.1
| +--- com.google.android.gms:play-services-wallet:19.3.0
| | +--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*)
| | +--- com.google.android.gms:play-services-base:18.0.1
| | +--- com.google.android.gms:play-services-base:18.3.0
| | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*)
| | | +--- androidx.core:core:1.2.0 -> 1.12.0 (*)
| | | +--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*)
| | | +--- com.google.android.gms:play-services-basement:18.0.0 (*)
| | | \--- com.google.android.gms:play-services-tasks:18.0.1 (*)
| | +--- com.google.android.gms:play-services-basement:18.0.0 (*)
| | | +--- com.google.android.gms:play-services-basement:18.3.0 (*)
| | | \--- com.google.android.gms:play-services-tasks:18.1.0 (*)
| | +--- com.google.android.gms:play-services-basement:18.3.0 (*)
| | +--- com.google.android.gms:play-services-identity:18.0.1
| | | +--- com.google.android.gms:play-services-base:18.0.1 (*)
| | | \--- com.google.android.gms:play-services-basement:18.0.0 (*)
| | | +--- com.google.android.gms:play-services-base:18.0.1 -> 18.3.0 (*)
| | | \--- com.google.android.gms:play-services-basement:18.0.0 -> 18.3.0 (*)
| | +--- com.google.android.gms:play-services-maps:18.0.2
| | | +--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*)
| | | +--- com.google.android.gms:play-services-base:18.0.1 (*)
| | | \--- com.google.android.gms:play-services-basement:18.0.0 (*)
| | \--- com.google.android.gms:play-services-tasks:18.0.1 (*)
| | | +--- com.google.android.gms:play-services-base:18.0.1 -> 18.3.0 (*)
| | | \--- com.google.android.gms:play-services-basement:18.0.0 -> 18.3.0 (*)
| | \--- com.google.android.gms:play-services-tasks:18.1.0 (*)
| +--- com.google.android.instantapps:instantapps:1.1.0
| +--- com.stripe:stripe-3ds2-android:6.1.8
| | +--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.9.10 -> 1.9.22 (*)
Expand Down
26 changes: 13 additions & 13 deletions link/dependencies/dependencies.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -696,30 +696,30 @@
| +--- org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.7.3
| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3 (*)
| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3 (*)
| | +--- com.google.android.gms:play-services-tasks:16.0.1 -> 18.0.1
| | | \--- com.google.android.gms:play-services-basement:18.0.0
| | +--- com.google.android.gms:play-services-tasks:16.0.1 -> 18.1.0
| | | \--- com.google.android.gms:play-services-basement:18.3.0
| | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*)
| | | +--- androidx.core:core:1.2.0 -> 1.12.0 (*)
| | | \--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*)
| | | \--- androidx.fragment:fragment:1.1.0 -> 1.6.2 (*)
| | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20 -> 1.9.10 (*)
| +--- com.google.android.material:material:1.11.0 (*)
| +--- com.google.android.gms:play-services-wallet:19.2.1
| +--- com.google.android.gms:play-services-wallet:19.3.0
| | +--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*)
| | +--- com.google.android.gms:play-services-base:18.0.1
| | +--- com.google.android.gms:play-services-base:18.3.0
| | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*)
| | | +--- androidx.core:core:1.2.0 -> 1.12.0 (*)
| | | +--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*)
| | | +--- com.google.android.gms:play-services-basement:18.0.0 (*)
| | | \--- com.google.android.gms:play-services-tasks:18.0.1 (*)
| | +--- com.google.android.gms:play-services-basement:18.0.0 (*)
| | | +--- com.google.android.gms:play-services-basement:18.3.0 (*)
| | | \--- com.google.android.gms:play-services-tasks:18.1.0 (*)
| | +--- com.google.android.gms:play-services-basement:18.3.0 (*)
| | +--- com.google.android.gms:play-services-identity:18.0.1
| | | +--- com.google.android.gms:play-services-base:18.0.1 (*)
| | | \--- com.google.android.gms:play-services-basement:18.0.0 (*)
| | | +--- com.google.android.gms:play-services-base:18.0.1 -> 18.3.0 (*)
| | | \--- com.google.android.gms:play-services-basement:18.0.0 -> 18.3.0 (*)
| | +--- com.google.android.gms:play-services-maps:18.0.2
| | | +--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*)
| | | +--- com.google.android.gms:play-services-base:18.0.1 (*)
| | | \--- com.google.android.gms:play-services-basement:18.0.0 (*)
| | \--- com.google.android.gms:play-services-tasks:18.0.1 (*)
| | | +--- com.google.android.gms:play-services-base:18.0.1 -> 18.3.0 (*)
| | | \--- com.google.android.gms:play-services-basement:18.0.0 -> 18.3.0 (*)
| | \--- com.google.android.gms:play-services-tasks:18.1.0 (*)
| +--- com.google.android.instantapps:instantapps:1.1.0
| +--- com.stripe:stripe-3ds2-android:6.1.8
| | +--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.9.10 -> 1.9.22 (*)
Expand Down
26 changes: 13 additions & 13 deletions network-testing/dependencies/dependencies.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -683,30 +683,30 @@
| +--- org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.7.3
| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3 (*)
| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3 (*)
| | +--- com.google.android.gms:play-services-tasks:16.0.1 -> 18.0.1
| | | \--- com.google.android.gms:play-services-basement:18.0.0
| | +--- com.google.android.gms:play-services-tasks:16.0.1 -> 18.1.0
| | | \--- com.google.android.gms:play-services-basement:18.3.0
| | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*)
| | | +--- androidx.core:core:1.2.0 -> 1.12.0 (*)
| | | \--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*)
| | | \--- androidx.fragment:fragment:1.1.0 -> 1.6.2 (*)
| | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20 -> 1.9.10 (*)
| +--- com.google.android.material:material:1.11.0 (*)
| +--- com.google.android.gms:play-services-wallet:19.2.1
| +--- com.google.android.gms:play-services-wallet:19.3.0
| | +--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*)
| | +--- com.google.android.gms:play-services-base:18.0.1
| | +--- com.google.android.gms:play-services-base:18.3.0
| | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*)
| | | +--- androidx.core:core:1.2.0 -> 1.12.0 (*)
| | | +--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*)
| | | +--- com.google.android.gms:play-services-basement:18.0.0 (*)
| | | \--- com.google.android.gms:play-services-tasks:18.0.1 (*)
| | +--- com.google.android.gms:play-services-basement:18.0.0 (*)
| | | +--- com.google.android.gms:play-services-basement:18.3.0 (*)
| | | \--- com.google.android.gms:play-services-tasks:18.1.0 (*)
| | +--- com.google.android.gms:play-services-basement:18.3.0 (*)
| | +--- com.google.android.gms:play-services-identity:18.0.1
| | | +--- com.google.android.gms:play-services-base:18.0.1 (*)
| | | \--- com.google.android.gms:play-services-basement:18.0.0 (*)
| | | +--- com.google.android.gms:play-services-base:18.0.1 -> 18.3.0 (*)
| | | \--- com.google.android.gms:play-services-basement:18.0.0 -> 18.3.0 (*)
| | +--- com.google.android.gms:play-services-maps:18.0.2
| | | +--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*)
| | | +--- com.google.android.gms:play-services-base:18.0.1 (*)
| | | \--- com.google.android.gms:play-services-basement:18.0.0 (*)
| | \--- com.google.android.gms:play-services-tasks:18.0.1 (*)
| | | +--- com.google.android.gms:play-services-base:18.0.1 -> 18.3.0 (*)
| | | \--- com.google.android.gms:play-services-basement:18.0.0 -> 18.3.0 (*)
| | \--- com.google.android.gms:play-services-tasks:18.1.0 (*)
| +--- com.google.android.instantapps:instantapps:1.1.0
| +--- com.stripe:stripe-3ds2-android:6.1.8
| | +--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.9.10 -> 1.9.22 (*)
Expand Down
26 changes: 13 additions & 13 deletions payment-method-messaging/dependencies/dependencies.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -695,30 +695,30 @@
| +--- org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.7.3
| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3 (*)
| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3 (*)
| | +--- com.google.android.gms:play-services-tasks:16.0.1 -> 18.0.1
| | | \--- com.google.android.gms:play-services-basement:18.0.0
| | +--- com.google.android.gms:play-services-tasks:16.0.1 -> 18.1.0
| | | \--- com.google.android.gms:play-services-basement:18.3.0
| | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*)
| | | +--- androidx.core:core:1.2.0 -> 1.12.0 (*)
| | | \--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*)
| | | \--- androidx.fragment:fragment:1.1.0 -> 1.6.2 (*)
| | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20 -> 1.9.10 (*)
| +--- com.google.android.material:material:1.11.0 (*)
| +--- com.google.android.gms:play-services-wallet:19.2.1
| +--- com.google.android.gms:play-services-wallet:19.3.0
| | +--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*)
| | +--- com.google.android.gms:play-services-base:18.0.1
| | +--- com.google.android.gms:play-services-base:18.3.0
| | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*)
| | | +--- androidx.core:core:1.2.0 -> 1.12.0 (*)
| | | +--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*)
| | | +--- com.google.android.gms:play-services-basement:18.0.0 (*)
| | | \--- com.google.android.gms:play-services-tasks:18.0.1 (*)
| | +--- com.google.android.gms:play-services-basement:18.0.0 (*)
| | | +--- com.google.android.gms:play-services-basement:18.3.0 (*)
| | | \--- com.google.android.gms:play-services-tasks:18.1.0 (*)
| | +--- com.google.android.gms:play-services-basement:18.3.0 (*)
| | +--- com.google.android.gms:play-services-identity:18.0.1
| | | +--- com.google.android.gms:play-services-base:18.0.1 (*)
| | | \--- com.google.android.gms:play-services-basement:18.0.0 (*)
| | | +--- com.google.android.gms:play-services-base:18.0.1 -> 18.3.0 (*)
| | | \--- com.google.android.gms:play-services-basement:18.0.0 -> 18.3.0 (*)
| | +--- com.google.android.gms:play-services-maps:18.0.2
| | | +--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*)
| | | +--- com.google.android.gms:play-services-base:18.0.1 (*)
| | | \--- com.google.android.gms:play-services-basement:18.0.0 (*)
| | \--- com.google.android.gms:play-services-tasks:18.0.1 (*)
| | | +--- com.google.android.gms:play-services-base:18.0.1 -> 18.3.0 (*)
| | | \--- com.google.android.gms:play-services-basement:18.0.0 -> 18.3.0 (*)
| | \--- com.google.android.gms:play-services-tasks:18.1.0 (*)
| +--- com.google.android.instantapps:instantapps:1.1.0
| +--- com.stripe:stripe-3ds2-android:6.1.8
| | +--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.9.10 -> 1.9.22 (*)
Expand Down
Loading
Loading