Merge login lib changes and implement new interface methods #10150
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
979ddf4aec Merge commit '827a47189094a6bc7800eaccc3ed069841251373' into sync-login-lib df3c11ed09 added textAlignment property to secondary button in login da783ea3c7 Login screens: added textAlignment property to labels 6d486bbf6b Merge pull request #21 from wordpress-mobile/merge-wpa-develop 57a2d00b14 Update login lib standalone FluxC hash 0ea2405def Merge commit 'ad485b27b26ffb38b8718940b0b7556b902dc28c' into sync-login-lib 6df15ab86b Update 2FA unavailable API error message eefd72f317 Show error and continue login on OAuth client 2FA error ca3b68e817 Merge branch 'amanda/signin-has-woo' into amanda/signin-tracks-events 4755048046 Remove part of login site error msg and add help button 3cc4f31b3b Refresh branch with AndroidX changes in develop 76c40f3034 Fixed incorrect ordering of imports in login library 08a9f0c65a First pass at AndroidX migration. Used the migration wizard then did far too much cleanup. a46ceeb96b Track connected site info requests, success, and failures 47528a1c33 Special handling for atomic sites 578dca7f29 Update androidx dependencies 1d09d1536d Fix AndroidX import order 48df84638f Fix import ordering for androidx d3dc35035a Migrate to AndroidX e9e219db2f Add logic to get connected site info for woo login mode. 873db9b385 Add new logic to change the label to show the site logging into 9f442e9a2f Add new WOO_LOGIN_MODE 309eeda212 Add new string to handle non-WordPress site error dfc6991275 Revert "Add new loginMode for woo and update related error strings" 9b44d78d3e Add debug property to populate site address during login 45ae481c03 Add new loginMode for woo and update related error strings 91731b6196 Add a way to hide the option to login by site address 4d6c83f111 Merge pull request #9890 from wordpress-mobile/update-dagger-version-to-v2.22.1 9cbf3f17ff Merge pull request #9885 from wordpress-mobile/update-login-library 0ddf4dcdbd Update Glide version to 4.9.0 f7860b9861 Updated Dagger in the login library 1c311d430c Updated Dagger in the login library 79dd984392 Updated login library to Glide 4.9.0 e995e12f02 Revert sdk change for login library 954e7ddebc Updated targetSdkVersion to 28 7ee1e1c003 Added another catch block to handle NoActivityFoundException 804225d94f Merge commit 'a9cf59e44590548a123efeb521f9ff99b3277072' into update-login-lib git-subtree-dir: libs/login git-subtree-split: 979ddf4aec664cf9afafa1cdf7d99599488f1eee
…oo-login-test-wp-2 # Conflicts (fixed): # libs/login/gradle.properties-example
These methods are not used by the WordPress app so they don't do anything and are only implemented to allow a successful build. These new methods were added for the Woo app.
Generated by 🚫 dangerJS |
malinajirka
reviewed
Jul 10, 2019
There was a problem hiding this comment.
Thanks @AmandaRiu! I've done some tests when I reviewed the PR in WPLoginFlow repo. Since we haven't done any changes in that PR I don't think this PR needs to be tested again. However, let me know if you think it should be and I'll be happy to test it.
Generated by 🚫 dangerJS |
|
@malinajirka I've reverted the unintentional changes to the config files. Ready for another round 👍 |
|
Actually, forgot to update with the latest version from the |
43ac7e9468 Merge pull request #22 from wordpress-mobile/merge-wca git-subtree-dir: libs/login git-subtree-split: 43ac7e9468ada491ccd1fcd63cfa1ef0616bd791
…oo-login-test-wp-2
shiki
added a commit
that referenced
this pull request
Jul 22, 2019
2289f9707b Merge commit '43ac7e9468ada491ccd1fcd63cfa1ef0616bd791' into issue/9720-login-subtree-update b5ac63f082 Fix redundancy in R.string.enter_site_address bc3903bd29 Update login_invalid_site_url 5d1b930343 Add tests for LoginSiteAddressValidator ae203df2ec Delete unused R.string.login_empty_site_url 763eeb9490 Replace login_invalid_site_url 1032574f3f Do not report an error if the text is empty 1fa189853a Site Address: Show an error message after 2 sec e869735555 Do not react to keyboard enter if site is invalid 8d50ab92c6 Move LoginSiteAddress validation to a class a8f234de25 Merge pull request #10150 from wordpress-mobile/amanda/woo-login-test-wp-2 6dbf72672a Updated login and editor libraries to remove right/left attributes when a start/end attribute already exists git-subtree-dir: libs/login git-subtree-split: 2289f9707bcac4e7138f5014de81292196d20e84
AmandaRiu
added a commit
that referenced
this pull request
Aug 1, 2019
fc60b518d7 Merge branch 'develop' into merge/woocommerce-android/1287 38737cef3b Merge pull request #25 from wordpress-mobile/merge-wpa d035db2384 Merge commit 'eb8270b278800a6804a2fce6bb63111c0dfa789a' into update-login-lib 4e66d2a380 Move signedin tracking to the google fragment a1e403a879 Track signed in event on sign up d983da8c98 Merge pull request #10232 from wordpress-mobile/amanda/login-lib-redirect-support 3bf6e99f15 Merge pull request #24 from wordpress-mobile/merge/WordPress-Android/10255 895ece8fc4 Merge commit '3a2393c33fe8f1f1448591580fc0054a732fac9b' into amanda/login-lib-redirect-support 5a21797a03 Merge pull request #23 from wordpress-mobile/merge/woocommerce-android/1224-amanda-new 8fee8b3660 Updated login and editor libraries to remove right/left attributes when a start/end attribute already exists 2289f9707b Merge commit '43ac7e9468ada491ccd1fcd63cfa1ef0616bd791' into issue/9720-login-subtree-update b5ac63f082 Fix redundancy in R.string.enter_site_address bc3903bd29 Update login_invalid_site_url 5d1b930343 Add tests for LoginSiteAddressValidator ae203df2ec Delete unused R.string.login_empty_site_url 763eeb9490 Replace login_invalid_site_url 1032574f3f Do not report an error if the text is empty 1fa189853a Site Address: Show an error message after 2 sec e869735555 Do not react to keyboard enter if site is invalid 8d50ab92c6 Move LoginSiteAddress validation to a class 3a9a5c8566 Merge commit 'e3144c2c11b0c982eadb2478cf6926aa40c127e6' into amanda/login-lib-redirect-support 3b1db07c38 Merge commit '615ebab45e1bc3d0cdd3a9da060026fef704d3a8' into amanda/test_git_subtree a8f234de25 Merge pull request #10150 from wordpress-mobile/amanda/woo-login-test-wp-2 43ac7e9468 Merge pull request #22 from wordpress-mobile/merge-wca d4d717cf16 Send redirectUrl to listener and strip protocol before saving 6dbf72672a Updated login and editor libraries to remove right/left attributes when a start/end attribute already exists 979ddf4aec Merge commit '827a47189094a6bc7800eaccc3ed069841251373' into sync-login-lib df3c11ed09 added textAlignment property to secondary button in login da783ea3c7 Login screens: added textAlignment property to labels 6d486bbf6b Merge pull request #21 from wordpress-mobile/merge-wpa-develop 57a2d00b14 Update login lib standalone FluxC hash 0ea2405def Merge commit 'ad485b27b26ffb38b8718940b0b7556b902dc28c' into sync-login-lib 6df15ab86b Update 2FA unavailable API error message eefd72f317 Show error and continue login on OAuth client 2FA error 578dca7f29 Update androidx dependencies 1d09d1536d Fix AndroidX import order 48df84638f Fix import ordering for androidx d3dc35035a Migrate to AndroidX 78c5307f7a Merge pull request #16 from wordpress-mobile/fix_crash_in_login_email_fragment 4d6c83f111 Merge pull request #9890 from wordpress-mobile/update-dagger-version-to-v2.22.1 edd8684ec4 Merge pull request #18 from wordpress-mobile/new-wpandroid-changes 9cbf3f17ff Merge pull request #9885 from wordpress-mobile/update-login-library 71729e5e76 Merge pull request #17 from wordpress-mobile/issue/glide-4.9 0ddf4dcdbd Update Glide version to 4.9.0 f7860b9861 Updated Dagger in the login library aabdedf672 Merge commit '099b5a011d32283eb6c79b0e599b5272a597e849' into update-login-library 1eb7f4f156 Updated Glide to 4.9.0 a32cc8c09d Add crash fix to SignupEmailFragment 08109fa90f Adds non-null check to onActivityResult 664b67f62d Fix #9826: make sure we Play Services are available before running the email hint picker 94a0ae2a39 Merge pull request #9743 from wordpress-mobile/feature/manage_insights_readonly 7cad17e264 Fix a few ContentDescription lint errors 9f171b55d0 Merge branch 'feature/manage_insights_readonly' into issue/9464-manage-insights 663a168903 Add the missing drawable resources git-subtree-dir: libs/login git-subtree-split: fc60b518d7c72864f6df54546d640d0e2fbb8673
wzieba
pushed a commit
that referenced
this pull request
Sep 27, 2024
…-wp-2 Merge login lib changes and implement new interface methods
wzieba
pushed a commit
that referenced
this pull request
Oct 21, 2024
…-wp-2 Merge login lib changes and implement new interface methods
wzieba
pushed a commit
that referenced
this pull request
Oct 21, 2024
…-wp-2 Merge login lib changes and implement new interface methods
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 PR merges the
woocommerce-androidchanges to the login library from this PR. There were several new interface methods added existing classes:LoginAnalyticsListener
trackConnectedSiteInfoRequestedtrackConnectedSiteInfoFailedtrackConnectedSiteInfoSucceededLoginListener
showHelpFindingConnectedEmailgotConnectedSiteInfoI've implemented these new interface methods in
LoginActivityandLoginAnalyticsTrackerbut there is no logic needed since none of them are currently being used in WPAndroid. Those are the only two changes to WPAndroid directly.Full documentation around the changes to login library are documented in this PR, but the WPAndroid app should see no difference in the login experience.
Recommended Test Scenarios
Note: This PR is not ready for merge. This PR must first be merged, and then a new branch/PR will be submitted with the fresh changes ready for final review.