From 924443479ee80d57d6963a4c7093636bdab8129d Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Fri, 11 Sep 2020 15:02:12 +0530 Subject: Correctly count children in password list (#1095) --- .../zeapo/pwdstore/ui/adapters/PasswordItemRecyclerAdapter.kt | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/app/src/main/java/com/zeapo/pwdstore/ui/adapters/PasswordItemRecyclerAdapter.kt b/app/src/main/java/com/zeapo/pwdstore/ui/adapters/PasswordItemRecyclerAdapter.kt index 2915efb4..38315876 100644 --- a/app/src/main/java/com/zeapo/pwdstore/ui/adapters/PasswordItemRecyclerAdapter.kt +++ b/app/src/main/java/com/zeapo/pwdstore/ui/adapters/PasswordItemRecyclerAdapter.kt @@ -17,9 +17,6 @@ import com.zeapo.pwdstore.R import com.zeapo.pwdstore.SearchableRepositoryAdapter import com.zeapo.pwdstore.stableId import com.zeapo.pwdstore.utils.PasswordItem -import com.zeapo.pwdstore.utils.PreferenceKeys -import com.zeapo.pwdstore.utils.sharedPrefs -import java.io.File open class PasswordItemRecyclerAdapter : SearchableRepositoryAdapter( @@ -49,8 +46,6 @@ open class PasswordItemRecyclerAdapter : lateinit var itemDetails: ItemDetailsLookup.ItemDetails fun bind(item: PasswordItem) { - val settings = itemView.context.sharedPrefs - val showHidden = settings.getBoolean(PreferenceKeys.SHOW_HIDDEN_CONTENTS, false) val parentPath = item.fullPathToParent.replace("(^/)|(/$)".toRegex(), "") val source = if (parentPath.isNotEmpty()) { "$parentPath\n$item" @@ -62,10 +57,7 @@ open class PasswordItemRecyclerAdapter : name.text = spannable if (item.type == PasswordItem.TYPE_CATEGORY) { folderIndicator.visibility = View.VISIBLE - val children = with(item.file) { - if (showHidden) listFiles() else listFiles { pathname -> pathname.isDirectory && !pathname.isHidden } - } ?: emptyArray() - val count = children.size + val count = item.file.listFiles { path -> path.isDirectory || path.extension == "gpg" }?.size ?: 0 childCount.visibility = if (count > 0) View.VISIBLE else View.GONE childCount.text = "$count" } else { -- cgit v1.2.3