Skip to content

Pull in login changes from woo-android #10321

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.

Sign up for GitHub

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

Merged
merged 9 commits into from
Aug 8, 2019
Merged

Pull in login changes from woo-android #10321

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c3d6f4f
Merge commit '2338a63716f1a136a0f1e22a717955127eadd3b7' into login/fi…
Aug 1, 2019
2338a63
Squashed 'libs/login/' changes from 5a21797a03..69e488759c
Aug 1, 2019
7590fa3
Merge commit 'db8d33300d04ea925c7ebcb5288c4a3a67409f97' into login/fi…
Aug 1, 2019
db8d333
Squashed 'libs/login/' changes from 69e488759c..fc60b518d7
Aug 1, 2019
a1f03d9
Merge commit 'c9bcd2b8094bb4a501a901e82d0f408ff00e5715' into login/fi…
Aug 1, 2019
c9bcd2b
Squashed 'libs/login/' changes from fc60b518d7..250f32d48c
Aug 1, 2019
4bc7e82
Merge branch 'develop' into login/fix-login-tracks
Aug 7, 2019
d4604b8
Squashed 'libs/login/' changes from 250f32d48c..8b6384cb59
Aug 7, 2019
190f26a
Merge commit 'd4604b8f577819b2737f0babc61b0df920be4e2c' into login/fi…
Aug 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 17 additions & 13 deletions ...ordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginSiteAddressFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,13 +412,24 @@ public void onFetchedConnectSiteInfo(OnConnectSiteInfoChecked event) {
// TODO: If we plan to keep this logic we should convert these labels to constants
HashMap<String, String> properties = new HashMap<>();
properties.put("url", event.info.url);
properties.put("urlAfterRedirects", event.info.urlAfterRedirects);
properties.put("url_after_redirects", event.info.urlAfterRedirects);
properties.put("exists", Boolean.toString(event.info.exists));
properties.put("hasJetpack", Boolean.toString(event.info.hasJetpack));
properties.put("isJetpackActive", Boolean.toString(event.info.isJetpackActive));
properties.put("isJetpackConnected", Boolean.toString(event.info.isJetpackConnected));
properties.put("isWordPress", Boolean.toString(event.info.isWordPress));
properties.put("isWPCom", Boolean.toString(event.info.isWPCom));
properties.put("has_jetpack", Boolean.toString(event.info.hasJetpack));
properties.put("is_jetpack_active", Boolean.toString(event.info.isJetpackActive));
properties.put("is_jetpack_connected", Boolean.toString(event.info.isJetpackConnected));
properties.put("is_wordpress", Boolean.toString(event.info.isWordPress));
properties.put("is_wp_com", Boolean.toString(event.info.isWPCom));

// Determining if jetpack is actually installed takes additional logic. This final
// calculated event property will make querying this event more straight-forward:
boolean hasJetpack = false;
if (event.info.isWPCom && event.info.hasJetpack) {
// This is likely an atomic site.
hasJetpack = true;
} else if (event.info.hasJetpack && event.info.isJetpackActive && event.info.isJetpackConnected) {
hasJetpack = true;
}
properties.put("login_calculated_has_jetpack", Boolean.toString(hasJetpack));
mAnalyticsListener.trackConnectedSiteInfoSucceeded(properties);

if (!event.info.exists) {
Expand All @@ -428,13 +439,6 @@ public void onFetchedConnectSiteInfo(OnConnectSiteInfoChecked event) {
// Not a WordPress site
showError(R.string.enter_wordpress_site);
} else {
boolean hasJetpack = false;
if (event.info.isWPCom && event.info.hasJetpack) {
// This is likely an atomic site.
hasJetpack = true;
} else if (event.info.hasJetpack && event.info.isJetpackActive && event.info.isJetpackConnected) {
hasJetpack = true;
}
mLoginListener.gotConnectedSiteInfo(
event.info.url,
event.info.urlAfterRedirects,
Expand Down