gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-19 02:35:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

RemoteFileBrowser: fix file filtering and move it to viewmodel

Browse Source 
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
This commit is contained in:
Álvaro Brey 2022-06-06 17:40:35 +02:00 committed by Andy Scherzinger
parent 9d4745ee9b
commit 2fd97856d8
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/nextcloud/talk/remotefilebrowser/activities/RemoteFileBrowserActivity.kt
View File

@ -139,11 +139,7 @@ class RemoteFileBrowserActivity : AppCompatActivity(), SelectionInterface, Swipe
onItemClicked(remoteFileBrowserItem)
}
.apply {
items = if (remoteFileBrowserItems.size > 1) {
remoteFileBrowserItems.subList(1, remoteFileBrowserItems.size)
} else {
ArrayList()
}
items = remoteFileBrowserItems
}
binding.recyclerView.adapter = adapter

5
app/src/main/java/com/nextcloud/talk/remotefilebrowser/viewmodels/RemoteFileBrowserItemsViewModel.kt
View File

@ -88,7 +88,8 @@ class RemoteFileBrowserItemsViewModel @Inject constructor(
override fun onSubscribe(d: Disposable) = Unit
override fun onNext(response: List<RemoteFileBrowserItem>) {
newRemoteFileBrowserItems = fileSortOrder.value!!.sortCloudFiles(response)
val itemsWithoutRoot = response.filterNot { it.mimeType == MIME_DIRECTORY && it.path == ROOT_PATH }
newRemoteFileBrowserItems = fileSortOrder.value!!.sortCloudFiles(itemsWithoutRoot)
}
override fun onError(e: Throwable) {
@ -127,5 +128,7 @@ class RemoteFileBrowserItemsViewModel @Inject constructor(
companion object {
private val TAG = RemoteFileBrowserItemsViewModel::class.simpleName
private const val ROOT_PATH = "/"
private const val MIME_DIRECTORY = "inode/directory"
}
}