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

Jump to bottom

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

merged 17 commits into from
May 1, 2024

Commits on Feb 7, 2024

  1. Use the 19.3.0 beta version of the Google Pay API

    @JlUgia
    JlUgia committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    90eea18 View commit details
    Browse the repository at this point in the history

  2. Replace deprecated onActivity result with the new Google Pay contract

    @JlUgia
    JlUgia committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    bd672e7 View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2024

  1. Upgrade to general availability

    @JlUgia
    JlUgia committed Mar 6, 2024
    Configuration menu
    Copy the full SHA
    3d3712d View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2024

  1. Import VisibleForTesting from AndroidX

    @JlUgia
    JlUgia committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    acc70a1 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2024

  1. Merge branch 'master' of https://github.com/stripe/stripe-android int… 

    …o google-pay-activity-result

# Conflicts:
#	payments-core/src/main/java/com/stripe/android/googlepaylauncher/GooglePayLauncherActivity.kt
    @JlUgia
    JlUgia committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    6dc8646 View commit details
    Browse the repository at this point in the history

  2. Revert changed files during merge process

    @JlUgia
    JlUgia committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    656c9a7 View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2024

  1. The task needs to be completed before it can be handled by the activi… 

    …ty result launcher
    @JlUgia
    JlUgia committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    57f8aa9 View commit details
    Browse the repository at this point in the history

  2. Move Task extension to a separate file

    @JlUgia
    JlUgia committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    a2a39fe View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2024

  1. Merge branch 'master' of github.com:JlUgia/stripe-android into google… 

    …-pay-activity-result

# Conflicts:
#	payments-core/src/main/java/com/stripe/android/googlepaylauncher/GooglePayLauncherActivity.kt
#	payments-core/src/main/java/com/stripe/android/googlepaylauncher/GooglePayLauncherViewModel.kt
    @JlUgia
    JlUgia committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    2ac8157 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2024

  1. Merge branch 'master' into jaynewstrom/public-pr-7895

    @jaynewstrom-stripe
    jaynewstrom-stripe committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    0e33d88 View commit details
    Browse the repository at this point in the history

  2. Fix lint stuff.

    @jaynewstrom-stripe
    jaynewstrom-stripe committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    f04b29c View commit details
    Browse the repository at this point in the history

  3. Add back some error handling, and fix lint.

    @jaynewstrom-stripe
    jaynewstrom-stripe committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    499affc View commit details
    Browse the repository at this point in the history

  4. Fix tests.

    @jaynewstrom-stripe
    jaynewstrom-stripe committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    2f8ef43 View commit details
    Browse the repository at this point in the history

Commits on May 1, 2024

  1. Address code review feedback.

    @jaynewstrom-stripe
    jaynewstrom-stripe committed May 1, 2024
    Configuration menu
    Copy the full SHA
    3c2d3c8 View commit details
    Browse the repository at this point in the history

  2. Send result.

    @jaynewstrom-stripe
    jaynewstrom-stripe committed May 1, 2024
    Configuration menu
    Copy the full SHA
    57ada23 View commit details
    Browse the repository at this point in the history

  3. Fix an error message

    @jaynewstrom-stripe
    jaynewstrom-stripe committed May 1, 2024
    Configuration menu
    Copy the full SHA
    7609531 View commit details
    Browse the repository at this point in the history

  4. Add checks to activity result.

    @jaynewstrom-stripe
    jaynewstrom-stripe committed May 1, 2024
    Configuration menu
    Copy the full SHA
    cbb0e5f View commit details
    Browse the repository at this point in the history