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.

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

Update login library with latest changes from WCAndroid #10232

Merged
merged 5 commits into from
Jul 24, 2019

Conversation

AmandaRiu
Copy link
Contributor

@AmandaRiu AmandaRiu commented Jul 17, 2019

This PR merges in the changes required for redirect support as described in this PR: woocommerce/woocommerce-android#1224 - please see that PR for additional information.

WordPress Android does not use this functionality, but did require a tweak to an unused method to have it conform to the changes in the LoginListener.

Note: this PR is in draft and will not be ready for merge until the login library PR is merged and this branch updated with the login library's develop branch.

3b1db07c38 Merge commit '615ebab45e1bc3d0cdd3a9da060026fef704d3a8' into amanda/test_git_subtree
d4d717cf16 Send redirectUrl to listener and strip protocol before saving

git-subtree-dir: libs/login
git-subtree-split: 3b1db07c3872c0935c721f1b5a8e5c4a9eaf9f97
This method is not used by WordPress, but to conform to the interface
changes required by Woo, the method must be implemented.
@peril-wordpress-mobile

This comment has been minimized.

5a21797a03 Merge pull request #23 from wordpress-mobile/merge/woocommerce-android/1224-amanda-new

git-subtree-dir: libs/login
git-subtree-split: 5a21797a0330b1551814a8a9298c5f601c0ca42b
@AmandaRiu
Copy link
Contributor Author

Updated with the latest changes from WordPress-Login-Flow-Android : develop. Ready for final review.

@AmandaRiu AmandaRiu marked this pull request as ready for review July 23, 2019 16:14
@AmandaRiu AmandaRiu marked this pull request as ready for review July 23, 2019 16:15
Copy link
Contributor

@malinajirka malinajirka left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thank you! ;)

@malinajirka malinajirka merged commit 3865bb7 into develop Jul 24, 2019
@malinajirka malinajirka deleted the amanda/login-lib-redirect-support branch July 24, 2019 05:31
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants