From 6a3f3a6a07a575923b50bcd095f001f1691bfcde Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Thu, 15 Oct 2026 13:54:52 +0200 Subject: [PATCH 1/2] set unread comment counts to 0 after MarkCommentsAsReadRemoteOperation Signed-off-by: alperozturk96 --- .../android/ui/fragment/FileDetailActivitiesFragment.kt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailActivitiesFragment.kt b/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailActivitiesFragment.kt index 1ff1e5ff0b7a..bfb11aac5a3e 100644 --- a/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailActivitiesFragment.kt +++ b/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailActivitiesFragment.kt @@ -378,10 +378,15 @@ class FileDetailActivitiesFragment : return } val client = ownCloudClient + val storageManager = FileDataStorageManager(user, contentResolver) lifecycleScope.launch(Dispatchers.IO) { val result = MarkCommentsAsReadRemoteOperation(file.localId).execute(client) if (result.isSuccess) { + storageManager.getFileById(file.fileId)?.let { storedFile -> + storedFile.unreadCommentsCount = 0 + storageManager.saveFile(storedFile) + } EventBus.getDefault().post(CommentsEvent(file.remoteId)) } } From 1e181346d2ae5bad2a2362ab2cbe418d73bc76e0 Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Thu, 15 Oct 2026 14:05:26 +0200 Subject: [PATCH 2/2] simplify fileSizeText logic Signed-off-by: alperozturk96 --- .../adapter/filelist/item/OCFileListItemBinder.kt | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/filelist/item/OCFileListItemBinder.kt b/app/src/main/java/com/owncloud/android/ui/adapter/filelist/item/OCFileListItemBinder.kt index 6aba9f710d3e..98e57aecfeba 100644 --- a/app/src/main/java/com/owncloud/android/ui/adapter/filelist/item/OCFileListItemBinder.kt +++ b/app/src/main/java/com/owncloud/android/ui/adapter/filelist/item/OCFileListItemBinder.kt @@ -205,15 +205,13 @@ internal class OCFileListItemBinder( } private fun fileSizeText(file: OCFile, size: Long, storageManager: FileDataStorageManager): String { - if (!file.isOfflineOperation) { - return HumanReadableFormatter.formatBytes(size) - } + val descriptionRes = when { + storageManager.getOfflineEntityFromOCFile(file)?.type is OfflineOperationType.RemoveFile -> + R.string.oc_file_list_adapter_offline_operation_remove_description_text - val isRemoveOperation = storageManager.getOfflineEntityFromOCFile(file)?.type is OfflineOperationType.RemoveFile - val descriptionRes = if (isRemoveOperation) { - R.string.oc_file_list_adapter_offline_operation_remove_description_text - } else { - R.string.oc_file_list_adapter_offline_operation_description_text + file.isOfflineOperation -> R.string.oc_file_list_adapter_offline_operation_description_text + + else -> return HumanReadableFormatter.formatBytes(size) } return activity.getString(descriptionRes) }