Feature/reader search results

WordPress/src/main/AndroidManifest.xml

@@ -389,6 +389,10 @@
             android:name=".ui.reader.services.ReaderPostService"
             android:exported="false"
             android:label="Reader Post Service" />
+        <service
+            android:name=".ui.reader.services.ReaderSearchService"
+            android:exported="false"
+            android:label="Reader Search Service" />
         <service
             android:name=".ui.reader.services.ReaderCommentService"
             android:exported="false"

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

@@ -19,7 +19,7 @@
  */
 public class ReaderDatabase extends SQLiteOpenHelper {
     protected static final String DB_NAME = "wpreader.db";
-    private static final int DB_VERSION = 116;
+    private static final int DB_VERSION = 118;
 
     /*
      * version history
@@ -68,6 +68,8 @@ public class ReaderDatabase extends SQLiteOpenHelper {
      *  114 - renamed tag_name to tag_slug in tag tables
      *  115 - added ReaderSearchTable
      *  116 - added tag_display_name to tag tables
+     *  117 - changed tbl_posts.timestamp from INTEGER to REAL
+     *  118 - renamed tbl_search_history to tbl_search_suggestions
      */
 
     /*

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

@@ -122,7 +122,7 @@ protected static void createTables(SQLiteDatabase db) {
                 + " featured_image      TEXT,"
                 + " featured_video      TEXT,"
                 + " post_avatar         TEXT,"
-                + " timestamp           INTEGER DEFAULT 0,"
+                + " timestamp           REAL DEFAULT 0,"
                 + " published           TEXT,"
                 + " num_replies         INTEGER DEFAULT 0,"
                 + " num_likes           INTEGER DEFAULT 0,"
@@ -180,6 +180,9 @@ protected static int purge(SQLiteDatabase db) {
             numDeleted += purgePostsForTag(db, tag);
         }
 
+        // delete search results
+        numDeleted += purgeSearchResults(db);
+
         // delete posts in tbl_posts that no longer exist in tbl_post_tags
         numDeleted += db.delete("tbl_posts", "pseudo_id NOT IN (SELECT DISTINCT pseudo_id FROM tbl_post_tags)", null);
 
@@ -211,6 +214,14 @@ private static int purgePostsForTag(SQLiteDatabase db, ReaderTag tag) {
         return numDeleted;
     }
 
+    /*
+     * purge all posts that were retained from previous searches
+     */
+    private static int purgeSearchResults(SQLiteDatabase db) {
+        String[] args = {Integer.toString(ReaderTagType.SEARCH.toInt())};
+        return db.delete("tbl_post_tags", "tag_type=?", args);
+    }
+
     public static int getNumPostsInBlog(long blogId) {
         if (blogId == 0) {
             return 0;
@@ -624,7 +635,7 @@ public static void addOrUpdatePosts(final ReaderTag tag, ReaderPostList posts) {
                 stmtPosts.bindString(16, post.getFeaturedImage());
                 stmtPosts.bindString(17, post.getFeaturedVideo());
                 stmtPosts.bindString(18, post.getPostAvatar());
-                stmtPosts.bindLong  (19, post.timestamp);
+                stmtPosts.bindDouble(19, post.timestamp);
                 stmtPosts.bindString(20, post.getPublished());
                 stmtPosts.bindLong  (21, post.numReplies);
                 stmtPosts.bindLong  (22, post.numLikes);
@@ -839,7 +850,7 @@ private static ReaderPost getPostFromCursor(Cursor c) {
         post.setShortUrl(c.getString(c.getColumnIndex("short_url")));
         post.setPostAvatar(c.getString(c.getColumnIndex("post_avatar")));
 
-        post.timestamp = c.getLong(c.getColumnIndex("timestamp"));
+        post.timestamp = c.getDouble(c.getColumnIndex("timestamp"));
         post.setPublished(c.getString(c.getColumnIndex("published")));
 
         post.numReplies = c.getInt(c.getColumnIndex("num_replies"));

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

@@ -9,73 +9,71 @@
 import org.wordpress.android.util.DateTimeUtils;
 import org.wordpress.android.util.SqlUtils;
 
-import java.util.ArrayList;
 import java.util.Date;
-import java.util.List;
 
 /**
- * user's reader search history
+ * search suggestion table - populated by user's reader search history
  */
 public class ReaderSearchTable {
 
+    public static final String COL_QUERY = "query_string";
+
     protected static void createTables(SQLiteDatabase db) {
-        db.execSQL("CREATE TABLE tbl_search_history ("
-                 + "	query_string   TEXT NOT NULL COLLATE NOCASE PRIMARY KEY,"
-                 + "    date_used      TEXT,"
-                 + "    counter        INTEGER DEFAULT 1)");
+        db.execSQL("CREATE TABLE tbl_search_suggestions ("
+                 + "    _id            INTEGER PRIMARY KEY AUTOINCREMENT,"
+                 + "	query_string   TEXT NOT NULL COLLATE NOCASE,"
+                 + "    date_used      TEXT)");
+        db.execSQL("CREATE UNIQUE INDEX idx_search_suggestions_query ON tbl_search_suggestions(query_string)");
     }
 
     protected static void dropTables(SQLiteDatabase db) {
-        db.execSQL("DROP TABLE IF EXISTS tbl_search_history");
+        db.execSQL("DROP TABLE IF EXISTS tbl_search_suggestions");
     }
 
     /*
-     * adds the passed query string, updating the usage counter and date
+     * adds the passed query string, updating the usage date
      */
     public static void addOrUpdateQueryString(@NonNull String query) {
         String date = DateTimeUtils.javaDateToIso8601(new Date());
-        int counter = getCounterForQueryString(query) + 1;
 
         SQLiteStatement stmt = ReaderDatabase.getWritableDb().compileStatement(
-                "INSERT OR REPLACE INTO tbl_search_history (query_string, date_used, counter) VALUES (?1,?2,?3)");
+                "INSERT OR REPLACE INTO tbl_search_suggestions (query_string, date_used) VALUES (?1,?2)");
         try {
             stmt.bindString(1, query);
             stmt.bindString(2, date);
-            stmt.bindLong  (3, counter);
             stmt.execute();
         } finally {
             SqlUtils.closeStatement(stmt);
         }
     }
 
-    private static int getCounterForQueryString(@NonNull String query) {
-        String[] args = {query};
-        return SqlUtils.intForQuery(ReaderDatabase.getReadableDb(),
-                "SELECT counter FROM tbl_search_history WHERE query_string=?", args);
+    public static void deleteQueryString(@NonNull String query) {
+        String[] args = new String[]{query};
+        ReaderDatabase.getWritableDb().delete("tbl_search_suggestions", "query_string=?", args);
     }
 
-    public static List<String> getQueryStrings() {
-        return getQueryStrings(null);
-    }
-    public static List<String> getQueryStrings(String filter) {
-        List<String> queries = new ArrayList<>();
-        Cursor cursor;
+    /**
+     * Returns a cursor containing query strings previously typed by the user
+     * @param filter - filters the list using LIKE syntax (pass null for no filter)
+     * @param max - limit the list to this many items (pass zero for no limit)
+     */
+    public static Cursor getQueryStringCursor(String filter, int max) {
+        String sql;
+        String[] args;
         if (TextUtils.isEmpty(filter)) {
-            cursor = ReaderDatabase.getReadableDb().rawQuery(
-                    "SELECT query_string FROM tbl_search_history ORDER BY date_used DESC", null);
+            sql = "SELECT * FROM tbl_search_suggestions";
+            args = null;
         } else {
-            String likeFilter = filter + "%";
-            cursor = ReaderDatabase.getReadableDb().rawQuery(
-                    "SELECT query_string FROM tbl_search_history WHERE query_string LIKE ? ORDER BY date_used DESC", new String[]{likeFilter});
+            sql = "SELECT * FROM tbl_search_suggestions WHERE query_string LIKE ?";
+            args = new String[]{filter + "%"};
         }
 
-        try {
-            while (cursor.moveToNext()) {
-                queries.add(cursor.getString(0));
-            }
-            return queries;
-        } finally {
-            SqlUtils.closeCursor(cursor);
+        sql += " ORDER BY date_used DESC";
+
+        if (max > 0) {
+            sql += " LIMIT " + max;
         }
+
+        return ReaderDatabase.getReadableDb().rawQuery(sql, args);
     }
 }

WordPress/src/main/java/org/wordpress/android/models/ReaderPost.java

@@ -39,7 +39,7 @@ public class ReaderPost {
     private String primaryTag;    // most popular tag on this post based on usage in blog
     private String secondaryTag;  // second most popular tag on this post based on usage in blog
 
-    public long timestamp;        // used for sorting
+    public double timestamp;        // used for sorting
     private String published;
 
     private String url;
@@ -116,14 +116,19 @@ public static ReaderPost fromJson(JSONObject json) {
         post.blogName = JSONUtils.getStringDecoded(json, "site_name");
         post.published = JSONUtils.getString(json, "date");
 
-        // the date a post was liked is only returned by the read/liked/ endpoint - if this exists,
-        // set it as the timestamp so posts are sorted by the date they were liked rather than the
-        // date they were published (the timestamp is used to sort posts when querying)
-        String likeDate = JSONUtils.getString(json, "date_liked");
-        if (!TextUtils.isEmpty(likeDate)) {
-            post.timestamp = DateTimeUtils.iso8601ToTimestamp(likeDate);
+        // a post's timestamp determines its sort order
+        if (json.has("score")) {
+            // search results include a "score" that should be used for sorting
+            post.timestamp = json.optDouble("score");
         } else {
-            post.timestamp = DateTimeUtils.iso8601ToTimestamp(post.published);
+            // liked posts should be sorted by the date they were liked, otherwise sort by the
+            // published date
+            String likeDate = JSONUtils.getString(json, "date_liked");
+            if (!TextUtils.isEmpty(likeDate)) {
+                post.timestamp = DateTimeUtils.iso8601ToTimestamp(likeDate);
+            } else {
+                post.timestamp = DateTimeUtils.iso8601ToTimestamp(post.published);
+            }
         }
 
         // if the post is untitled, make up a title from the excerpt

WordPress/src/main/java/org/wordpress/android/models/ReaderTag.java

@@ -150,6 +150,7 @@ public static boolean isSameTag(ReaderTag tag1, ReaderTag tag2) {
     public boolean isPostsILike() {
         return tagType == ReaderTagType.DEFAULT && getEndpoint().endsWith("/read/liked");
     }
+
     public boolean isFollowedSites() {
         return tagType == ReaderTagType.DEFAULT && getEndpoint().endsWith("/read/following");
     }

WordPress/src/main/java/org/wordpress/android/models/ReaderTagType.java

@@ -4,12 +4,14 @@ public enum ReaderTagType {
     FOLLOWED,
     DEFAULT,
     RECOMMENDED,
-    CUSTOM_LIST;
+    CUSTOM_LIST,
+    SEARCH;
 
     private static final int INT_DEFAULT     = 0;
     private static final int INT_FOLLOWED    = 1;
     private static final int INT_RECOMMENDED = 2;
     private static final int INT_CUSTOM_LIST = 3;
+    private static final int INT_SEARCH      = 4;
 
     public static ReaderTagType fromInt(int value) {
         switch (value) {
@@ -19,6 +21,8 @@ public static ReaderTagType fromInt(int value) {
                 return FOLLOWED;
             case INT_CUSTOM_LIST:
                 return CUSTOM_LIST;
+            case INT_SEARCH:
+                return SEARCH;
             default :
                 return DEFAULT;
         }
@@ -32,6 +36,8 @@ public int toInt() {
                 return INT_RECOMMENDED;
             case CUSTOM_LIST:
                 return INT_CUSTOM_LIST;
+            case SEARCH:
+                return INT_SEARCH;
             default :
                 return INT_DEFAULT;
         }

WordPress/src/main/java/org/wordpress/android/ui/FilteredRecyclerView.java

@@ -358,10 +358,6 @@ public void removeOnScrollListener(RecyclerView.OnScrollListener listener) {
         }
     }
 
-    public RecyclerView getInternalRecyclerView() {
-        return mRecyclerView;
-    }
-
     public void hideToolbar(){
         mAppBarLayout.setExpanded(false, true);
     }

WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderActivityLauncher.java

@@ -14,7 +14,6 @@
 
 import org.wordpress.android.R;
 import org.wordpress.android.analytics.AnalyticsTracker;
-import org.wordpress.android.datasets.ReaderSearchTable;
 import org.wordpress.android.models.AccountHelper;
 import org.wordpress.android.models.ReaderComment;
 import org.wordpress.android.models.ReaderPost;
@@ -134,22 +133,6 @@ public static void showReaderTagPreview(Context context, ReaderTag tag) {
         context.startActivity(intent);
     }
 
-    public static void showReaderSearchResults(Context context, String query) {
-        if (TextUtils.isEmpty(query)) return;
-
-        // record this search query
-        ReaderSearchTable.addOrUpdateQueryString(query);
-
-        // TODO: track analytics
-        //AnalyticsTracker.track(AnalyticsTracker.Stat.???);
-
-        Intent intent = new Intent(context, ReaderPostListActivity.class);
-        intent.putExtra(ReaderConstants.ARG_SEARCH_QUERY, query);
-        intent.putExtra(ReaderConstants.ARG_POST_LIST_TYPE, ReaderPostListType.SEARCH_RESULTS);
-        context.startActivity(intent);
-    }
-
-
     /*
      * show comments for the passed Ids
      */

WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderConstants.java

@@ -1,16 +1,17 @@
 package org.wordpress.android.ui.reader;
 
 public class ReaderConstants {
-    public static final int  READER_MAX_POSTS_TO_REQUEST       = 20;       // max # posts to request when updating posts
-    public static final int  READER_MAX_POSTS_TO_DISPLAY       = 200;      // max # posts to display
-    public static final int  READER_MAX_COMMENTS_TO_REQUEST    = 20;       // max # top-level comments to request when updating comments
-    public static final int  READER_MAX_USERS_TO_DISPLAY       = 500;      // max # users to show in ReaderUserListActivity
-    public static final long READER_AUTO_UPDATE_DELAY_MINUTES  = 10;       // 10 minute delay between automatic updates
-    public static final int  READER_MAX_RECOMMENDED_TO_REQUEST = 20;       // max # of recommended blogs to request
+    public static final int  READER_MAX_POSTS_TO_REQUEST        = 20;       // max # posts to request when updating posts
+    public static final int  READER_MAX_SEARCH_POSTS_TO_REQUEST = 10;       // max # posts to request when searching posts
+    public static final int  READER_MAX_POSTS_TO_DISPLAY        = 200;      // max # posts to display
+    public static final int  READER_MAX_COMMENTS_TO_REQUEST     = 20;       // max # top-level comments to request when updating comments
+    public static final int  READER_MAX_USERS_TO_DISPLAY        = 500;      // max # users to show in ReaderUserListActivity
+    public static final long READER_AUTO_UPDATE_DELAY_MINUTES   = 10;       // 10 minute delay between automatic updates
+    public static final int  READER_MAX_RECOMMENDED_TO_REQUEST  = 20;       // max # of recommended blogs to request
 
-    public static final int MIN_FEATURED_IMAGE_WIDTH = 640;                // min width for an image to be suitable featured image
+    public static final int MIN_FEATURED_IMAGE_WIDTH = 640;                 // min width for an image to be suitable featured image
 
-    public static final String HTTP_REFERER_URL = "https://wordpress.com"; // referrer url for reader posts opened in a browser
+    public static final String HTTP_REFERER_URL = "https://wordpress.com";  // referrer url for reader posts opened in a browser
 
     // intent arguments / keys
     static final String ARG_TAG               = "tag";

WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderEvents.java

@@ -1,5 +1,7 @@
 package org.wordpress.android.ui.reader;
 
+import android.support.annotation.NonNull;
+
 import org.wordpress.android.models.ReaderTag;
 import org.wordpress.android.ui.reader.actions.ReaderActions;
 import org.wordpress.android.ui.reader.services.ReaderPostService;
@@ -63,6 +65,40 @@ public ReaderPostService.UpdateAction getAction() {
         }
     }
 
+    public static class SearchPostsStarted {
+        private final String mQuery;
+        private final int mOffset;
+        public SearchPostsStarted(@NonNull String query, int offset) {
+            mQuery = query;
+            mOffset = offset;
+        }
+        public String getQuery() {
+            return mQuery;
+        }
+        public int getOffset() {
+            return mOffset;
+        }
+    }
+    public static class SearchPostsEnded {
+        private final String mQuery;
+        private final boolean mDidSucceed;
+        private final int mOffset;
+        public SearchPostsEnded(@NonNull String query, int offset, boolean didSucceed) {
+            mQuery = query;
+            mOffset = offset;
+            mDidSucceed = didSucceed;
+        }
+        public boolean didSucceed() {
+            return mDidSucceed;
+        }
+        public String getQuery() {
+            return mQuery;
+        }
+        public int getOffset() {
+            return mOffset;
+        }
+    }
+
     public static class UpdateCommentsStarted {}
     public static class UpdateCommentsEnded {
         private final ReaderActions.UpdateResult mResult;