msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Added special searches

Browse Source
pull/159/head
M66B 5 years ago
parent 0be109a816
commit a0c2e41adb
3 changed files with 96 additions and 51 deletions
Show Stats Download Patch File Download Diff File

66
app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
Unescape View File

@ -190,30 +190,40 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
if (find == null) if (find == null)
match = true; match = true;
else { else {
if (message.from != null && message.from.length > 0) if (find.startsWith(context.getString(R.string.title_search_special_prefix) + ":")) {
for (int j = 0; j < message.from.length && !match; j++) String special = find.split(":")[1];
match = message.from[j].toString().toLowerCase().contains(find); if (context.getString(R.string.title_search_special_unseen).equals(special))
match = !message.ui_seen;
if (!match && message.to != null && message.to.length > 0) else if (context.getString(R.string.title_search_special_flagged).equals(special))
for (int j = 0; j < message.to.length && !match; j++) match = message.ui_flagged;
match = message.to[j].toString().toLowerCase().contains(find); else if (context.getString(R.string.title_search_special_snoozed).equals(special))
match = (message.ui_snoozed != null);
if (!match && message.subject != null) } else {
match = message.subject.toLowerCase().contains(find); if (message.from != null && message.from.length > 0)
for (int j = 0; j < message.from.length && !match; j++)
if (!match && message.keywords != null && message.keywords.length > 0) match = message.from[j].toString().toLowerCase().contains(find);
for (String keyword : message.keywords)
if (keyword.toLowerCase().contains(find)) { if (!match && message.to != null && message.to.length > 0)
match = true; for (int j = 0; j < message.to.length && !match; j++)
break; match = message.to[j].toString().toLowerCase().contains(find);
}
if (!match && message.subject != null)
match = message.subject.toLowerCase().contains(find);
if (!match && message.keywords != null && message.keywords.length > 0)
for (String keyword : message.keywords)
if (keyword.toLowerCase().contains(find)) {
match = true;
break;
}
if (!match && message.content) { if (!match && message.content) {
try { try {
String body = Helper.readText(message.getFile(context)); String body = Helper.readText(message.getFile(context));
match = body.toLowerCase().contains(find); match = body.toLowerCase().contains(find);
} catch (IOException ex) { } catch (IOException ex) {
Log.e(ex); Log.e(ex);
}
} }
} }
} }
@ -281,7 +291,15 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
Log.i("Boundary server query=" + query); Log.i("Boundary server query=" + query);
if (query == null) if (query == null)
imessages = ifolder.getMessages(); imessages = ifolder.getMessages();
else { else if (query.startsWith(context.getString(R.string.title_search_special_prefix) + ":")) {
String special = query.split(":")[1];
if (context.getString(R.string.title_search_special_unseen).equals(special))
imessages = ifolder.search(new FlagTerm(new Flags(Flags.Flag.SEEN), false));
else if (context.getString(R.string.title_search_special_flagged).equals(special))
imessages = ifolder.search(new FlagTerm(new Flags(Flags.Flag.FLAGGED), true));
else
imessages = new Message[0];
} else {
Object result = ifolder.doCommand(new IMAPFolder.ProtocolCommand() { Object result = ifolder.doCommand(new IMAPFolder.ProtocolCommand() {
@Override @Override
public Object doCommand(IMAPProtocol protocol) { public Object doCommand(IMAPProtocol protocol) {

76
app/src/main/java/eu/faircode/email/FragmentMessages.java
Unescape View File

@ -31,6 +31,7 @@ import android.content.IntentFilter;
import android.content.IntentSender; import android.content.IntentSender;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.database.Cursor; import android.database.Cursor;
import android.database.MatrixCursor;
import android.graphics.Canvas; import android.graphics.Canvas;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.PorterDuff; import android.graphics.PorterDuff;
@ -69,6 +70,7 @@ import android.webkit.WebSettings;
import android.webkit.WebView; import android.webkit.WebView;
import android.webkit.WebViewClient; import android.webkit.WebViewClient;
import android.widget.ArrayAdapter; import android.widget.ArrayAdapter;
import android.widget.AutoCompleteTextView;
import android.widget.Button; import android.widget.Button;
import android.widget.CheckBox; import android.widget.CheckBox;
import android.widget.ImageButton; import android.widget.ImageButton;
@ -2282,42 +2284,62 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
searchView.setQuery(searching, false); searchView.setQuery(searching, false);
} }
AutoCompleteTextView autoCompleteTextView = searchView.findViewById(androidx.appcompat.R.id.search_src_text);
autoCompleteTextView.setThreshold(0);
searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() { searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
@Override @Override
public boolean onQueryTextChange(String newText) { public boolean onQueryTextChange(String newText) {
searching = newText; searching = newText;
Bundle args = new Bundle(); if (TextUtils.isEmpty(newText)) {
args.putString("query", newText); MatrixCursor cursor = new MatrixCursor(new String[]{"_id", "suggestion"});
String prefix = getString(R.string.title_search_special_prefix);
cursor.addRow(new Object[]{-1, prefix + ":" + getString(R.string.title_search_special_unseen)});
cursor.addRow(new Object[]{-2, prefix + ":" + getString(R.string.title_search_special_flagged)});
cursor.addRow(new Object[]{-3, prefix + ":" + getString(R.string.title_search_special_snoozed)});
SimpleCursorAdapter adapter = new SimpleCursorAdapter(
getContext(),
R.layout.search_suggestion,
cursor,
new String[]{"suggestion"},
new int[]{android.R.id.text1},
0);
searchView.setSuggestionsAdapter(adapter);
adapter.notifyDataSetChanged();
} else {
Bundle args = new Bundle();
args.putString("query", newText);
new SimpleTask<Cursor>() { new SimpleTask<Cursor>() {
@Override @Override
protected Cursor onExecute(Context context, Bundle args) { protected Cursor onExecute(Context context, Bundle args) {
String query = args.getString("query"); String query = args.getString("query");
DB db = DB.getInstance(context); DB db = DB.getInstance(context);
return db.message().getSuggestions("%" + query + "%"); return db.message().getSuggestions("%" + query + "%");
} }
@Override @Override
protected void onExecuted(Bundle args, Cursor cursor) { protected void onExecuted(Bundle args, Cursor cursor) {
Log.i("Suggestions=" + cursor.getCount()); Log.i("Suggestions=" + cursor.getCount());
SimpleCursorAdapter adapter = new SimpleCursorAdapter( SimpleCursorAdapter adapter = new SimpleCursorAdapter(
getContext(), getContext(),
R.layout.search_suggestion, R.layout.search_suggestion,
cursor, cursor,
new String[]{"suggestion"}, new String[]{"suggestion"},
new int[]{android.R.id.text1}, new int[]{android.R.id.text1},
0); 0);
searchView.setSuggestionsAdapter(adapter); searchView.setSuggestionsAdapter(adapter);
adapter.notifyDataSetChanged(); adapter.notifyDataSetChanged();
} }
@Override @Override
protected void onException(Bundle args, Throwable ex) { protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(getFragmentManager(), ex); Helper.unexpectedError(getFragmentManager(), ex);
} }
}.execute(FragmentMessages.this, args, "messages:suggestions"); }.execute(FragmentMessages.this, args, "messages:suggestions");
}
return true; return true;
} }

5
app/src/main/res/values/strings.xml
Unescape View File

@ -783,6 +783,11 @@
<string name="title_crash_info_remark">Please describe what you were doing when the app crashed:</string> <string name="title_crash_info_remark">Please describe what you were doing when the app crashed:</string>
<string name="title_issue_subject" translatable="false">FairEmail %1$s issue</string> <string name="title_issue_subject" translatable="false">FairEmail %1$s issue</string>
<string name="title_search_special_prefix">special</string>
<string name="title_search_special_unseen">unread</string>
<string name="title_search_special_flagged">starred</string>
<string name="title_search_special_snoozed">snoozed</string>
<string-array name="pollIntervalNames"> <string-array name="pollIntervalNames">
<item>Always</item> <item>Always</item>
<item>Every 15 minutes</item> <item>Every 15 minutes</item>

Write Preview
Loading…
Cancel
Save