self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-11-29 22:48:10 +02:00
Code Issues Releases Activity

Mobile: Fixes #1066: Disable use of FTS when not present on device

Browse Source
This commit is contained in:
Laurent Cozic
2018-12-28 21:40:29 +01:00
parent 59402cf198
commit 53513db5b5
8 changed files with 81 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
ReactNativeClient/lib/components/screens/search.js
View File

@@ -106,22 +106,22 @@ class SearchScreenComponent extends BaseScreenComponent {
let notes = []
if (query) {
notes = await SearchEngineUtils.notesForQuery(query);
// Keeping the code below in case of compatibility issue with old versions
// of Android and SQLite FTS.
if (!!this.props.settings['db.ftsEnabled']) {
notes = await SearchEngineUtils.notesForQuery(query);
} else {
let p = query.split(' ');
let temp = [];
for (let i = 0; i < p.length; i++) {
let t = p[i].trim();
if (!t) continue;
temp.push(t);
}
// let p = query.split(' ');
// let temp = [];
// for (let i = 0; i < p.length; i++) {
// let t = p[i].trim();
// if (!t) continue;
// temp.push(t);
// }
// notes = await Note.previews(null, {
// anywherePattern: '*' + temp.join('*') + '*',
// });
notes = await Note.previews(null, {
anywherePattern: '*' + temp.join('*') + '*',
});
}
}
if (!this.isMounted_) return;
@@ -193,6 +193,7 @@ const SearchScreen = connect(
return {
query: state.searchQuery,
theme: state.settings.theme,
settings: state.settings,
noteSelectionEnabled: state.noteSelectionEnabled,
};
}