From 3d474f0642ce1732933dc0dc1be89ebe4ea2ef3e Mon Sep 17 00:00:00 2001
From: Brian Pellin <bpellin@gmail.com>
Date: Mon, 31 Oct 2016 21:02:48 -0500
Subject: [PATCH] Prevent crash on preference reading.

---
 .../main/java/com/keepassdroid/GroupBaseActivity.java | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/keepassdroid/GroupBaseActivity.java b/app/src/main/java/com/keepassdroid/GroupBaseActivity.java
index 28c53f640..f291a32eb 100644
--- a/app/src/main/java/com/keepassdroid/GroupBaseActivity.java
+++ b/app/src/main/java/com/keepassdroid/GroupBaseActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009-2012 Brian Pellin.
+ * Copyright 2009-2016 Brian Pellin.
  *     
  * This file is part of KeePassDroid.
  *
@@ -96,7 +96,7 @@ public abstract class GroupBaseActivity extends LockCloseListActivity {
 		
 		prefs = PreferenceManager.getDefaultSharedPreferences(this);
 
-
+		ActivityCompat.invalidateOptionsMenu(this);
 
 		setContentView(new GroupViewOnlyView(this));
 		setResult(KeePass.EXIT_NORMAL);
@@ -148,7 +148,12 @@ public abstract class GroupBaseActivity extends LockCloseListActivity {
 	}
 
 	private void setSortMenuText(Menu menu) {
-		boolean sortByName = prefs.getBoolean(getString(R.string.sort_key), getResources().getBoolean(R.bool.sort_default));
+		boolean sortByName = false;
+
+		// Will be null if onPrepareOptionsMenu is called before onCreate
+		if (prefs != null) {
+			sortByName = prefs.getBoolean(getString(R.string.sort_key), getResources().getBoolean(R.bool.sort_default));
+		}
 		
 		int resId;
 		if ( sortByName ) {