Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Queue pending search until the SearchView is inflated.

Browse Source
This commit is contained in:
Peter Serwylo 2015-12-08 00:20:20 +11:00
parent 7b5160df47
commit 829e8f1058
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
F-Droid/src/org/fdroid/fdroid/FDroid.java
View File

@ -79,6 +79,9 @@ public class FDroid extends AppCompatActivity implements SearchView.OnQueryTextL
@Nullable @Nullable
private MenuItem searchMenuItem; private MenuItem searchMenuItem;
@Nullable
private String pendingSearchQuery;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
@ -123,7 +126,8 @@ public class FDroid extends AppCompatActivity implements SearchView.OnQueryTextL
private void performSearch(String query) { private void performSearch(String query) {
if (searchMenuItem == null) { if (searchMenuItem == null) {
Log.e(TAG, "Tried to search, but search view has not yet been created."); // Store this for later when we do actually have a search menu ready to use.
pendingSearchQuery = query;
return; return;
} }
@ -288,6 +292,11 @@ public class FDroid extends AppCompatActivity implements SearchView.OnQueryTextL
searchView.setMaxWidth(1000000); searchView.setMaxWidth(1000000);
searchView.setOnQueryTextListener(this); searchView.setOnQueryTextListener(this);
if (pendingSearchQuery != null) {
performSearch(pendingSearchQuery);
pendingSearchQuery = null;
}
return super.onCreateOptionsMenu(menu); return super.onCreateOptionsMenu(menu);
} }