From fa90155195e3332244da4985c278c692756310b5 Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Thu, 28 Apr 2022 11:40:03 +0200 Subject: [PATCH] hide location and deck for now because other fileParameters need to be handled Signed-off-by: Marcel Hibbe --- .../talk/activities/SharedItemsActivity.kt | 12 +++---- .../talk/viewmodels/SharedItemsViewModel.kt | 31 +++++++++++-------- 2 files changed, 24 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/activities/SharedItemsActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/SharedItemsActivity.kt index 96334101b..6f1a80494 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/SharedItemsActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/activities/SharedItemsActivity.kt @@ -75,17 +75,17 @@ class SharedItemsActivity : AppCompatActivity() { tabAudio.text = "audio" binding.sharedItemsTabs.addTab(tabAudio) - val tabDeckcard: TabLayout.Tab = binding.sharedItemsTabs.newTab() - tabDeckcard.text = "deckcard" - binding.sharedItemsTabs.addTab(tabDeckcard) + // val tabDeckcard: TabLayout.Tab = binding.sharedItemsTabs.newTab() + // tabDeckcard.text = "deckcard" + // binding.sharedItemsTabs.addTab(tabDeckcard) val tabFile: TabLayout.Tab = binding.sharedItemsTabs.newTab() tabFile.text = "file" binding.sharedItemsTabs.addTab(tabFile) - val tabLocation: TabLayout.Tab = binding.sharedItemsTabs.newTab() - tabLocation.text = "location" - binding.sharedItemsTabs.addTab(tabLocation) + // val tabLocation: TabLayout.Tab = binding.sharedItemsTabs.newTab() + // tabLocation.text = "location" + // binding.sharedItemsTabs.addTab(tabLocation) val tabMedia: TabLayout.Tab = binding.sharedItemsTabs.newTab() tabMedia.text = "media" diff --git a/app/src/main/java/com/nextcloud/talk/viewmodels/SharedItemsViewModel.kt b/app/src/main/java/com/nextcloud/talk/viewmodels/SharedItemsViewModel.kt index a64c49d2e..78d1faa6a 100644 --- a/app/src/main/java/com/nextcloud/talk/viewmodels/SharedItemsViewModel.kt +++ b/app/src/main/java/com/nextcloud/talk/viewmodels/SharedItemsViewModel.kt @@ -46,21 +46,26 @@ class SharedItemsViewModel(private val repository: SharedItemsRepository, val in val mediaItems = response.body()!!.ocs!!.data mediaItems?.forEach { - val fileParameters = it.value.messageParameters["file"]!! + if (it.value.messageParameters.containsKey("file")) { + val fileParameters = it.value.messageParameters["file"]!! - val previewAvailable = "yes".equals(fileParameters["preview-available"]!!, ignoreCase = true) + val previewAvailable = "yes".equals(fileParameters["preview-available"]!!, ignoreCase = true) + + items[it.value.id] = SharedItem( + fileParameters["id"]!!, + fileParameters["name"]!!, + fileParameters["size"]!!.toInt(), + fileParameters["path"]!!, + fileParameters["link"]!!, + fileParameters["mimetype"]!!, + previewAvailable, + repository.previewLink(fileParameters["id"]), + repository.parameters!!.userEntity + ) + } else { + Log.w(TAG, "location and deckcard are not yet supported") + } - items[it.value.id] = SharedItem( - fileParameters["id"]!!, - fileParameters["name"]!!, - fileParameters["size"]!!.toInt(), - fileParameters["path"]!!, - fileParameters["link"]!!, - fileParameters["mimetype"]!!, - previewAvailable, - repository.previewLink(fileParameters["id"]), - repository.parameters!!.userEntity - ) } }