diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/OCFileListDelegate.kt b/app/src/main/java/com/owncloud/android/ui/adapter/OCFileListDelegate.kt
index 65bc90380aaf..3f607b3e6b0b 100644
--- a/app/src/main/java/com/owncloud/android/ui/adapter/OCFileListDelegate.kt
+++ b/app/src/main/java/com/owncloud/android/ui/adapter/OCFileListDelegate.kt
@@ -414,7 +414,7 @@ class OCFileListDelegate(
                 if (showShareAvatar) null else R.drawable.shared_via_users to R.string.shared_icon_shared
             }
 
-            file.isSharedViaLink -> R.drawable.shared_via_link to R.string.shared_icon_shared_via_link
+            file.isShared || file.isSharedViaLink -> R.drawable.shared_via_link to R.string.shared_icon_shared_via_link
 
             else -> R.drawable.ic_unshared to R.string.shared_icon_share
         }
diff --git a/app/src/main/java/com/owncloud/android/ui/asynctasks/GallerySearchTask.kt b/app/src/main/java/com/owncloud/android/ui/asynctasks/GallerySearchTask.kt
index d3d4a0660875..138bbf8c8814 100644
--- a/app/src/main/java/com/owncloud/android/ui/asynctasks/GallerySearchTask.kt
+++ b/app/src/main/java/com/owncloud/android/ui/asynctasks/GallerySearchTask.kt
@@ -70,10 +70,11 @@ class GallerySearchTask(
         ocCapability: com.owncloud.android.lib.resources.status.OCCapability
     ): SearchRemoteOperation =
         SearchRemoteOperation("", SearchRemoteOperation.SearchType.GALLERY_SEARCH, false, ocCapability).apply {
-            setLimit(limit)
-            setEndDate(endDate)
+            limit = this@GallerySearchTask.limit
+            endDate =  this@GallerySearchTask.endDate
+
             // workaround to keep SearchRemoteOperation functioning correctly even if we don't actively use startDate
-            setStartDate(0L)
+            startDate = 0L
         }
 
     private fun logSearchStart() {
diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListSearchTask.kt b/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListSearchTask.kt
index 26a8943b311d..d0e72abf2afa 100644
--- a/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListSearchTask.kt
+++ b/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListSearchTask.kt
@@ -208,7 +208,7 @@ class OCFileListSearchTask(
 
             for (obj in data) {
                 try {
-                    val remoteFile = obj as? RemoteFile ?: continue
+                    val remoteFile = (obj as? RemoteFile) ?: continue
                     var ocFile = FileStorageUtils.fillOCFile(remoteFile)
                     FileStorageUtils.searchForLocalFileInDefaultPath(ocFile, currentUser.accountName)
                     ocFile = storageManager.saveFileWithParent(ocFile, activity)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 21cc251dfeda..b1e1ea628810 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -5,7 +5,7 @@
 androidCommonLibraryVersion = "0.33.2"
 androidGifDrawableVersion = "1.2.31"
 androidImageCropperVersion = "4.7.0"
-androidLibraryVersion ="1c847678482c739d0b92e27a445d2f5f168f7d33"
+androidLibraryVersion ="bf4287e5a6"
 androidPluginVersion = "9.2.1"
 androidsvgVersion = "1.4"
 androidxMediaVersion = "1.5.1"
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 4ec7b49b5934..16521448ca73 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -21688,6 +21688,14 @@
             <sha256 value="66afb9f2eea39427f6f03c14c5b82ca240157e22b8b2a764f0a7c8ad87cb2d3e" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.github.nextcloud" name="android-library" version="bf4287e5a6">
+         <artifact name="android-library-bf4287e5a6.aar">
+            <sha256 value="c023859b682b37feee6182665e2af29faa3a903f9d28378af5f5e07c1a51b812" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="android-library-bf4287e5a6.module">
+            <sha256 value="834b3f515013a9d5ed70c69645e92b7d4a323a6349141672001efbc3c6f4b20f" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.nextcloud" name="android-library" version="bf5fa888cf51896a20297818e04b3e59be4c4f93">
          <artifact name="android-library-bf5fa888cf51896a20297818e04b3e59be4c4f93.aar">
             <sha256 value="e22b38a2e7e9ec9461af2005c573f7c3bf097651f0bda27367fb355f82ef217d" origin="Generated by Gradle"/>