Pull in login changes from woo-android #10321
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
69e488759c Fix tracks connected info property naming REVERT: 5a21797a03 Merge pull request #23 from wordpress-mobile/merge/woocommerce-android/1224-amanda-new REVERT: 3b1db07c38 Merge commit '615ebab45e1bc3d0cdd3a9da060026fef704d3a8' into amanda/test_git_subtree REVERT: 43ac7e9468 Merge pull request #22 from wordpress-mobile/merge-wca REVERT: d4d717cf16 Send redirectUrl to listener and strip protocol before saving REVERT: 979ddf4aec Merge commit '827a47189094a6bc7800eaccc3ed069841251373' into sync-login-lib REVERT: df3c11ed09 added textAlignment property to secondary button in login REVERT: da783ea3c7 Login screens: added textAlignment property to labels REVERT: 6d486bbf6b Merge pull request #21 from wordpress-mobile/merge-wpa-develop REVERT: 57a2d00b14 Update login lib standalone FluxC hash REVERT: 0ea2405def Merge commit 'ad485b27b26ffb38b8718940b0b7556b902dc28c' into sync-login-lib REVERT: 6df15ab86b Update 2FA unavailable API error message REVERT: eefd72f317 Show error and continue login on OAuth client 2FA error REVERT: 578dca7f29 Update androidx dependencies REVERT: 1d09d1536d Fix AndroidX import order REVERT: 48df84638f Fix import ordering for androidx REVERT: d3dc35035a Migrate to AndroidX REVERT: 78c5307f7a Merge pull request #16 from wordpress-mobile/fix_crash_in_login_email_fragment REVERT: 4d6c83f111 Merge pull request #9890 from wordpress-mobile/update-dagger-version-to-v2.22.1 REVERT: edd8684ec4 Merge pull request #18 from wordpress-mobile/new-wpandroid-changes REVERT: 9cbf3f17ff Merge pull request #9885 from wordpress-mobile/update-login-library REVERT: 71729e5e76 Merge pull request #17 from wordpress-mobile/issue/glide-4.9 REVERT: 0ddf4dcdbd Update Glide version to 4.9.0 REVERT: f7860b9861 Updated Dagger in the login library REVERT: aabdedf672 Merge commit '099b5a011d32283eb6c79b0e599b5272a597e849' into update-login-library REVERT: 1eb7f4f156 Updated Glide to 4.9.0 REVERT: a32cc8c09d Add crash fix to SignupEmailFragment REVERT: 08109fa90f Adds non-null check to onActivityResult REVERT: 664b67f62d Fix #9826: make sure we Play Services are available before running the email hint picker REVERT: 94a0ae2a39 Merge pull request #9743 from wordpress-mobile/feature/manage_insights_readonly REVERT: 7cad17e264 Fix a few ContentDescription lint errors REVERT: 9f171b55d0 Merge branch 'feature/manage_insights_readonly' into issue/9464-manage-insights REVERT: 663a168903 Add the missing drawable resources git-subtree-dir: libs/login git-subtree-split: 69e488759c04a9ffae4f39183d3a526501f1ed8b
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
250f32d48c Revert unintentional changes to Project.xml 6fb95d5295 Revert unintentional changes to project.xml git-subtree-dir: libs/login git-subtree-split: 250f32d48c90ea7374e14de7ca22c8f82ebfcf6e
Generated by 🚫 dangerJS |
8b6384cb59 Merge pull request #26 from wordpress-mobile/merge/woocommerce-android/1287 git-subtree-dir: libs/login git-subtree-split: 8b6384cb59d36e18204c73eb476266902f172a53
|
Refreshed this branch with the |
anitaa1990
added a commit
that referenced
this pull request
Nov 13, 2019
4b8e83512d Added logic to redirect to discovery error if xmlrpc is blocked on site 2c3223bbe7 Reverted logic to check for Jetpack availability during discovery errors since it can return a false negative 846dc2ba99 Handle site not found discovery error which can occur even with Jetpack available e1028df7f4 Modified logic to check for discovery errors first before checking for Jetpack 16c1bbe249 Modified error message for xmlrpc errors 732a0486e7 Modified logic to initiate discovery from LoginBaseDiscoveryFragment fdfb9df9b7 Added logic to redirect to discovery error screen, even if Jetpack is available 0833d5ca77 Add flag to check if Jetpack is available if a discovery error takes place aa7f8cc9d9 Added logic to port over changes from the LoginSiteAddressFragment to utilise LoginBaseDiscoveryFragment e1f2ff2d37 Modified discovery error listener to handle the various error scenarios from the calling fragment a1bc462454 Added option to verify email only if login is for self hosted credentials c2f2bba7a8 Added new string labels for magic link sent label b4b9dbcabb Merge branch 'feature/sign-in-with-self-hosted-credentials' into issue/1482-step2-magic-link-signin-changes 32d2c25fd9 Handle corner case in discovery process and redirect to email screen if site is wp.com d96252d875 Fixed nitpicks in code/xml 9b227c817b Design changes for request magic link screen a8712882c1 Hide keyboard before redirecting to the magic link/no jetpack screen e4e8210da2 Added logic to initiate discovery process for xmlrpc endpoint 2c35450824 Added logic to pass the input site address to forgot password flow, if the xmlrpc url is empty f9ff33ec87 Added separate method to redirect to username screen in LoginListener f71a4065b0 Revert discovery initiation changes to the site fragment 1e3e9cf367 Added logic to fetch SiteModel based on the site url 71ec9bdaec Added logic to redirect to no Jetpack screen when site credentials are entered ad42794306 Revert adding a new method to LoginListener, instead use an existing listener method 8f3649b4b5 Added logic to fetch jetpack user email from site credentials and redirect to magic link screen aa0d39d792 Pass site xmlrpc url to email and jetpack required screen 360480c6ff Initiate discovery process even if jetpack is not installed/active/connected 39b0ee010f Added logic to redirect Woo users to email login or jetpack required screen efd18a8cef Revert the connection info endpoint implementation and update error message when site is not found 96e0ff714f Added label to the top of the LoginUsernamePasswordFragment for Woo login only 082d1e1304 Display login with site credentials link button in login email fragment 27b07bf3e1 Merge commit 'f89f408ee83d29d59dfe5740b2ba26c51dcd00df' into issue/1446-login-lib-merge 2406304ffa Merge pull request #27 from wordpress-mobile/google_login_fix 18ddefd54b Merge pull request #10523 from wordpress-mobile/feature/move_api_client_builder_to_start_stop a87f1ec203 Update Jitpack dependency urls to use the www subdomain 24bb535488 Implement PR comments b63bb72af9 Remove api client cleanup from onDetach bd3410e2ad Move GoogleApiClient.Builder to onStart/Stop methods d70141070b Add commit message for jetpack validation fix 80b21579cf Use only the isJetpackConnected property for jetpack validation c3f9b19157 Merge pull request #10321 from wordpress-mobile/login/fix-login-tracks 0b734cf390 Merge pull request #10270 from wordpress-mobile/issue/9720-login-subtree-update-squashed eb90f72905 Merge pull request #1312 from woocommerce/merge-login-lib bd6086802b Merge commit 'aec4a8317d3188866c02556c182cd8d09d9b0272' into merge-login-lib 378a45be3e Fix leak of anonymous OnCancelListener reference 71cfd27b21 Merge branch 'develop' into amanda/leak_canary 42cf2d56ec Merge pull request #1292 from woocommerce/release/2.3 67de44ca60 Merge branch 'release/2.3' into merge-release/2.2.1-release/2.3 227c48b323 Merge pull request #1277 from woocommerce/merge/WordPress-Login-Flow-Android/24 0123a10b6b Reverted changes to login build.gradle ff16da7e70 Reverted back to SDK 28 (we can update to 29 once Android Q is out of beta) d433fad0df Merge commit '9bb4617dddea713295ce4b53a60aa2a271f318a2' squashed b0b4f17f8a Merge commit 'f6c4fbfadce780aaebc745154c29affe46978545' into issue/9720-login-subtree-update-squashed 66695843b0 Upgraded login library to SDK 29 ff4a69e142 Add leak canary and fix leaks git-subtree-dir: libs/login git-subtree-split: 4b8e83512da7628a11c4b075cf79ac6e3b9864ec
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 pulls in the changes made to the login library to fix a minor issue with the property naming for the
_login_connected_site_infotracks event for the woocommerce-android app. This event is not used by WPAndroid. TheWordPress-Login-Flow-AndroidPR for these changes is here.Only 1 developer needs to approve this PR