From 433523317f680cd909a4a76c9b001fc1da0ab8a2 Mon Sep 17 00:00:00 2001 From: Danilo Ercoli Date: Thu, 10 Dec 2015 16:57:30 +0100 Subject: [PATCH 1/3] Track all blogs, including hidden ones. --- .../main/java/org/wordpress/android/util/AnalyticsUtils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/util/AnalyticsUtils.java b/WordPress/src/main/java/org/wordpress/android/util/AnalyticsUtils.java index 8c45752b5fdf..16a710bd86ff 100644 --- a/WordPress/src/main/java/org/wordpress/android/util/AnalyticsUtils.java +++ b/WordPress/src/main/java/org/wordpress/android/util/AnalyticsUtils.java @@ -34,7 +34,7 @@ public static void refreshMetadata(String username, String email) { boolean isUserConnected = AccountHelper.isSignedIn(); boolean isWordPressComUser = AccountHelper.isSignedInWordPressDotCom(); boolean isJetpackUser = AccountHelper.isJetPackUser(); - int numBlogs = WordPress.wpDB.getVisibleBlogs().size(); + int numBlogs = WordPress.wpDB.getNumBlogs(); int versionCode = PackageUtils.getVersionCode(WordPress.getContext()); AnalyticsTracker.refreshMetadata(isUserConnected, isWordPressComUser, isJetpackUser, sessionCount, numBlogs, versionCode, username, email); @@ -49,7 +49,7 @@ public static void refreshMetadata() { boolean isUserConnected = AccountHelper.isSignedIn(); boolean isWordPressComUser = AccountHelper.isSignedInWordPressDotCom(); boolean isJetpackUser = AccountHelper.isJetPackUser(); - int numBlogs = WordPress.wpDB.getVisibleBlogs().size(); + int numBlogs = WordPress.wpDB.getNumBlogs(); int versionCode = PackageUtils.getVersionCode(WordPress.getContext()); String username = AccountHelper.getDefaultAccount().getUserName(); String email = AccountHelper.getDefaultAccount().getEmail(); From bcc796d73d20f28d9c294d291387419d6c9270f1 Mon Sep 17 00:00:00 2001 From: Danilo Ercoli Date: Thu, 10 Dec 2015 16:58:06 +0100 Subject: [PATCH 2/3] Track "signin" AFTER refresh metadata, to ensure user properties are update. --- .../java/org/wordpress/android/ui/accounts/SignInFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/SignInFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/accounts/SignInFragment.java index a52d8d3802cf..0a32c4b95e5f 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/accounts/SignInFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/SignInFragment.java @@ -391,10 +391,10 @@ private void setPrimaryBlog(JSONObject jsonObject) { } private void trackAnalyticsSignIn() { + AnalyticsUtils.refreshMetadata(); Map properties = new HashMap(); properties.put("dotcom_user", isWPComLogin()); AnalyticsTracker.track(AnalyticsTracker.Stat.SIGNED_IN, properties); - AnalyticsUtils.refreshMetadata(); if (!isWPComLogin()) { AnalyticsTracker.track(AnalyticsTracker.Stat.ADDED_SELF_HOSTED_SITE); } From 1adc4f338d8bb907baea1ee56090b0628c6fff73 Mon Sep 17 00:00:00 2001 From: Danilo Ercoli Date: Thu, 10 Dec 2015 16:59:15 +0100 Subject: [PATCH 3/3] Update user properties before tracking the event. --- .../analytics/AnalyticsTrackerNosara.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java index 41f0a82f6a6d..d0cbecb80458 100644 --- a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java +++ b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java @@ -463,6 +463,15 @@ public void refreshMetadata(boolean isUserConnected, boolean isWordPressComUser, return; } + try { + JSONObject properties = new JSONObject(); + properties.put(JETPACK_USER, isJetpackUser); + properties.put(NUMBER_OF_BLOGS, numBlogs); + mNosaraClient.registerUserProperties(properties); + } catch (JSONException e) { + AppLog.e(AppLog.T.UTILS, e); + } + if (isUserConnected && isWordPressComUser) { setWordPressComUserName(username); // Re-unify the user @@ -478,14 +487,7 @@ public void refreshMetadata(boolean isUserConnected, boolean isWordPressComUser, } } - try { - JSONObject properties = new JSONObject(); - properties.put(JETPACK_USER, isJetpackUser); - properties.put(NUMBER_OF_BLOGS, numBlogs); - mNosaraClient.registerUserProperties(properties); - } catch (JSONException e) { - AppLog.e(AppLog.T.UTILS, e); - } + }