From 29b6fe9ae45256f0ec80bfcb4183473601c21b54 Mon Sep 17 00:00:00 2001
From: Danilo Ercoli <ercoli@gmail.com>
Date: Mon, 24 Jun 2019 17:04:17 +0200
Subject: [PATCH 1/2] Make sure editor session starts (with `content_type=new`)
 event matches `post_created` event by re-using the same logic to track a post
 as new

---
 .../org/wordpress/android/ui/posts/EditPostActivity.java    | 6 +++---
 .../android/ui/posts/PostEditorAnalyticsSession.java        | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java
index fa5fc35336be..f35c497608ab 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java
@@ -394,11 +394,11 @@ private void newPostSetup() {
         mShortcutUtils.reportShortcutUsed(Shortcut.CREATE_NEW_POST);
     }
 
-    private void createPostEditorAnalyticsSessionTracker(boolean showGutenbergEditor, PostModel post, SiteModel site) {
+    private void createPostEditorAnalyticsSessionTracker(boolean showGutenbergEditor, PostModel post, SiteModel site, boolean isNewPost) {
         if (mPostEditorAnalyticsSession == null) {
             mPostEditorAnalyticsSession = new PostEditorAnalyticsSession(
                     showGutenbergEditor ? Editor.GUTENBERG : Editor.CLASSIC,
-                    post, site);
+                    post, site, isNewPost);
         }
     }
 
@@ -531,7 +531,7 @@ protected void onCreate(Bundle savedInstanceState) {
         }
 
         // ok now we are sure to have both a valid Post and showGutenberg flag, let's start the editing session tracker
-        createPostEditorAnalyticsSessionTracker(mShowGutenbergEditor, mPost, mSite);
+        createPostEditorAnalyticsSessionTracker(mShowGutenbergEditor, mPost, mSite, mIsNewPost);
 
         // Bump post created analytics only once, first time the editor is opened
         if (mIsNewPost && savedInstanceState == null) {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostEditorAnalyticsSession.java b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostEditorAnalyticsSession.java
index 4954d55fffb7..9c5fd15b2ffe 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostEditorAnalyticsSession.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostEditorAnalyticsSession.java
@@ -47,7 +47,7 @@ enum Outcome {
         PUBLISH
     }
 
-    PostEditorAnalyticsSession(Editor editor, PostModel post, SiteModel site) {
+    PostEditorAnalyticsSession(Editor editor, PostModel post, SiteModel site, boolean isNewPost) {
         // fill in which the current Editor is
         mCurrentEditor = editor;
 
@@ -69,7 +69,7 @@ enum Outcome {
 
         // fill in mContentType
         String postContent = post.getContent();
-        if (TextUtils.isEmpty(post.getContent())) {
+        if (isNewPost) {
             mContentType = "new";
         } else if (PostUtils.contentContainsGutenbergBlocks(postContent)) {
             mContentType = "gutenberg";

From c92bfaded27d49bb4dc5fce269c3120e974e8bd3 Mon Sep 17 00:00:00 2001
From: Danilo Ercoli <ercoli@gmail.com>
Date: Mon, 24 Jun 2019 17:36:59 +0200
Subject: [PATCH 2/2] Fix lint

---
 .../java/org/wordpress/android/ui/posts/EditPostActivity.java  | 3 ++-
 .../wordpress/android/ui/posts/PostEditorAnalyticsSession.java | 2 --
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java
index f35c497608ab..6c9abe50ee8c 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java
@@ -394,7 +394,8 @@ private void newPostSetup() {
         mShortcutUtils.reportShortcutUsed(Shortcut.CREATE_NEW_POST);
     }
 
-    private void createPostEditorAnalyticsSessionTracker(boolean showGutenbergEditor, PostModel post, SiteModel site, boolean isNewPost) {
+    private void createPostEditorAnalyticsSessionTracker(boolean showGutenbergEditor, PostModel post, SiteModel site,
+                                                         boolean isNewPost) {
         if (mPostEditorAnalyticsSession == null) {
             mPostEditorAnalyticsSession = new PostEditorAnalyticsSession(
                     showGutenbergEditor ? Editor.GUTENBERG : Editor.CLASSIC,
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostEditorAnalyticsSession.java b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostEditorAnalyticsSession.java
index 9c5fd15b2ffe..c43bde54d655 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostEditorAnalyticsSession.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostEditorAnalyticsSession.java
@@ -1,7 +1,5 @@
 package org.wordpress.android.ui.posts;
 
-import android.text.TextUtils;
-
 import org.wordpress.android.analytics.AnalyticsTracker;
 import org.wordpress.android.analytics.AnalyticsTracker.Stat;
 import org.wordpress.android.fluxc.model.PostModel;