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

Verify nullity of group

Browse Source
This commit is contained in:
J-Jamet
2018-03-22 16:48:02 +01:00
parent 49ba74c38f
commit 33404add38
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/com/keepassdroid/activities/GroupActivity.java
View File

@@ -189,12 +189,13 @@ public class GroupActivity extends ListNodesActivity
currentGroup = db.pm.groups.get(pwGroupId); currentGroup = db.pm.groups.get(pwGroupId);
} }
addGroupEnabled = !readOnly; if (currentGroup != null) {
addEntryEnabled = !readOnly; addGroupEnabled = !readOnly;
addEntryEnabled = !readOnly; // TODO ReadOnly
isRoot = (currentGroup == root); isRoot = (currentGroup == root);
if ( !currentGroup.allowAddEntryIfIsRoot() ) if (!currentGroup.allowAddEntryIfIsRoot())
addEntryEnabled = !isRoot && addEntryEnabled; addEntryEnabled = !isRoot && addEntryEnabled;
}
return currentGroup; return currentGroup;
} }

1
app/src/main/java/com/keepassdroid/activities/ListNodesActivity.java
View File

@@ -299,6 +299,7 @@ public abstract class ListNodesActivity extends LockingActivity
PwGroup recycleBin = database.getRecycleBin(); PwGroup recycleBin = database.getRecycleBin();
// Add trash if it doesn't exists // Add trash if it doesn't exists
if (parent.equals(recycleBin) if (parent.equals(recycleBin)
&& mCurrentGroup != null
&& mCurrentGroup.getParent() == null && mCurrentGroup.getParent() == null
&& !mCurrentGroup.equals(recycleBin)) { && !mCurrentGroup.equals(recycleBin)) {
mAdapter.addNode(parent); mAdapter.addNode(parent);