diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt index 48ae8fbc5..44bd88a1e 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt @@ -646,6 +646,12 @@ class GroupActivity : LockingActivity(), MenuUtil.contributionMenuInflater(inflater, menu) } + // Menu for recycle bin + if (mDatabase?.isRecycleBinEnabled == true + && mDatabase?.recycleBin == mCurrentGroup) { + inflater.inflate(R.menu.recycle_bin, menu) + } + // Get the SearchView and set the searchable configuration val searchManager = getSystemService(Context.SEARCH_SERVICE) as SearchManager @@ -754,6 +760,13 @@ class GroupActivity : LockingActivity(), lockAndExit() return true } + R.id.menu_empty_recycle_bin -> { + mCurrentGroup?.getChildren()?.let { listChildren -> + // Automatically delete all elements + onDeleteMenuClick(listChildren) + } + return true + } else -> { // Check the time lock before launching settings MenuUtil.onDefaultMenuOptionsItemSelected(this, item, mReadOnly, true) diff --git a/app/src/main/res/menu/recycle_bin.xml b/app/src/main/res/menu/recycle_bin.xml new file mode 100644 index 000000000..1b6cc50a1 --- /dev/null +++ b/app/src/main/res/menu/recycle_bin.xml @@ -0,0 +1,10 @@ + +
\ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c7a084fa0..f54c8efec 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -183,6 +183,7 @@