From 616992087846fe76555080baf131637924b67507 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Wed, 8 Jul 2020 01:25:55 +0530 Subject: global: set an import order rule and reformat with it (#924) Signed-off-by: Harsh Shandilya --- .../java/com/zeapo/pwdstore/SearchableRepositoryViewModel.kt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'app/src/main/java/com/zeapo/pwdstore/SearchableRepositoryViewModel.kt') diff --git a/app/src/main/java/com/zeapo/pwdstore/SearchableRepositoryViewModel.kt b/app/src/main/java/com/zeapo/pwdstore/SearchableRepositoryViewModel.kt index 19ba866e..4d713afa 100644 --- a/app/src/main/java/com/zeapo/pwdstore/SearchableRepositoryViewModel.kt +++ b/app/src/main/java/com/zeapo/pwdstore/SearchableRepositoryViewModel.kt @@ -31,6 +31,10 @@ import com.zeapo.pwdstore.autofill.oreo.DirectoryStructure import com.zeapo.pwdstore.utils.PasswordItem import com.zeapo.pwdstore.utils.PasswordRepository import com.zeapo.pwdstore.utils.PreferenceKeys +import java.io.File +import java.text.Collator +import java.util.Locale +import java.util.Stack import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.FlowPreview @@ -45,10 +49,6 @@ import kotlinx.coroutines.flow.mapLatest import kotlinx.coroutines.flow.toList import kotlinx.coroutines.yield import me.zhanghai.android.fastscroll.PopupTextProvider -import java.io.File -import java.text.Collator -import java.util.Locale -import java.util.Stack private fun File.toPasswordItem(root: File) = if (isFile) PasswordItem.newPassword(name, this, root) @@ -380,6 +380,7 @@ class SearchableRepositoryViewModel(application: Application) : AndroidViewModel } private object PasswordItemDiffCallback : DiffUtil.ItemCallback() { + override fun areItemsTheSame(oldItem: PasswordItem, newItem: PasswordItem) = oldItem.file.absolutePath == newItem.file.absolutePath -- cgit v1.2.3