From f89c576080590dcc0c4c8a381e232b0c18bf7782 Mon Sep 17 00:00:00 2001 From: Oguz Kocer Date: Thu, 26 May 2016 15:28:43 +0300 Subject: [PATCH 1/3] People management event names added --- .../android/analytics/AnalyticsTracker.java | 4 ++++ .../analytics/AnalyticsTrackerMixpanel.java | 16 ++++++++++++++++ .../analytics/AnalyticsTrackerNosara.java | 12 ++++++++++++ 3 files changed, 32 insertions(+) diff --git a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java index 5dadd8a46c4d..156ca45c182d 100644 --- a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java +++ b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java @@ -111,6 +111,8 @@ public enum Stat { OPENED_ACCOUNT_SETTINGS, OPENED_APP_SETTINGS, OPENED_MY_PROFILE, + OPENED_PEOPLE, + OPENED_PERSON, CREATED_ACCOUNT, ACCOUNT_LOGOUT, SHARED_ITEM, @@ -134,6 +136,8 @@ public enum Stat { LOGIN_INSERTED_INVALID_URL, LOGIN_AUTOFILL_CREDENTIALS_FILLED, LOGIN_AUTOFILL_CREDENTIALS_UPDATED, + PERSON_REMOVED, + PERSON_UPDATED, PUSH_AUTHENTICATION_APPROVED, PUSH_AUTHENTICATION_EXPIRED, PUSH_AUTHENTICATION_FAILED, diff --git a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerMixpanel.java b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerMixpanel.java index 53fbb1a5850f..c4446f66ff8a 100644 --- a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerMixpanel.java +++ b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerMixpanel.java @@ -651,6 +651,14 @@ private AnalyticsTrackerMixpanelInstructionsForStat instructionsForStat( instructions = AnalyticsTrackerMixpanelInstructionsForStat. mixpanelInstructionsForEventName("Me - Opened My Profile"); break; + case OPENED_PEOPLE: + instructions = AnalyticsTrackerMixpanelInstructionsForStat. + mixpanelInstructionsForEventName("People Management - Accessed List"); + break; + case OPENED_PERSON: + instructions = AnalyticsTrackerMixpanelInstructionsForStat. + mixpanelInstructionsForEventName("People Management - Accessed Details"); + break; case CREATED_ACCOUNT: instructions = AnalyticsTrackerMixpanelInstructionsForStat. mixpanelInstructionsForEventName("Created Account"); @@ -822,6 +830,14 @@ private AnalyticsTrackerMixpanelInstructionsForStat instructionsForStat( instructions = AnalyticsTrackerMixpanelInstructionsForStat. mixpanelInstructionsForEventName("Login - Auto Fill Credentials Updated"); break; + case PERSON_REMOVED: + instructions = AnalyticsTrackerMixpanelInstructionsForStat. + mixpanelInstructionsForEventName("People Management - Removed Person"); + break; + case PERSON_UPDATED: + instructions = AnalyticsTrackerMixpanelInstructionsForStat. + mixpanelInstructionsForEventName("People Management - Updated Person"); + break; case PUSH_AUTHENTICATION_APPROVED: instructions = AnalyticsTrackerMixpanelInstructionsForStat. mixpanelInstructionsForEventName("Push Authentication - Approved"); 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 704bba1a2b8d..861e6db3d16a 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 @@ -281,6 +281,12 @@ public void track(AnalyticsTracker.Stat stat, Map properties) { case OPENED_MY_PROFILE: eventName = "my_profile_opened"; break; + case OPENED_PEOPLE: + eventName = "people_management_list_opened"; + break; + case OPENED_PERSON: + eventName = "people_management_details_opened"; + break; case CREATED_ACCOUNT: eventName = "account_created"; break; @@ -393,6 +399,12 @@ public void track(AnalyticsTracker.Stat stat, Map properties) { case LOGIN_AUTOFILL_CREDENTIALS_UPDATED: eventName = "login_autofill_credentials_updated"; break; + case PERSON_REMOVED: + eventName = "people_management_person_removed"; + break; + case PERSON_UPDATED: + eventName = "people_management_person_updated"; + break; case PUSH_AUTHENTICATION_APPROVED: eventName = "push_authentication_approved"; break; From 07b3957ff7b192b984e8e4fc0804b3fef658567c Mon Sep 17 00:00:00 2001 From: Oguz Kocer Date: Thu, 26 May 2016 15:34:52 +0300 Subject: [PATCH 2/3] People management events tracked --- .../main/java/org/wordpress/android/ui/ActivityLauncher.java | 2 +- .../android/ui/people/PeopleManagementActivity.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java b/WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java index f866f0c8bce8..f058c6fc7952 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java @@ -120,7 +120,7 @@ public static void viewCurrentBlogThemes(Context context) { public static void viewCurrentBlogPeople(Context context) { Intent intent = new Intent(context, PeopleManagementActivity.class); slideInFromRight(context, intent); - // TODO: add -> AnalyticsTracker.track(AnalyticsTracker.Stat.OPENED_PEOPLE_MANAGEMENT); + AnalyticsUtils.trackWithCurrentBlogDetails(AnalyticsTracker.Stat.OPENED_PEOPLE); } public static void viewBlogSettingsForResult(Activity activity, Blog blog) { diff --git a/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleManagementActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleManagementActivity.java index e6f114d36824..648c99db0f4a 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleManagementActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleManagementActivity.java @@ -12,11 +12,13 @@ import org.wordpress.android.R; import org.wordpress.android.WordPress; +import org.wordpress.android.analytics.AnalyticsTracker; import org.wordpress.android.datasets.PeopleTable; import org.wordpress.android.models.Blog; import org.wordpress.android.models.Person; import org.wordpress.android.ui.ActivityLauncher; import org.wordpress.android.ui.people.utils.PeopleUtils; +import org.wordpress.android.util.AnalyticsUtils; import org.wordpress.android.util.ToastUtils; import java.util.List; @@ -116,6 +118,7 @@ public void onPersonSelected(Person person) { personDetailFragment.setPersonDetails(personID, localTableBlogID); } if (!personDetailFragment.isAdded()) { + AnalyticsUtils.trackWithCurrentBlogDetails(AnalyticsTracker.Stat.OPENED_PERSON); FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction(); fragmentTransaction.add(R.id.fragment_container, personDetailFragment, KEY_PERSON_DETAIL_FRAGMENT); fragmentTransaction.addToBackStack(null); @@ -143,6 +146,7 @@ public void onRoleChanged(long personID, int localTableBlogId, String newRole) { new PeopleUtils.UpdateUserCallback() { @Override public void onSuccess(Person person) { + AnalyticsUtils.trackWithCurrentBlogDetails(AnalyticsTracker.Stat.PERSON_UPDATED); PeopleTable.save(person); refreshOnScreenFragmentDetails(); } @@ -190,6 +194,7 @@ private void removeSelectedPerson() { new PeopleUtils.RemoveUserCallback() { @Override public void onSuccess(long personID, int localTableBlogId) { + AnalyticsUtils.trackWithCurrentBlogDetails(AnalyticsTracker.Stat.PERSON_REMOVED); // remove the person from db, navigate back to list fragment and refresh it Person person = PeopleTable.getPerson(personID, localTableBlogId); String text; From 68381f0a6390444265d37d980aa3d68a924fb674 Mon Sep 17 00:00:00 2001 From: Oguz Kocer Date: Thu, 26 May 2016 18:04:06 +0300 Subject: [PATCH 3/3] Renamed OPENED_PERSON as OPENED_PEOPLE_MANAGEMENT --- .../main/java/org/wordpress/android/ui/ActivityLauncher.java | 2 +- .../java/org/wordpress/android/analytics/AnalyticsTracker.java | 2 +- .../wordpress/android/analytics/AnalyticsTrackerMixpanel.java | 2 +- .../org/wordpress/android/analytics/AnalyticsTrackerNosara.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java b/WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java index f058c6fc7952..eb37d25700bb 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java @@ -120,7 +120,7 @@ public static void viewCurrentBlogThemes(Context context) { public static void viewCurrentBlogPeople(Context context) { Intent intent = new Intent(context, PeopleManagementActivity.class); slideInFromRight(context, intent); - AnalyticsUtils.trackWithCurrentBlogDetails(AnalyticsTracker.Stat.OPENED_PEOPLE); + AnalyticsUtils.trackWithCurrentBlogDetails(AnalyticsTracker.Stat.OPENED_PEOPLE_MANAGEMENT); } public static void viewBlogSettingsForResult(Activity activity, Blog blog) { diff --git a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java index 156ca45c182d..15cd7624ab3c 100644 --- a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java +++ b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java @@ -111,7 +111,7 @@ public enum Stat { OPENED_ACCOUNT_SETTINGS, OPENED_APP_SETTINGS, OPENED_MY_PROFILE, - OPENED_PEOPLE, + OPENED_PEOPLE_MANAGEMENT, OPENED_PERSON, CREATED_ACCOUNT, ACCOUNT_LOGOUT, diff --git a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerMixpanel.java b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerMixpanel.java index c4446f66ff8a..bb5acf4b10e5 100644 --- a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerMixpanel.java +++ b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerMixpanel.java @@ -651,7 +651,7 @@ private AnalyticsTrackerMixpanelInstructionsForStat instructionsForStat( instructions = AnalyticsTrackerMixpanelInstructionsForStat. mixpanelInstructionsForEventName("Me - Opened My Profile"); break; - case OPENED_PEOPLE: + case OPENED_PEOPLE_MANAGEMENT: instructions = AnalyticsTrackerMixpanelInstructionsForStat. mixpanelInstructionsForEventName("People Management - Accessed List"); break; 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 861e6db3d16a..ce2416a04b41 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 @@ -281,7 +281,7 @@ public void track(AnalyticsTracker.Stat stat, Map properties) { case OPENED_MY_PROFILE: eventName = "my_profile_opened"; break; - case OPENED_PEOPLE: + case OPENED_PEOPLE_MANAGEMENT: eventName = "people_management_list_opened"; break; case OPENED_PERSON: