From a619b7a893efc5da4b1f874fb5aa8473a4ffa4c5 Mon Sep 17 00:00:00 2001
From: xingxing <xxx823952375@gmail.com>
Date: Tue, 5 Jun 2018 23:20:56 +0800
Subject: [PATCH] Search small adjustments

---
 .../org/houxg/leamonax/database/NoteDataStore.java     |  2 +-
 .../java/org/houxg/leamonax/ui/SearchActivity.java     | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/houxg/leamonax/database/NoteDataStore.java b/app/src/main/java/org/houxg/leamonax/database/NoteDataStore.java
index bb80674..3ac9924 100644
--- a/app/src/main/java/org/houxg/leamonax/database/NoteDataStore.java
+++ b/app/src/main/java/org/houxg/leamonax/database/NoteDataStore.java
@@ -91,7 +91,7 @@ public class NoteDataStore {
         DatabaseWrapper databaseWrapper = FlowManager.getWritableDatabase(AppDataBase.class);
         String query = "select id from note where userid = ? and istrash = 0 and isdeleted = 0 and id in " +
                 "(select rowid from fts_note where fts_note match ?)";////查询Content中满足条件的记录
-        Cursor cursor = databaseWrapper.rawQuery(query, new String[]{Account.getCurrent().getUserId(), keyword});
+        Cursor cursor = databaseWrapper.rawQuery(query, new String[]{Account.getCurrent().getUserId(), "*" + keyword + "*"});
         while(cursor.moveToNext()) {
             set.add(cursor.getLong(cursor.getColumnIndex("id")));
         }
diff --git a/app/src/main/java/org/houxg/leamonax/ui/SearchActivity.java b/app/src/main/java/org/houxg/leamonax/ui/SearchActivity.java
index dec24dc..b13629e 100644
--- a/app/src/main/java/org/houxg/leamonax/ui/SearchActivity.java
+++ b/app/src/main/java/org/houxg/leamonax/ui/SearchActivity.java
@@ -33,15 +33,15 @@ public class SearchActivity extends BaseActivity {
         mSearchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
             @Override
             public boolean onQueryTextSubmit(String query) {
-                return false;
+                NoteFragment.Mode mode = NoteFragment.Mode.SEARCH;
+                mode.setKeywords(query);
+                mNoteFragment.setMode(mode);
+                return true;
             }
 
             @Override
             public boolean onQueryTextChange(String newText) {
-                NoteFragment.Mode mode = NoteFragment.Mode.SEARCH;
-                mode.setKeywords(newText);
-                mNoteFragment.setMode(mode);
-                return true;
+                return false;
             }
         });