Place the 'Recycle Bin' at the bottom of the list when groups are sor…

…ted. (#7004) Co-authored-by: Gaurav Pruthi <[email protected]>
keepassxreboot · Oct 2, 2021 · 6c18b10 · 6c18b10
1 parent 2514c1d
commit 6c18b10
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/src/core/Group.cpp b/src/core/Group.cpp
@@ -1155,13 +1155,18 @@ void Group::applyGroupIconToChildEntries()
 
 void Group::sortChildrenRecursively(bool reverse)
 {
-    std::sort(
-        m_children.begin(), m_children.end(), [reverse](const Group* childGroup1, const Group* childGroup2) -> bool {
-            QString name1 = childGroup1->name();
-            QString name2 = childGroup2->name();
-            return reverse ? name1.compare(name2, Qt::CaseInsensitive) > 0
-                           : name1.compare(name2, Qt::CaseInsensitive) < 0;
-        });
+    Group* recycleBin = nullptr;
+    if (database()) {
+        recycleBin = database()->metadata()->recycleBin();
+    }
+    std::sort(m_children.begin(), m_children.end(), [=](const Group* childGroup1, const Group* childGroup2) -> bool {
+        if (childGroup1 == recycleBin) {
+            return false;
+        }
+        QString name1 = childGroup1->name();
+        QString name2 = childGroup2->name();
+        return reverse ? name1.compare(name2, Qt::CaseInsensitive) > 0 : name1.compare(name2, Qt::CaseInsensitive) < 0;
+    });
 
     for (auto child : m_children) {
         child->sortChildrenRecursively(reverse);