Re-merge release/3.10 to release/4.0 branch #4263
Merged
+23
−5
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
On Google Play's notice. Details: https://developer.android.com/google/play/billing/deprecation-faq?hl=en
Upgrade Google Play Billing library to 6.0.1
…oser() to get PEM content To fix regressions in newer Androids that SftpConnectDialog unable to load PEM for SSH authentication. Reference: https://stackoverflow.com/questions/10002065/android-gallery-always-returns-result-canceled-to-onactivityresult
…ct-pem SftpConnectDialog: Wrap open DocumentsUI intent with Intent.createChooser() to get PEM content
TranceLove
force-pushed
the
bugfix/merge-3.10
branch
from
fc687d0 to
0f01031
Compare
VishnuSanal
added
the
PR-Awaiting-Final-Review
EmmanuelMess
approved these changes
Feb 9, 2025
Member
EmmanuelMess
left a comment
EmmanuelMess
left a comment
There was a problem hiding this comment.
Approved assuming that it works for release 3.10
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Seems some commits that were in
release/3.10didn't go torelease/4.0yet... hence this PR to pick them up.Manual tests
Build tasks success
Successfully running following tasks on local:
./gradlew assembledebug./gradlew spotlessCheck