disable recycle bin showing if the user tries to hide or exclude it
This commit is contained in:
parent
a8ea2ddbd8
commit
61d83750aa
1 changed files with 20 additions and 2 deletions
|
@ -192,7 +192,16 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: ArrayList<Directo
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun toggleFoldersVisibility(hide: Boolean) {
|
private fun toggleFoldersVisibility(hide: Boolean) {
|
||||||
getSelectedPaths().filter { it != FAVORITES && it != RECYCLE_BIN }.forEach {
|
val selectedPaths = getSelectedPaths()
|
||||||
|
if (hide && selectedPaths.contains(RECYCLE_BIN)) {
|
||||||
|
config.showRecycleBinAtFolders = false
|
||||||
|
if (selectedPaths.size == 1) {
|
||||||
|
listener?.refreshItems()
|
||||||
|
finishActMode()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
selectedPaths.filter { it != FAVORITES && it != RECYCLE_BIN }.forEach {
|
||||||
val path = it
|
val path = it
|
||||||
if (hide) {
|
if (hide) {
|
||||||
if (config.wasHideFolderTooltipShown) {
|
if (config.wasHideFolderTooltipShown) {
|
||||||
|
@ -297,7 +306,16 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: ArrayList<Directo
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun tryExcludeFolder() {
|
private fun tryExcludeFolder() {
|
||||||
val paths = getSelectedPaths().filter { it != PATH && it != RECYCLE_BIN && it != FAVORITES }.toSet()
|
val selectedPaths = getSelectedPaths()
|
||||||
|
val paths = selectedPaths.filter { it != PATH && it != RECYCLE_BIN && it != FAVORITES }.toSet()
|
||||||
|
if (selectedPaths.contains(RECYCLE_BIN)) {
|
||||||
|
config.showRecycleBinAtFolders = false
|
||||||
|
if (selectedPaths.size == 1) {
|
||||||
|
listener?.refreshItems()
|
||||||
|
finishActMode()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (paths.size == 1) {
|
if (paths.size == 1) {
|
||||||
ExcludeFolderDialog(activity, paths.toMutableList()) {
|
ExcludeFolderDialog(activity, paths.toMutableList()) {
|
||||||
listener?.refreshItems()
|
listener?.refreshItems()
|
||||||
|
|
Loading…
Reference in a new issue