Merge pull request #4423 from wordpress-mobile/issue/4422-fix-create-site-analytics

Issue/4422 fix create site analytics

Author: mzorz

WordPress/src/main/java/org/wordpress/android/ui/accounts/NewBlogFragment.java

@@ -18,6 +18,7 @@
 import org.json.JSONObject;
 import org.wordpress.android.R;
 import org.wordpress.android.WordPress;
+import org.wordpress.android.analytics.AnalyticsTracker;
 import org.wordpress.android.models.AccountHelper;
 import org.wordpress.android.ui.accounts.helpers.CreateUserAndBlog;
 import org.wordpress.android.ui.plans.PlansConstants;
@@ -173,7 +174,7 @@ private void validateAndCreateUserAndBlog() {
         final String language = CreateUserAndBlog.getDeviceLanguage(getActivity());
 
         CreateUserAndBlog createUserAndBlog = new CreateUserAndBlog("", "", "", siteUrl, siteName, language,
-                getRestClientUtils(), getActivity(), new ErrorListener(), new CreateUserAndBlog.Callback() {
+                getRestClientUtils(), new ErrorListener(), new CreateUserAndBlog.Callback() {
             @Override
             public void onStepFinished(CreateUserAndBlog.Step step) {
                 if (getActivity() != null) {
@@ -196,6 +197,7 @@ public void onSuccess(JSONObject createSiteResponse) {
                     String username = AccountHelper.getDefaultAccount().getUserName();
                     BlogUtils.addOrUpdateBlog(blogName, xmlRpcUrl, homeUrl, blogId, username, null, null, null,
                             true, true, PlansConstants.DEFAULT_PLAN_ID_FOR_NEW_BLOG, null, null);
+                    AnalyticsTracker.track(AnalyticsTracker.Stat.CREATED_SITE);
                     ToastUtils.showToast(getActivity(), R.string.new_blog_wpcom_created);
                 } catch (JSONException e) {
                     AppLog.e(T.NUX, "Invalid JSON response from site/new", e);

WordPress/src/main/java/org/wordpress/android/ui/accounts/NewUserFragment.java

@@ -260,7 +260,7 @@ private void validateAndCreateUserAndBlog() {
         final String language = CreateUserAndBlog.getDeviceLanguage(getActivity());
 
         CreateUserAndBlog createUserAndBlog = new CreateUserAndBlog(email, mUsername, mPassword,
-                siteUrl, siteName, language, getRestClientUtils(), getActivity(), new ErrorListener(),
+                siteUrl, siteName, language, getRestClientUtils(), new ErrorListener(),
                 new CreateUserAndBlog.Callback() {
                     @Override
                     public void onStepFinished(CreateUserAndBlog.Step step) {

WordPress/src/main/java/org/wordpress/android/ui/accounts/helpers/CreateUserAndBlog.java

@@ -25,22 +25,19 @@
 
 public class CreateUserAndBlog {
     public static final int WORDPRESS_COM_API_BLOG_VISIBILITY_PUBLIC = 1;
-    public static final int WORDPRESS_COM_API_BLOG_VISIBILITY_BLOCK_SEARCH_ENGINE = 0;
-    public static final int WORDPRESS_COM_API_BLOG_VISIBILITY_PRIVATE = -1;
     private String mEmail;
     private String mUsername;
     private String mPassword;
     private String mSiteUrl;
     private String mSiteName;
     private String mLanguage;
-    private Context mContext;
     private Callback mCallback;
     private ErrorListener mErrorListener;
     private RestClientUtils mRestClient;
     private ResponseHandler mResponseHandler;
 
     public CreateUserAndBlog(String email, String username, String password, String siteUrl, String siteName,
-                             String language, RestClientUtils restClient, Context context,
+                             String language, RestClientUtils restClient,
                              ErrorListener errorListener, Callback callback) {
         mEmail = email;
         mUsername = username;
@@ -49,7 +46,6 @@ public CreateUserAndBlog(String email, String username, String password, String
         mSiteName = siteName;
         mLanguage = language;
         mCallback = callback;
-        mContext = context;
         mErrorListener = errorListener;
         mRestClient = restClient;
         mResponseHandler = new ResponseHandler();

libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java

@@ -120,6 +120,7 @@ public enum Stat {
         OPENED_PEOPLE_MANAGEMENT,
         OPENED_PERSON,
         CREATED_ACCOUNT,
+        CREATED_SITE,
         ACCOUNT_LOGOUT,
         SHARED_ITEM,
         ADDED_SELF_HOSTED_SITE,

libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerMixpanel.java

@@ -675,6 +675,10 @@ private AnalyticsTrackerMixpanelInstructionsForStat instructionsForStat(
                 instructions.setCurrentDateForPeopleProperty("$created");
                 instructions.addSuperPropertyToFlag("created_account_on_mobile");
                 break;
+            case CREATED_SITE:
+                instructions = AnalyticsTrackerMixpanelInstructionsForStat.
+                        mixpanelInstructionsForEventName("Created Site");
+                break;
             case SHARED_ITEM:
                 instructions = AnalyticsTrackerMixpanelInstructionsForStat.
                         mixpanelInstructionsWithSuperPropertyAndPeoplePropertyIncrementor("number_of_items_shared");

libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java

@@ -299,6 +299,9 @@ public void track(AnalyticsTracker.Stat stat, Map<String, ?> properties) {
             case CREATED_ACCOUNT:
                 eventName = "account_created";
                 break;
+            case CREATED_SITE:
+                eventName = "site_created";
+                break;
             case SHARED_ITEM:
                 eventName = "item_shared";
                 break;