From 1e747d4567cf4b45e75a3395facc857e5bd10077 Mon Sep 17 00:00:00 2001 From: daniele-verducci Date: Thu, 5 Nov 2026 18:09:57 +0100 Subject: [PATCH 1/3] Reset search type to avoid share button to stay hidden when going back to normal files list Signed-off-by: daniele-verducci --- .../owncloud/android/ui/adapter/filelist/OCFileListAdapter.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/filelist/OCFileListAdapter.kt b/app/src/main/java/com/owncloud/android/ui/adapter/filelist/OCFileListAdapter.kt index ffc32e108c7b..ea29b50c3bcd 100644 --- a/app/src/main/java/com/owncloud/android/ui/adapter/filelist/OCFileListAdapter.kt +++ b/app/src/main/java/com/owncloud/android/ui/adapter/filelist/OCFileListAdapter.kt @@ -283,6 +283,7 @@ class OCFileListAdapter( onSwapped: () -> Unit ) { this.onlyOnDevice = onlyOnDevice + searchType = null if (storageManager != this.storageManager) { this.storageManager = storageManager From 6393f3368b1f9ca9995374a631d6c0288d7e1038 Mon Sep 17 00:00:00 2001 From: daniele-verducci Date: Thu, 5 Nov 2026 18:10:54 +0100 Subject: [PATCH 2/3] Do not hide share button at all in favorites Signed-off-by: daniele-verducci --- .../owncloud/android/ui/adapter/filelist/OCFileListAdapter.kt | 2 +- .../android/ui/adapter/filelist/item/OCFileListDelegate.kt | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/filelist/OCFileListAdapter.kt b/app/src/main/java/com/owncloud/android/ui/adapter/filelist/OCFileListAdapter.kt index ea29b50c3bcd..17f0d47fa5f5 100644 --- a/app/src/main/java/com/owncloud/android/ui/adapter/filelist/OCFileListAdapter.kt +++ b/app/src/main/java/com/owncloud/android/ui/adapter/filelist/OCFileListAdapter.kt @@ -623,7 +623,7 @@ class OCFileListAdapter( } private fun bindFile(holder: ListViewHolder, file: OCFile) { - ocFileListDelegate.bindViewHolder(holder, file, currentDirectory, searchType, thumbnailGenerator) + ocFileListDelegate.bindViewHolder(holder, file, currentDirectory, thumbnailGenerator) if (holder is ListItemViewHolder) { itemBinder.bindDetails(holder, file, user, storageManager, shouldShowItemOptions(), onlyOnDevice) diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/filelist/item/OCFileListDelegate.kt b/app/src/main/java/com/owncloud/android/ui/adapter/filelist/item/OCFileListDelegate.kt index 82d7b4a8b290..45a54fab832c 100644 --- a/app/src/main/java/com/owncloud/android/ui/adapter/filelist/item/OCFileListDelegate.kt +++ b/app/src/main/java/com/owncloud/android/ui/adapter/filelist/item/OCFileListDelegate.kt @@ -41,7 +41,6 @@ import com.owncloud.android.ui.activity.ComponentsGetter import com.owncloud.android.ui.activity.FolderPickerActivity import com.owncloud.android.ui.adapter.GalleryRowHolder import com.owncloud.android.ui.adapter.filelist.recommended.RecommendedFilesViewHolder -import com.owncloud.android.ui.fragment.SearchType import com.owncloud.android.ui.fragment.albums.AlbumItemsFragment import com.owncloud.android.ui.interfaces.OCFileListFragmentInterface import com.owncloud.android.ui.navigation.animator.NavigationAnimator @@ -208,7 +207,6 @@ class OCFileListDelegate( viewHolder: ListViewHolder, file: OCFile, currentDirectory: OCFile?, - searchType: SearchType?, thumbnailGenerator: ThumbnailGenerator ) { // thumbnail @@ -259,7 +257,6 @@ class OCFileListDelegate( file.isEncrypted && !EncryptionUtils.supportsSecureFiledrop(file, user) ) || - (searchType == SearchType.FAVORITE_SEARCH) || ( file.isFolder && (currentDirectory?.isEncrypted ?: false) From 4e95b5a8d767c21c1bb472d9fa1cdb092981a8fd Mon Sep 17 00:00:00 2001 From: daniele-verducci Date: Fri, 6 Nov 2026 14:09:02 +0100 Subject: [PATCH 3/3] Revert "Reset search type to avoid share button to stay hidden when going back to normal files list" This reverts commit 31cb0f394811f3b6dacb19154e5661b2b13435b0. Signed-off-by: daniele-verducci --- .../owncloud/android/ui/adapter/filelist/OCFileListAdapter.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/filelist/OCFileListAdapter.kt b/app/src/main/java/com/owncloud/android/ui/adapter/filelist/OCFileListAdapter.kt index 17f0d47fa5f5..ed6100f3f5e1 100644 --- a/app/src/main/java/com/owncloud/android/ui/adapter/filelist/OCFileListAdapter.kt +++ b/app/src/main/java/com/owncloud/android/ui/adapter/filelist/OCFileListAdapter.kt @@ -283,7 +283,6 @@ class OCFileListAdapter( onSwapped: () -> Unit ) { this.onlyOnDevice = onlyOnDevice - searchType = null if (storageManager != this.storageManager) { this.storageManager = storageManager