Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-26 02:45:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Search: suggest raw label names

Browse Source
This commit is contained in:
M66B
2024-02-13 15:55:55 +01:00
parent 52b14849b2
commit 614d4e4d1a
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/eu/faircode/email/FragmentDialogSearch.java
View File

@@ -157,13 +157,19 @@ public class FragmentDialogSearch extends FragmentDialogBase {
if (TextUtils.isEmpty(typed))
return cursor;
int i = 0;
String keyword = TupleKeyword.getKeyword(context, typed.toString());
if (!TextUtils.isEmpty(keyword))
cursor.addRow(new Object[]{i++ + 1, keyword});
if (cbSearchIndex.isEnabled() && cbSearchIndex.isChecked()) {
SQLiteDatabase db = Fts4DbHelper.getInstance(context);
List<String> suggestions = Fts4DbHelper.getSuggestions(
db,
typed + "%",
MAX_SUGGESTIONS);
for (int i = 0; i < suggestions.size(); i++)
for (; i < suggestions.size(); i++)
cursor.addRow(new Object[]{i + 1, suggestions.get(i)});
return cursor;
}

22
app/src/main/java/eu/faircode/email/TupleKeyword.java
View File

@@ -112,32 +112,32 @@ public class TupleKeyword {
if (TextUtils.isEmpty(title))
return title;
if (title.equals(context.getString(R.string.title_keyword_label1)))
if (title.equalsIgnoreCase(context.getString(R.string.title_keyword_label1)))
return "$label1";
if (title.equals(context.getString(R.string.title_keyword_label2)))
if (title.equalsIgnoreCase(context.getString(R.string.title_keyword_label2)))
return "$label2";
if (title.equals(context.getString(R.string.title_keyword_label3)))
if (title.equalsIgnoreCase(context.getString(R.string.title_keyword_label3)))
return "$label3";
if (title.equals(context.getString(R.string.title_keyword_label4)))
if (title.equalsIgnoreCase(context.getString(R.string.title_keyword_label4)))
return "$label4";
if (title.equals(context.getString(R.string.title_keyword_label5)))
if (title.equalsIgnoreCase(context.getString(R.string.title_keyword_label5)))
return "$label5";
if (title.equals(context.getString(R.string.title_keyword_displayed)))
if (title.equalsIgnoreCase(context.getString(R.string.title_keyword_displayed)))
return MessageHelper.FLAG_DISPLAYED;
if (title.equals(context.getString(R.string.title_keyword_delivered)))
if (title.equalsIgnoreCase(context.getString(R.string.title_keyword_delivered)))
return MessageHelper.FLAG_DELIVERED;
if (title.equals(context.getString(R.string.title_keyword_not_displayed)))
if (title.equalsIgnoreCase(context.getString(R.string.title_keyword_not_displayed)))
return MessageHelper.FLAG_NOT_DISPLAYED;
if (title.equals(context.getString(R.string.title_keyword_not_delivered)))
if (title.equalsIgnoreCase(context.getString(R.string.title_keyword_not_delivered)))
return MessageHelper.FLAG_NOT_DELIVERED;
if (title.equals(context.getString(R.string.title_keyword_complaint)))
if (title.equalsIgnoreCase(context.getString(R.string.title_keyword_complaint)))
return MessageHelper.FLAG_COMPLAINT;
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
for (String key : prefs.getAll().keySet())
if (key != null && key.startsWith("kwtitle.") &&
title.equals(prefs.getString(key, null))) {
title.equalsIgnoreCase(prefs.getString(key, null))) {
int dot = key.indexOf('.');
if (dot >= 0)
return key.substring(dot + 1);