Merge recent WordPress-Login-Flow-Android changes #1277
Merged
Conversation
This file contains 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
8fee8b3 Updated login and editor libraries to remove right/left attributes when a start/end attribute already exists 2289f97 Merge commit '43ac7e9468ada491ccd1fcd63cfa1ef0616bd791' into issue/9720-login-subtree-update b5ac63f Fix redundancy in R.string.enter_site_address bc3903b Update login_invalid_site_url 5d1b930 Add tests for LoginSiteAddressValidator ae203df Delete unused R.string.login_empty_site_url 763eeb9 Replace login_invalid_site_url 1032574 Do not report an error if the text is empty 1fa1898 Site Address: Show an error message after 2 sec e869735 Do not react to keyboard enter if site is invalid 8d50ab9 Move LoginSiteAddress validation to a class a8f234d Merge pull request #10150 from wordpress-mobile/amanda/woo-login-test-wp-2 43ac7e9 Merge pull request #22 from wordpress-mobile/merge-wca 6dbf726 Updated login and editor libraries to remove right/left attributes when a start/end attribute already exists 979ddf4 Merge commit '827a47189094a6bc7800eaccc3ed069841251373' into sync-login-lib df3c11e added textAlignment property to secondary button in login da783ea Login screens: added textAlignment property to labels ca3b68e Merge branch 'amanda/signin-has-woo' into amanda/signin-tracks-events 4755048 Remove part of login site error msg and add help button 3cc4f31 Refresh branch with AndroidX changes in develop 76c40f3 Fixed incorrect ordering of imports in login library 08a9f0c First pass at AndroidX migration. Used the migration wizard then did far too much cleanup. a46ceeb Track connected site info requests, success, and failures 47528a1 Special handling for atomic sites e9e219d Add logic to get connected site info for woo login mode. 873db9b Add new logic to change the label to show the site logging into 9f442e9 Add new WOO_LOGIN_MODE 309eeda Add new string to handle non-WordPress site error dfc6991 Revert "Add new loginMode for woo and update related error strings" 9b44d78 Add debug property to populate site address during login 45ae481 Add new loginMode for woo and update related error strings 91731b6 Add a way to hide the option to login by site address 1c311d4 Updated Dagger in the login library 79dd984 Updated login library to Glide 4.9.0 e995e12 Revert sdk change for login library 954e7dd Updated targetSdkVersion to 28 7ee1e1c Added another catch block to handle NoActivityFoundException 804225d Merge commit 'a9cf59e44590548a123efeb521f9ff99b3277072' into update-login-lib git-subtree-dir: libs/login git-subtree-split: 8fee8b3
This was suggested by Editorial in WPAndroid.
This comment has been minimized.
This comment has been minimized.
|
Tested and everything looks good. The string changes also look 👍 |
2 tasks
|
Thank you, @AmandaRiu! I marked this as Ready for Review since wordpress-mobile/WordPress-Login-Flow-Android#24 was merged. Can I merge this? 🙂 |
AmandaRiu
added 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
designsimply
added
feature: login
AnirudhBhat
pushed a commit
that referenced
this pull request
Aug 11, 2021
…Android/24 Merge recent WordPress-Login-Flow-Android changes
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.
This applies the recent WordPress-Login-Flow-Android changes as described in wordpress-mobile/WordPress-Login-Flow-Android#24. The changes are mainly from these 2 PRs:
Copy changes
I have also changed the strings to match the ones used in WPAndroid (see wordpress-mobile/WordPress-Android#10255).
Fixed redundancy in
R.string.enter_site_address. This was suggested in Add realtime site address validation wordpress-mobile/WordPress-Android#10255 (comment).R.string.login_invalid_site_urlstring. This was suggested in Add realtime site address validation wordpress-mobile/WordPress-Android#10255 (comment).Release Notes
RELEASE-NOTES.txt.