Workaround missing search view

Refs #2037
M66B · Oct 20, 2014 · 63cbc35 · 63cbc35
1 parent b1eddc9
commit 63cbc35
Showing 1 changed file with 24 additions and 22 deletions.
diff --git a/src/biz/bokhorst/xprivacy/ActivityMain.java b/src/biz/bokhorst/xprivacy/ActivityMain.java
@@ -485,29 +485,31 @@ public boolean onCreateOptionsMenu(Menu menu) {
 
 			// Searchable
 			SearchView searchView = (SearchView) menu.findItem(R.id.menu_search).getActionView();
-			searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
-				@Override
-				public boolean onQueryTextChange(String newText) {
-					searchQuery = newText;
-					applyFilter();
-					return true;
-				}
+			if (searchView != null) {
+				searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
+					@Override
+					public boolean onQueryTextChange(String newText) {
+						searchQuery = newText;
+						applyFilter();
+						return true;
+					}
 
-				@Override
-				public boolean onQueryTextSubmit(String query) {
-					searchQuery = query;
-					applyFilter();
-					return true;
-				}
-			});
-			searchView.setOnCloseListener(new SearchView.OnCloseListener() {
-				@Override
-				public boolean onClose() {
-					searchQuery = "";
-					applyFilter();
-					return true;
-				}
-			});
+					@Override
+					public boolean onQueryTextSubmit(String query) {
+						searchQuery = query;
+						applyFilter();
+						return true;
+					}
+				});
+				searchView.setOnCloseListener(new SearchView.OnCloseListener() {
+					@Override
+					public boolean onClose() {
+						searchQuery = "";
+						applyFilter();
+						return true;
+					}
+				});
+			}
 
 			return true;
 		} else