1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2024-12-28 02:37:16 +00:00

Clear task on search by scheme

This commit is contained in:
M66B 2021-08-13 14:39:52 +02:00
parent 86f247ed02
commit 207f61d9c3

View file

@ -37,14 +37,17 @@ public class ActivitySearch extends ActivityBase {
CharSequence query; CharSequence query;
Uri uri = getIntent().getData(); Uri uri = getIntent().getData();
if (uri == null || !SEARCH_SCHEME.equals(uri.getScheme())) boolean external = (uri != null && SEARCH_SCHEME.equals(uri.getScheme()));
query = getIntent().getCharSequenceExtra(Intent.EXTRA_PROCESS_TEXT); if (external)
else
query = Uri.decode(uri.toString().substring(SEARCH_SCHEME.length() + 1)); query = Uri.decode(uri.toString().substring(SEARCH_SCHEME.length() + 1));
else
query = getIntent().getCharSequenceExtra(Intent.EXTRA_PROCESS_TEXT);
Log.i("External search query=" + query); Log.i("External search query=" + query);
Intent view = new Intent(this, ActivityView.class); Intent view = new Intent(this, ActivityView.class)
view.putExtra(Intent.EXTRA_PROCESS_TEXT, query); .putExtra(Intent.EXTRA_PROCESS_TEXT, query);
if (external)
view.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
startActivity(view); startActivity(view);
finish(); finish();