From 35d297a557a45126ddf15286cc8fe28484048032 Mon Sep 17 00:00:00 2001 From: xingxing Date: Fri, 1 Jun 2018 00:08:59 +0800 Subject: [PATCH 1/4] Searching for full-text fields --- .../houxg/leamonax/database/AppDataBase.java | 10 +++++- .../leamonax/database/NoteDataStore.java | 31 +++++++++++++++++++ .../org/houxg/leamonax/ui/NoteFragment.java | 2 +- 3 files changed, 41 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/houxg/leamonax/database/AppDataBase.java b/app/src/main/java/org/houxg/leamonax/database/AppDataBase.java index 97bbf45..ab6e9ce 100644 --- a/app/src/main/java/org/houxg/leamonax/database/AppDataBase.java +++ b/app/src/main/java/org/houxg/leamonax/database/AppDataBase.java @@ -19,7 +19,7 @@ import org.houxg.leamonax.model.RelationshipOfNoteTag; import org.houxg.leamonax.model.Tag; import org.houxg.leamonax.model.Tag_Table; -@Database(name = "leanote_db", version = 4) +@Database(name = "leanote_db", version = 5) public class AppDataBase { @Migration(version = 2, database = AppDataBase.class) @@ -157,4 +157,12 @@ public class AppDataBase { cursor.close(); } } + + @Migration(version = 5, database = AppDataBase.class) + public static class UpdateNoteContentToFTS extends BaseMigration { + @Override + public void migrate(DatabaseWrapper database) { + database.execSQL("CREATE VIRTUAL TABLE fts_note USING fts4 (content='note', content)"); + } + } } 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 7ed4194..94c7bde 100644 --- a/app/src/main/java/org/houxg/leamonax/database/NoteDataStore.java +++ b/app/src/main/java/org/houxg/leamonax/database/NoteDataStore.java @@ -1,10 +1,14 @@ package org.houxg.leamonax.database; +import android.database.Cursor; + +import com.raizlabs.android.dbflow.config.FlowManager; import com.raizlabs.android.dbflow.sql.language.Join; import com.raizlabs.android.dbflow.sql.language.NameAlias; import com.raizlabs.android.dbflow.sql.language.SQLite; import com.raizlabs.android.dbflow.sql.language.property.IProperty; +import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper; import org.houxg.leamonax.model.Account; import org.houxg.leamonax.model.Note; @@ -16,8 +20,10 @@ import org.houxg.leamonax.model.Tag; import org.houxg.leamonax.model.Tag_Table; import java.util.ArrayList; +import java.util.LinkedHashSet; import java.util.List; import java.util.Locale; +import java.util.Set; public class NoteDataStore { public static List searchByTitle(String keyword) { @@ -31,6 +37,31 @@ public class NoteDataStore { .queryList(); } + public static List searchByFullTextSearch(String keyword) { + Set set = new LinkedHashSet<>(); + 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}); + while(cursor.moveToNext()) { + set.add(cursor.getLong(cursor.getColumnIndex("id"))); + } + cursor.close(); + + query = "select id from note where userid = ? and istrash = 0 and isdeleted = 0 and title like ?";//查询title中满足条件的记录 + cursor = databaseWrapper.rawQuery(query, new String[]{Account.getCurrent().getUserId(), "%" + keyword + "%"});//查询Content中满足条件的记录 + while(cursor.moveToNext()) { + set.add(cursor.getLong(cursor.getColumnIndex("id"))); + } + cursor.close(); + + return SQLite.select() + .from(Note.class) + .where(Note_Table.id.in(set)) + .queryList(); + } + + public static Note getByServerId(String serverId) { return SQLite.select() .from(Note.class) diff --git a/app/src/main/java/org/houxg/leamonax/ui/NoteFragment.java b/app/src/main/java/org/houxg/leamonax/ui/NoteFragment.java index 23f9064..87a9b59 100644 --- a/app/src/main/java/org/houxg/leamonax/ui/NoteFragment.java +++ b/app/src/main/java/org/houxg/leamonax/ui/NoteFragment.java @@ -163,7 +163,7 @@ public class NoteFragment extends Fragment implements NoteAdapter.NoteAdapterLis notes = NoteDataStore.getByTagText(mode.tagText, Account.getCurrent().getUserId()); break; case SEARCH: - notes = NoteDataStore.searchByTitle(mode.keywords); + notes = NoteDataStore.searchByFullTextSearch(mode.keywords); mNoteList.setHighlight(mode.keywords); break; default: From 9ed4bba1844f81852ae870dd63a14fd61e622350 Mon Sep 17 00:00:00 2001 From: xingxing Date: Mon, 4 Jun 2018 00:09:27 +0800 Subject: [PATCH 2/4] Add VIRTUAL TABLE FTS_NOTE update rule --- .../leamonax/background/NoteSyncService.java | 1 + .../leamonax/database/NoteDataStore.java | 12 ++++++++ .../houxg/leamonax/service/NoteService.java | 30 ++++++++++++++++++- .../leamonax/ui/edit/NoteEditActivity.java | 2 ++ 4 files changed, 44 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/houxg/leamonax/background/NoteSyncService.java b/app/src/main/java/org/houxg/leamonax/background/NoteSyncService.java index 66c816e..31caea1 100644 --- a/app/src/main/java/org/houxg/leamonax/background/NoteSyncService.java +++ b/app/src/main/java/org/houxg/leamonax/background/NoteSyncService.java @@ -63,6 +63,7 @@ public class NoteSyncService extends Service { if (!subscriber.isUnsubscribed()) { NoteService.fetchFromServer(); NoteService.pushToServer(); + NoteService.buildFTSNote(); subscriber.onNext(null); subscriber.onCompleted(); } 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 94c7bde..821b29a 100644 --- a/app/src/main/java/org/houxg/leamonax/database/NoteDataStore.java +++ b/app/src/main/java/org/houxg/leamonax/database/NoteDataStore.java @@ -37,6 +37,18 @@ public class NoteDataStore { .queryList(); } + public static void updateFTSNoteByLocalId(Long localId) { +// DatabaseWrapper databaseWrapper = FlowManager.getWritableDatabase(AppDataBase.class); +// String query = "INSERT INTO fts_note(fts_note) VALUES('rebuild')";//This can be slow +// databaseWrapper.execSQL(query); + } + + public static void FTSNoteRebuild() { + DatabaseWrapper databaseWrapper = FlowManager.getWritableDatabase(AppDataBase.class); + String query = "INSERT INTO fts_note(fts_note) VALUES('rebuild')";//This can be slow + databaseWrapper.execSQL(query); + } + public static List searchByFullTextSearch(String keyword) { Set set = new LinkedHashSet<>(); DatabaseWrapper databaseWrapper = FlowManager.getWritableDatabase(AppDataBase.class); diff --git a/app/src/main/java/org/houxg/leamonax/service/NoteService.java b/app/src/main/java/org/houxg/leamonax/service/NoteService.java index 58fbcd7..2b420d4 100644 --- a/app/src/main/java/org/houxg/leamonax/service/NoteService.java +++ b/app/src/main/java/org/houxg/leamonax/service/NoteService.java @@ -24,11 +24,13 @@ import org.houxg.leamonax.model.UpdateRe; import org.houxg.leamonax.network.ApiProvider; import org.houxg.leamonax.utils.CollectionUtils; import org.houxg.leamonax.utils.RetrofitUtils; +import org.houxg.leamonax.utils.SharedPreferenceUtils; import org.houxg.leamonax.utils.StringUtils; import org.houxg.leamonax.utils.TimeUtils; import java.io.File; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Locale; @@ -38,7 +40,6 @@ import okhttp3.MediaType; import okhttp3.MultipartBody; import okhttp3.RequestBody; import retrofit2.Call; -import rx.Observable; public class NoteService { @@ -48,6 +49,8 @@ public class NoteService { private static final String MULTIPART_FORM_DATA = "multipart/form-data"; private static final String CONFLICT_SUFFIX = "--conflict"; private static final int MAX_ENTRY = 20; + public static final String SP_HAS_FTS_FULL_BUILD = "sp_has_fts_full_build"; + public static final String SP_FTS_INCREASE_BUILD_KES = "sp_has_increase_build_KEYS"; public static void pushToServer() { List notes = NoteDataStore.getAllDirtyNotes(Account.getCurrent().getUserId()); @@ -57,6 +60,31 @@ public class NoteService { } } } + public static void buildFTSNote() { + if (!SharedPreferenceUtils.read(SharedPreferenceUtils.CONFIG, SP_HAS_FTS_FULL_BUILD, false)) { + NoteDataStore.FTSNoteRebuild(); + SharedPreferenceUtils.write(SharedPreferenceUtils.CONFIG, SP_HAS_FTS_FULL_BUILD, true); + SharedPreferenceUtils.write(SharedPreferenceUtils.CONFIG, SP_FTS_INCREASE_BUILD_KES, ""); + } else { + String noteLocalIds = SharedPreferenceUtils.read(SharedPreferenceUtils.CONFIG, SP_FTS_INCREASE_BUILD_KES, ""); + String array[] = TextUtils.split(noteLocalIds, ","); + for (String localIdStr: array) { + Long localId = Long.valueOf(localIdStr); + NoteDataStore.updateFTSNoteByLocalId(localId); + } + SharedPreferenceUtils.write(SharedPreferenceUtils.CONFIG, SP_FTS_INCREASE_BUILD_KES, ""); + } + } + + public static void addInCreaseBuildKey(Long localId) { + String noteLocalIds = SharedPreferenceUtils.read(SharedPreferenceUtils.CONFIG, SP_FTS_INCREASE_BUILD_KES, ""); + String array[] = TextUtils.split(noteLocalIds, ","); + List list = new ArrayList<>(Arrays.asList(array)); + if (!list.contains(String.valueOf(localId))) { + list.add(String.valueOf(localId)); + } + SharedPreferenceUtils.write(SharedPreferenceUtils.CONFIG, SP_FTS_INCREASE_BUILD_KES, TextUtils.join(",", list)); + } public static void fetchFromServer() { //sync notebook diff --git a/app/src/main/java/org/houxg/leamonax/ui/edit/NoteEditActivity.java b/app/src/main/java/org/houxg/leamonax/ui/edit/NoteEditActivity.java index bee5582..ac26fd2 100644 --- a/app/src/main/java/org/houxg/leamonax/ui/edit/NoteEditActivity.java +++ b/app/src/main/java/org/houxg/leamonax/ui/edit/NoteEditActivity.java @@ -169,6 +169,7 @@ public class NoteEditActivity extends BaseActivity implements EditorFragment.Edi @Override public void call(Wrapper wrapper) { saveAsDraft(wrapper); + NoteService.addInCreaseBuildKey(wrapper.note.getId()); setResult(RESULT_OK); NetworkUtils.checkNetwork(); } @@ -240,6 +241,7 @@ public class NoteEditActivity extends BaseActivity implements EditorFragment.Edi wrapper.note.delete(); } else { saveAsDraft(wrapper); + NoteService.addInCreaseBuildKey(wrapper.note.getId()); } } }); From a91ec5e9f4dea6a0c87bee1425aaa65cd134e111 Mon Sep 17 00:00:00 2001 From: xingxing Date: Mon, 4 Jun 2018 23:32:56 +0800 Subject: [PATCH 3/4] Add a build full-text indexing feature in settings --- .../leamonax/database/NoteDataStore.java | 43 ++++++++++++- .../houxg/leamonax/service/NoteService.java | 2 +- .../org/houxg/leamonax/ui/NoteFragment.java | 2 +- .../houxg/leamonax/ui/SettingsActivity.java | 61 +++++++++++++++++-- .../leamonax/utils/SharedPreferenceUtils.java | 3 +- app/src/main/res/layout/activity_settings.xml | 22 +++++++ app/src/main/res/values-zh/strings.xml | 5 ++ app/src/main/res/values/strings.xml | 5 ++ 8 files changed, 132 insertions(+), 11 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 821b29a..bb80674 100644 --- a/app/src/main/java/org/houxg/leamonax/database/NoteDataStore.java +++ b/app/src/main/java/org/houxg/leamonax/database/NoteDataStore.java @@ -38,17 +38,54 @@ public class NoteDataStore { } public static void updateFTSNoteByLocalId(Long localId) { -// DatabaseWrapper databaseWrapper = FlowManager.getWritableDatabase(AppDataBase.class); -// String query = "INSERT INTO fts_note(fts_note) VALUES('rebuild')";//This can be slow -// databaseWrapper.execSQL(query); + Note note = getByLocalId(localId); + DatabaseWrapper databaseWrapper = FlowManager.getWritableDatabase(AppDataBase.class); + String query = "UPDATE fts_note SET content = '" + note.getContent() + "' where rowid = " + localId; + databaseWrapper.execSQL(query); + } + + public static boolean isExistsTableFTSNote() { + boolean result = false; + DatabaseWrapper databaseWrapper = FlowManager.getWritableDatabase(AppDataBase.class); + String query = "select count(*) as c from sqlite_master where type ='table' and name ='fts_note'"; + Cursor cursor = databaseWrapper.rawQuery(query, null); + if(cursor.moveToNext()){ + int count = cursor.getInt(0); + if(count > 0){ + result = true; + } + } + return result; + } + + public static void createTableFTSNote() { + DatabaseWrapper databaseWrapper = FlowManager.getWritableDatabase(AppDataBase.class); + String query = "CREATE VIRTUAL TABLE fts_note USING fts4 (content='note', content)"; + databaseWrapper.execSQL(query); } public static void FTSNoteRebuild() { + if (!isExistsTableFTSNote()) { + createTableFTSNote(); + } + FTSNoteRebuildInternal(); + } + + public static void FTSNoteRebuildInternal() { DatabaseWrapper databaseWrapper = FlowManager.getWritableDatabase(AppDataBase.class); String query = "INSERT INTO fts_note(fts_note) VALUES('rebuild')";//This can be slow databaseWrapper.execSQL(query); } + public static List searchByKeyword(String keyword) { + if (!isExistsTableFTSNote()) { + createTableFTSNote(); + return searchByTitle(keyword); + } else { + return searchByFullTextSearch(keyword); + } + + } public static List searchByFullTextSearch(String keyword) { Set set = new LinkedHashSet<>(); DatabaseWrapper databaseWrapper = FlowManager.getWritableDatabase(AppDataBase.class); diff --git a/app/src/main/java/org/houxg/leamonax/service/NoteService.java b/app/src/main/java/org/houxg/leamonax/service/NoteService.java index 2b420d4..ce1de85 100644 --- a/app/src/main/java/org/houxg/leamonax/service/NoteService.java +++ b/app/src/main/java/org/houxg/leamonax/service/NoteService.java @@ -61,7 +61,7 @@ public class NoteService { } } public static void buildFTSNote() { - if (!SharedPreferenceUtils.read(SharedPreferenceUtils.CONFIG, SP_HAS_FTS_FULL_BUILD, false)) { + if (!SharedPreferenceUtils.read(SharedPreferenceUtils.CONFIG, SP_HAS_FTS_FULL_BUILD, false)) {//存在缺馅，对于多账户用户而言，每个账户第一次全量同步都会触发rebuild NoteDataStore.FTSNoteRebuild(); SharedPreferenceUtils.write(SharedPreferenceUtils.CONFIG, SP_HAS_FTS_FULL_BUILD, true); SharedPreferenceUtils.write(SharedPreferenceUtils.CONFIG, SP_FTS_INCREASE_BUILD_KES, ""); diff --git a/app/src/main/java/org/houxg/leamonax/ui/NoteFragment.java b/app/src/main/java/org/houxg/leamonax/ui/NoteFragment.java index 87a9b59..64b134c 100644 --- a/app/src/main/java/org/houxg/leamonax/ui/NoteFragment.java +++ b/app/src/main/java/org/houxg/leamonax/ui/NoteFragment.java @@ -163,7 +163,7 @@ public class NoteFragment extends Fragment implements NoteAdapter.NoteAdapterLis notes = NoteDataStore.getByTagText(mode.tagText, Account.getCurrent().getUserId()); break; case SEARCH: - notes = NoteDataStore.searchByFullTextSearch(mode.keywords); + notes = NoteDataStore.searchByKeyword(mode.keywords); mNoteList.setHighlight(mode.keywords); break; default: diff --git a/app/src/main/java/org/houxg/leamonax/ui/SettingsActivity.java b/app/src/main/java/org/houxg/leamonax/ui/SettingsActivity.java index bd6a45b..4a948c0 100644 --- a/app/src/main/java/org/houxg/leamonax/ui/SettingsActivity.java +++ b/app/src/main/java/org/houxg/leamonax/ui/SettingsActivity.java @@ -2,6 +2,7 @@ package org.houxg.leamonax.ui; import android.app.AlertDialog; +import android.app.ProgressDialog; import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; @@ -22,11 +23,10 @@ import org.houxg.leamonax.database.NoteTagDataStore; import org.houxg.leamonax.database.NotebookDataStore; import org.houxg.leamonax.model.Account; import org.houxg.leamonax.model.BaseResponse; -import org.houxg.leamonax.model.Note; -import org.houxg.leamonax.model.Notebook; -import org.houxg.leamonax.model.RelationshipOfNoteTag; import org.houxg.leamonax.model.Tag; import org.houxg.leamonax.service.AccountService; +import org.houxg.leamonax.service.NoteService; +import org.houxg.leamonax.utils.SharedPreferenceUtils; import org.houxg.leamonax.utils.ToastUtils; import java.util.List; @@ -41,6 +41,8 @@ import rx.android.schedulers.AndroidSchedulers; import rx.functions.Action1; import rx.schedulers.Schedulers; +import static org.houxg.leamonax.service.NoteService.SP_HAS_FTS_FULL_BUILD; + public class SettingsActivity extends BaseActivity { private final String[] mEditors = new String[]{"RichText", "Markdown"}; @@ -59,6 +61,9 @@ public class SettingsActivity extends BaseActivity { TextView mHostTv; @BindView(R.id.ll_clear) View mClearDataView; + @BindView(R.id.ll_fts_rebuild) + View mFtsRebuildLayout; + private ProgressDialog mDialog; @Override protected void onCreate(@Nullable Bundle savedInstanceState) { @@ -146,8 +151,8 @@ public class SettingsActivity extends BaseActivity { @OnClick(R.id.ll_change_password) void clickedPassword() { View view = LayoutInflater.from(this).inflate(R.layout.dialog_change_passowrd, null); - final EditText mOldPasswordEt = (EditText) view.findViewById(R.id.et_old_password); - final EditText mNewPasswordEt = (EditText) view.findViewById(R.id.et_new_password); + final EditText mOldPasswordEt = view.findViewById(R.id.et_old_password); + final EditText mNewPasswordEt = view.findViewById(R.id.et_new_password); new AlertDialog.Builder(this) .setTitle(R.string.change_password) .setView(view) @@ -183,6 +188,52 @@ public class SettingsActivity extends BaseActivity { .show(); } + private void showProgressDialog() { + if (mDialog == null) { + mDialog = new ProgressDialog(this); + mDialog.setTitle(R.string.progress_dialog_loading_msg); + mDialog.setCancelable(false); + mDialog.show(); + } + } + + private void hideProgressDialog() { + if (mDialog != null) { + mDialog.dismiss(); + mDialog = null; + } + } + + @OnClick(R.id.ll_fts_rebuild) + void rebuildIndex() { + new AlertDialog.Builder(this) + .setTitle(R.string.full_text_search_index_rebuild) + .setMessage(R.string.full_text_search_rebuild_index_msg) + .setNegativeButton(R.string.no, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + dialog.dismiss(); + } + }) + .setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + showProgressDialog(); + SharedPreferenceUtils.write(SharedPreferenceUtils.CONFIG, SP_HAS_FTS_FULL_BUILD, false); + NoteService.buildFTSNote(); + dialog.dismiss(); + mFtsRebuildLayout.postDelayed(new Runnable() { + @Override + public void run() { + hideProgressDialog(); + ToastUtils.show(SettingsActivity.this, R.string.full_text_search_index_rebuild_success); + } + }, 1000 * 15); + } + }) + .show(); + } + private void clearData() { Observable.create( new Observable.OnSubscribe() { diff --git a/app/src/main/java/org/houxg/leamonax/utils/SharedPreferenceUtils.java b/app/src/main/java/org/houxg/leamonax/utils/SharedPreferenceUtils.java index a23e429..9864fdb 100644 --- a/app/src/main/java/org/houxg/leamonax/utils/SharedPreferenceUtils.java +++ b/app/src/main/java/org/houxg/leamonax/utils/SharedPreferenceUtils.java @@ -5,10 +5,11 @@ import android.content.Context; import android.content.SharedPreferences; import org.houxg.leamonax.Leamonax; +import org.houxg.leamonax.model.Account; public class SharedPreferenceUtils { - public static final String CONFIG = "CONFIG"; + public static final String CONFIG = "CONFIG_" + Account.getCurrent().getUserId(); public static SharedPreferences getSharedPreferences(String name) { return Leamonax.getContext().getSharedPreferences(name, Context.MODE_PRIVATE); diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 3ed45fd..cab894f 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -139,6 +139,28 @@ + + + + + + + + + + 需要升级蚂蚁笔记账户 选择图片 笔记未加载完，不能保存 + 全文搜索 + 重建索引 + 索引构建成功 + 这是一个很耗时的操作,你确定要重新构建索引么(默认情况下我们不推荐用户使用此功能)? + Processing… \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3d15663..f0217d0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -124,4 +124,9 @@ need upgrade Leanote account Select Picture Notes are not loaded and cannot be saved + Full text search + rebuild fts index + Index build succeeded + This is a time-consuming operation. Are you sure you want to rebuild the index(We don\'t recommend users to use this feature by default)? + Loading… From a619b7a893efc5da4b1f874fb5aa8473a4ffa4c5 Mon Sep 17 00:00:00 2001 From: xingxing Date: Tue, 5 Jun 2018 23:20:56 +0800 Subject: [PATCH 4/4] 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; } });