mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-25 22:55:46 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix

Browse source 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
This commit is contained in:
alperozturk 2024-06-25 10:58:44 +02:00 committed by Alper Öztürk
parent 46525cc350
commit 55555e7159
2 changed files with 4 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/owncloud/android/ui/unifiedsearch/SearchOnProviderTask.kt
View file

@ -16,7 +16,7 @@ class SearchOnProviderTask(
private val provider: String,
private val client: NextcloudClient,
private val cursor: Int? = null,
private val limit: Int = 6
private val limit: Int = 5
) : () -> SearchOnProviderTask.Result {
companion object {
private const val TAG = "SearchOnProviderTask"

17
app/src/main/java/com/owncloud/android/ui/unifiedsearch/UnifiedSearchViewModel.kt
View file

@ -30,7 +30,6 @@ import javax.inject.Inject
class UnifiedSearchViewModel(application: Application) : AndroidViewModel(application), IUnifiedSearchViewModel {
companion object {
private const val TAG = "UnifiedSearchViewModel"
private const val DEFAULT_LIMIT = 5
private const val FILES_PROVIDER_ID = "files"
}
@ -39,17 +38,6 @@ class UnifiedSearchViewModel(application: Application) : AndroidViewModel(applic
) {
fun nextCursor(): Int? = results.lastOrNull()?.cursor?.toInt()
fun name(): String? = results.lastOrNull()?.name
fun isFinished(): Boolean {
if (results.isEmpty()) {
return false
}
val lastResult = results.last()
return when {
!lastResult.isPaginated -> true
lastResult.entries.size < DEFAULT_LIMIT -> true
else -> false
}
}
}
private lateinit var currentAccountProvider: CurrentAccountProvider
@ -62,7 +50,6 @@ class UnifiedSearchViewModel(application: Application) : AndroidViewModel(applic
get() = getApplication<Application>().applicationContext
private lateinit var repository: IUnifiedSearchRepository
private var loadingStarted: Boolean = false
private var results: MutableMap<ProviderID, UnifiedSearchMetadata> = mutableMapOf()
override val isLoading = MutableLiveData(false)
@ -201,11 +188,13 @@ class UnifiedSearchViewModel(application: Application) : AndroidViewModel(applic
searchResults.value = results
.filter { it.value.results.isNotEmpty() }
.map { (key, value) ->
val hasMoreResults = results.isNotEmpty() && results[key]?.nextCursor() != null
UnifiedSearchSection(
providerID = key,
name = value.name()!!,
entries = value.results.flatMap { it.entries },
hasMoreResults = !value.isFinished()
hasMoreResults = hasMoreResults
)
}
.sortedWith { o1, o2 ->