Workaround for missing action view

Refs #2037
M66B · Oct 20, 2014 · 3842b9d · 3842b9d
1 parent b1eddc9
commit 3842b9d
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,6 +26,8 @@ See for more information about XPrivacy 3 [this FAQ](https://github.com/M66B/XPr
 
 **Next release**
 
+* Workaround for missing action view ([issue](/../../issues/2037))
+
 [Open issues](https://github.com/M66B/XPrivacy/issues?state=open)
 
 **Version 3.4.4 TEST**

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