Merge in latest changes from login library#1312
Merged
Conversation
38737ce Merge pull request #25 from wordpress-mobile/merge-wpa d035db2 Merge commit 'eb8270b278800a6804a2fce6bb63111c0dfa789a' into update-login-lib 4e66d2a Move signedin tracking to the google fragment a1e403a Track signed in event on sign up d983da8 Merge pull request #10232 from wordpress-mobile/amanda/login-lib-redirect-support 3bf6e99 Merge pull request #24 from wordpress-mobile/merge/WordPress-Android/10255 895ece8 Merge commit '3a2393c33fe8f1f1448591580fc0054a732fac9b' into amanda/login-lib-redirect-support 5a21797 Merge pull request #23 from wordpress-mobile/merge/woocommerce-android/1224-amanda-new 3a9a5c8 Merge commit 'e3144c2c11b0c982eadb2478cf6926aa40c127e6' into amanda/login-lib-redirect-support 3b1db07 Merge commit '615ebab45e1bc3d0cdd3a9da060026fef704d3a8' into amanda/test_git_subtree d4d717c Send redirectUrl to listener and strip protocol before saving git-subtree-dir: libs/login git-subtree-split: 38737ce
…gin-lib # Conflicts: # libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginSiteAddressFragment.java
Error TypeErrorDangerfileGenerated by 🚫 dangerJS |
Contributor
|
|
nbradbury
approved these changes
Aug 1, 2019
AmandaRiu
pushed a commit
that referenced
this pull request
Dec 30, 2019
f58a4c8 Merge pull request #30 from wordpress-mobile/merge-wc-login-changes d8a4023 Merge branch 'merge-wc-login-changes' of https://github.com/wordpress-mobile/WordPress-Login-Flow-Android into merge-wc-login-changes 4b8e835 Added logic to redirect to discovery error if xmlrpc is blocked on site 2c3223b Reverted logic to check for Jetpack availability during discovery errors since it can return a false negative 846dc2b Handle site not found discovery error which can occur even with Jetpack available e1028df Modified logic to check for discovery errors first before checking for Jetpack 16c1bbe Modified error message for xmlrpc errors 732a048 Modified logic to initiate discovery from LoginBaseDiscoveryFragment fdfb9df Added logic to redirect to discovery error screen, even if Jetpack is available 0833d5c Add flag to check if Jetpack is available if a discovery error takes place aa7f8cc Added logic to port over changes from the LoginSiteAddressFragment to utilise LoginBaseDiscoveryFragment e1f2ff2 Modified discovery error listener to handle the various error scenarios from the calling fragment a1bc462 Added option to verify email only if login is for self hosted credentials c2f2bba Added new string labels for magic link sent label b4b9dbc Merge branch 'feature/sign-in-with-self-hosted-credentials' into issue/1482-step2-magic-link-signin-changes 32d2c25 Handle corner case in discovery process and redirect to email screen if site is wp.com d96252d Fixed nitpicks in code/xml 9b227c8 Design changes for request magic link screen a871288 Hide keyboard before redirecting to the magic link/no jetpack screen e4e8210 Added logic to initiate discovery process for xmlrpc endpoint 2c35450 Added logic to pass the input site address to forgot password flow, if the xmlrpc url is empty f9ff33e Added separate method to redirect to username screen in LoginListener f71a406 Revert discovery initiation changes to the site fragment 1e3e9cf Added logic to fetch SiteModel based on the site url 71ec9bd Added logic to redirect to no Jetpack screen when site credentials are entered ad42794 Revert adding a new method to LoginListener, instead use an existing listener method 8f3649b Added logic to fetch jetpack user email from site credentials and redirect to magic link screen aa0d39d Pass site xmlrpc url to email and jetpack required screen 360480c Initiate discovery process even if jetpack is not installed/active/connected 39b0ee0 Added logic to redirect Woo users to email login or jetpack required screen efd18a8 Revert the connection info endpoint implementation and update error message when site is not found 96e0ff7 Added label to the top of the LoginUsernamePasswordFragment for Woo login only 082d1e1 Display login with site credentials link button in login email fragment 27b07bf Merge commit 'f89f408ee83d29d59dfe5740b2ba26c51dcd00df' into issue/1446-login-lib-merge d701410 Add commit message for jetpack validation fix 80b2157 Use only the isJetpackConnected property for jetpack validation eb90f72 Merge pull request #1312 from woocommerce/merge-login-lib bd60868 Merge commit 'aec4a8317d3188866c02556c182cd8d09d9b0272' into merge-login-lib 378a45b Fix leak of anonymous OnCancelListener reference 71cfd27 Merge branch 'develop' into amanda/leak_canary 42cf2d5 Merge pull request #1292 from woocommerce/release/2.3 67de44c Merge branch 'release/2.3' into merge-release/2.2.1-release/2.3 227c48b Merge pull request #1277 from woocommerce/merge/WordPress-Login-Flow-Android/24 0123a10 Reverted changes to login build.gradle ff16da7 Reverted back to SDK 28 (we can update to 29 once Android Q is out of beta) d433fad Merge commit '9bb4617dddea713295ce4b53a60aa2a271f318a2' squashed 6669584 Upgraded login library to SDK 29 ff4a69e Add leak canary and fix leaks git-subtree-dir: libs/login git-subtree-split: f58a4c8
AnirudhBhat
pushed a commit
that referenced
this pull request
Aug 11, 2021
Merge in latest changes from login library
wzieba
pushed a commit
that referenced
this pull request
Jan 14, 2025
Merge in latest changes from login library
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
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.
Merges in the latest changes from the login library's
develop. All the changes are from this PR: wordpress-mobile/WordPress-Android#10280.The only material change is an extra tracks event dispatched from the
SignupGoogleFragment, which the Woo app doesn't use. However a change was also made to thetrackAnalyticsSignIninterface method which required some minor changes to WooAndroid.To test
Update release notes
RELEASE-NOTES.txt. (not applicable)