nicolabs/Android-Password-Store
1
0
Fork 0
mirror of https://github.com/android-password-store/Android-Password-Store.git synced 2025-09-07 16:09:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Always refresh password list when navigating back (#701)

Browse source
This commit is contained in:
Fabian Henneke 2020-04-14 10:35:06 +02:00 committed by GitHub
parent b82303d5dd
commit ef0cc9f047
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
app/src/main/java/com/zeapo/pwdstore/SearchableRepositoryViewModel.kt
View file

@ -43,7 +43,6 @@ import kotlinx.coroutines.flow.emptyFlow
import kotlinx.coroutines.flow.filter import kotlinx.coroutines.flow.filter
import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.mapLatest import kotlinx.coroutines.flow.mapLatest
import kotlinx.coroutines.flow.merge
import kotlinx.coroutines.flow.toList import kotlinx.coroutines.flow.toList
import kotlinx.coroutines.yield import kotlinx.coroutines.yield
import me.zhanghai.android.fastscroll.PopupTextProvider import me.zhanghai.android.fastscroll.PopupTextProvider
@ -197,7 +196,7 @@ class SearchableRepositoryViewModel(application: Application) : AndroidViewModel
data class SearchResult(val passwordItems: List<PasswordItem>, val isFiltered: Boolean) data class SearchResult(val passwordItems: List<PasswordItem>, val isFiltered: Boolean)
private val newResultFlow = searchActionFlow val searchResult = searchActionFlow
.mapLatest { searchAction -> .mapLatest { searchAction ->
val listResultFlow = when (searchAction.searchMode) { val listResultFlow = when (searchAction.searchMode) {
SearchMode.RecursivelyInSubdirectories -> listFilesRecursively(searchAction.baseDirectory) SearchMode.RecursivelyInSubdirectories -> listFilesRecursively(searchAction.baseDirectory)
@ -251,7 +250,7 @@ class SearchableRepositoryViewModel(application: Application) : AndroidViewModel
} }
} }
SearchResult(passwordList, isFiltered = searchAction.filterMode != FilterMode.NoFilter) SearchResult(passwordList, isFiltered = searchAction.filterMode != FilterMode.NoFilter)
} }.asLiveData(Dispatchers.IO)
private fun shouldTake(file: File) = with(file) { private fun shouldTake(file: File) = with(file) {
if (isDirectory) { if (isDirectory) {
@ -276,18 +275,10 @@ class SearchableRepositoryViewModel(application: Application) : AndroidViewModel
.filter { file -> shouldTake(file) } .filter { file -> shouldTake(file) }
} }
private val cachedResult = MutableLiveData<SearchResult>()
val searchResult =
listOf(newResultFlow, cachedResult.asFlow()).merge().asLiveData(Dispatchers.IO)
private val _currentDir = MutableLiveData(root) private val _currentDir = MutableLiveData(root)
val currentDir = _currentDir as LiveData<File> val currentDir = _currentDir as LiveData<File>
data class NavigationStackEntry( data class NavigationStackEntry(val dir: File, val recyclerViewState: Parcelable?)
val dir: File,
val items: List<PasswordItem>?,
val recyclerViewState: Parcelable?
)
private val navigationStack = Stack<NavigationStackEntry>() private val navigationStack = Stack<NavigationStackEntry>()
@ -299,25 +290,7 @@ class SearchableRepositoryViewModel(application: Application) : AndroidViewModel
) { ) {
require(newDirectory.isDirectory) { "Can only navigate to a directory" } require(newDirectory.isDirectory) { "Can only navigate to a directory" }
if (pushPreviousLocation) { if (pushPreviousLocation) {
// We cache the current list entries only if the current list has not been filtered, navigationStack.push(NavigationStackEntry(_currentDir.value!!, recyclerViewState))
// otherwise it will be regenerated when moving back.
if (searchAction.value?.filterMode == FilterMode.NoFilter) {
navigationStack.push(
NavigationStackEntry(
_currentDir.value!!,
searchResult.value?.passwordItems,
recyclerViewState
)
)
} else {
navigationStack.push(
NavigationStackEntry(
_currentDir.value!!,
null,
recyclerViewState
)
)
}
} }
searchAction.postValue( searchAction.postValue(
makeSearchAction( makeSearchAction(
@ -335,23 +308,16 @@ class SearchableRepositoryViewModel(application: Application) : AndroidViewModel
get() = navigationStack.isNotEmpty() get() = navigationStack.isNotEmpty()
/** /**
* Navigate back to the last location on the [navigationStack] using a cached list of entries * Navigate back to the last location on the [navigationStack] and restore a cached scroll
* if possible. * position if possible.
* *
* Returns the old RecyclerView's LinearLayoutManager state as a [Parcelable] if it was cached. * Returns the old RecyclerView's LinearLayoutManager state as a [Parcelable] if it was cached.
*/ */
fun navigateBack(): Parcelable? { fun navigateBack(): Parcelable? {
if (!canNavigateBack) return null if (!canNavigateBack) return null
val (oldDir, oldPasswordItems, oldRecyclerViewState) = navigationStack.pop() val (oldDir, oldRecyclerViewState) = navigationStack.pop()
return if (oldPasswordItems != null) {
// We cached the contents of oldDir and restore them directly without file operations.
cachedResult.postValue(SearchResult(oldPasswordItems, isFiltered = false))
_currentDir.postValue(oldDir)
oldRecyclerViewState
} else {
navigateTo(oldDir, pushPreviousLocation = false) navigateTo(oldDir, pushPreviousLocation = false)
null return oldRecyclerViewState
}
} }
fun reset() { fun reset() {