rixxc/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-12-04 15:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Prevent crash on preference reading.

Browse Source
This commit is contained in:
Brian Pellin
2016-10-31 21:02:48 -05:00
parent b93dd9a699
commit 3d474f0642
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/com/keepassdroid/GroupBaseActivity.java
View File

@@ -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 ) {