Merge changes from develop and fix conflicts

Author: Amanda Riu

WordPress/src/main/java/org/wordpress/android/datasets/ReaderPostTable.java

@@ -300,7 +300,7 @@ public static int getNumPostsInBlog(long blogId) {
             return 0;
         }
         return SqlUtils.intForQuery(ReaderDatabase.getReadableDb(),
-                "SELECT count(*) FROM tbl_posts WHERE blog_id=? AND tag_name=''",
+                "SELECT count(*) FROM tbl_posts WHERE blog_id=? AND tag_name='' AND tag_type=0",
                 new String[]{Long.toString(blogId)});
     }
 
@@ -309,7 +309,7 @@ public static int getNumPostsInFeed(long feedId) {
             return 0;
         }
         return SqlUtils.intForQuery(ReaderDatabase.getReadableDb(),
-                "SELECT count(*) FROM tbl_posts WHERE feed_id=? AND tag_name=''",
+                "SELECT count(*) FROM tbl_posts WHERE feed_id=? AND tag_name='' AND tag_type=0",
                 new String[]{Long.toString(feedId)});
     }
 
@@ -668,14 +668,14 @@ public static String getOldestDateWithTag(final ReaderTag tag) {
      */
     public static String getOldestPubDateInBlog(long blogId) {
         String sql = "SELECT date_published FROM tbl_posts"
-                     + " WHERE blog_id=? AND tag_name=''"
+                     + " WHERE blog_id=? AND tag_name='' AND tag_type=0"
                      + " ORDER BY date_published LIMIT 1";
         return SqlUtils.stringForQuery(ReaderDatabase.getReadableDb(), sql, new String[]{Long.toString(blogId)});
     }
 
     public static String getOldestPubDateInFeed(long feedId) {
         String sql = "SELECT date_published FROM tbl_posts"
-                     + " WHERE feed_id=? AND tag_name=''"
+                     + " WHERE feed_id=? AND tag_name='' AND tag_type=0"
                      + " ORDER BY date_published LIMIT 1";
         return SqlUtils.stringForQuery(ReaderDatabase.getReadableDb(), sql, new String[]{Long.toString(feedId)});
     }
@@ -988,7 +988,8 @@ public static ReaderPostList getPostsWithTag(ReaderTag tag, int maxPosts, boolea
     public static ReaderPostList getPostsInBlog(long blogId, int maxPosts, boolean excludeTextColumn) {
         String columns = (excludeTextColumn ? COLUMN_NAMES_NO_TEXT : "*");
         String sql =
-                "SELECT " + columns + " FROM tbl_posts WHERE blog_id=? AND tag_name='' ORDER BY date_published DESC";
+                "SELECT " + columns + " FROM tbl_posts WHERE blog_id=? AND tag_name='' AND tag_type=0"
+                + " ORDER BY date_published DESC";
 
         if (maxPosts > 0) {
             sql += " LIMIT " + maxPosts;
@@ -1015,7 +1016,8 @@ public static Map<Pair<String, ReaderTagType>, ReaderPostList> getTagPostMap(lon
     public static ReaderPostList getPostsInFeed(long feedId, int maxPosts, boolean excludeTextColumn) {
         String columns = (excludeTextColumn ? COLUMN_NAMES_NO_TEXT : "*");
         String sql =
-                "SELECT " + columns + " FROM tbl_posts WHERE feed_id=? AND tag_name='' ORDER BY date_published DESC";
+                "SELECT " + columns + " FROM tbl_posts WHERE feed_id=? AND tag_name='' AND tag_type=0"
+                + " ORDER BY date_published DESC";
 
         if (maxPosts > 0) {
             sql += " LIMIT " + maxPosts;
@@ -1091,7 +1093,8 @@ private static ReaderBlogIdPostIdList getBlogIdPostIds(@NonNull String sql, @Non
      * same as getPostsInBlog() but only returns the blogId/postId pairs
      */
     public static ReaderBlogIdPostIdList getBlogIdPostIdsInBlog(long blogId, int maxPosts) {
-        String sql = "SELECT post_id FROM tbl_posts WHERE blog_id=? AND tag_name='' ORDER BY date_published DESC";
+        String sql = "SELECT post_id FROM tbl_posts WHERE blog_id=? AND tag_name='' AND tag_type=0"
+                     + " ORDER BY date_published DESC";
 
         if (maxPosts > 0) {
             sql += " LIMIT " + maxPosts;

WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java

@@ -968,7 +968,7 @@ protected void onPause() {
     protected void onDestroy() {
         if (!mIsConfigChange && (mRestartEditorOption == RestartEditorOptions.NO_RESTART)) {
             if (mPostEditorAnalyticsSession != null) {
-                mPostEditorAnalyticsSession.end();
+                mPostEditorAnalyticsSession.end(canViewEditorOnboarding());
             }
         }
 
@@ -2320,7 +2320,7 @@ private GutenbergPropsBuilder getGutenbergPropsBuilder() {
                 postType,
                 featuredImageId,
                 themeBundle,
-                canViewEditorOnboarding
+                enableEditorOnboarding
         );
     }
 
@@ -3303,7 +3303,7 @@ private void onEditorFinalTouchesBeforeShowing() {
                 ((GutenbergEditorFragment) mEditorFragment).resetUploadingMediaToFailed(mediaIds);
             }
         } else if (mShowAztecEditor && mEditorFragment instanceof AztecEditorFragment) {
-            mPostEditorAnalyticsSession.start(null);
+            mPostEditorAnalyticsSession.start(null, canViewEditorOnboarding());
         }
     }
 
@@ -3316,7 +3316,7 @@ public void onEditorFragmentContentReady(
         // It assumes this is being called when the editor has finished loading
         // If you need to refactor this, please ensure that the startup_time_ms property
         // is still reflecting the actual startup time of the editor
-        mPostEditorAnalyticsSession.start(unsupportedBlocksList);
+        mPostEditorAnalyticsSession.start(unsupportedBlocksList, canViewEditorOnboarding());
         presentNewPageNoticeIfNeeded();
 
         // don't start listening for Story events just now if we're waiting for a block to be replaced,

WordPress/src/main/java/org/wordpress/android/ui/posts/PostEditorAnalyticsSession.java

@@ -23,6 +23,7 @@ public class PostEditorAnalyticsSession implements Serializable {
     private static final String KEY_EDITOR = "editor";
     private static final String KEY_HAS_UNSUPPORTED_BLOCKS = "has_unsupported_blocks";
     private static final String KEY_UNSUPPORTED_BLOCKS = "unsupported_blocks";
+    private static final String KEY_CAN_VIEW_EDITOR_ONBOARDING = "can_view_editor_onboarding";
     private static final String KEY_POST_TYPE = "post_type";
     private static final String KEY_OUTCOME = "outcome";
     private static final String KEY_SESSION_ID = "session_id";
@@ -94,12 +95,15 @@ public static PostEditorAnalyticsSession getNewPostEditorAnalyticsSession(
         return new PostEditorAnalyticsSession(editor, post, site, isNewPost);
     }
 
-    public void start(ArrayList<Object> unsupportedBlocksList) {
+    public void start(ArrayList<Object> unsupportedBlocksList, Boolean canViewEditorOnboarding) {
         if (!mStarted) {
             mHasUnsupportedBlocks = unsupportedBlocksList != null && unsupportedBlocksList.size() > 0;
             Map<String, Object> properties = getCommonProperties();
             properties.put(KEY_UNSUPPORTED_BLOCKS,
                     unsupportedBlocksList != null ? unsupportedBlocksList : new ArrayList<>());
+            if (canViewEditorOnboarding != null) {
+                properties.put(KEY_CAN_VIEW_EDITOR_ONBOARDING, canViewEditorOnboarding);
+            }
             // Note that start time only counts when the analytics session was created and not when the editor
             // activity started. We are mostly interested in measuring the loading times for the block editor,
             // where the main bottleneck seems to be initializing React Native and doing the initial load of Gutenberg.
@@ -138,7 +142,7 @@ public void applyTemplate(String template) {
         AnalyticsTracker.track(Stat.EDITOR_SESSION_TEMPLATE_APPLY, properties);
     }
 
-    public void end() {
+    public void end(Boolean canViewEditorOnboarding) {
         // don't try to send an "end" event if the session wasn't started in the first place
         if (mStarted) {
             if (mOutcome == null) {
@@ -148,6 +152,9 @@ public void end() {
             }
             Map<String, Object> properties = getCommonProperties();
             properties.put(KEY_OUTCOME, mOutcome.toString().toLowerCase(Locale.ROOT));
+            if (canViewEditorOnboarding != null) {
+                properties.put(KEY_CAN_VIEW_EDITOR_ONBOARDING, canViewEditorOnboarding);
+            }
             AnalyticsTracker.track(Stat.EDITOR_SESSION_END, properties);
         } else {
             AppLog.e(T.EDITOR, "A non-started editor session cannot be attempted to be ended");

WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationBaseFormFragment.java

@@ -0,0 +1,61 @@
+package org.wordpress.android.ui.sitecreation
+
+import android.os.Bundle
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import android.view.View
+import androidx.annotation.LayoutRes
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
+import org.wordpress.android.R
+import org.wordpress.android.databinding.SiteCreationFormScreenBinding
+
+abstract class SiteCreationBaseFormFragment : Fragment(R.layout.site_creation_form_screen) {
+    @LayoutRes protected abstract fun getContentLayout(): Int
+    protected abstract val screenTitle: String
+    protected abstract fun setupContent()
+    protected abstract fun onHelp()
+    protected abstract fun setBindingViewStubListener(parentBinding: SiteCreationFormScreenBinding)
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setHasOptionsMenu(true)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        with(SiteCreationFormScreenBinding.bind(view)) {
+            siteCreationFormContentStub.layoutResource = getContentLayout()
+            setBindingViewStubListener(this)
+            siteCreationFormContentStub.inflate()
+
+            setupContent()
+
+            (requireActivity() as AppCompatActivity).setSupportActionBar(toolbarMain)
+            val actionBar = (activity as AppCompatActivity?)!!.supportActionBar
+            if (actionBar != null) {
+                actionBar.setDisplayHomeAsUpEnabled(true)
+                actionBar.title = screenTitle
+                // important for accessibility
+                requireActivity().title = screenTitle
+            }
+        }
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+        inflater.inflate(R.menu.menu_site_creation, menu)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        if (item.itemId == R.id.help) {
+            onHelp()
+            return true
+        }
+        return false
+    }
+
+    companion object {
+        const val EXTRA_SCREEN_TITLE = "extra_screen_title"
+    }
+}