From 5d83ff8c986d4686e1047b4c985cd91bbb2aa880 Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Thu, 9 Feb 2023 12:47:11 +0100 Subject: [PATCH 1/4] Fix to show thumbnails in FileBrowser MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit without this fix following Exception occurred: I/RealImageLoader: 🚨 Failed - https://sermo.nextcloud.com/index.php/core/preview.png?file=%2F2022-09-12_163513.jpg&x=90&y=90&a=1&mode=cover&forceIcon=1 - coil.network.HttpException: HTTP 401: E/RealImageLoader: coil.network.HttpException: HTTP 401: at coil.fetch.HttpUriFetcher.executeNetworkRequest(HttpUriFetcher.kt:227) at coil.fetch.HttpUriFetcher.access$executeNetworkRequest(HttpUriFetcher.kt:30) at coil.fetch.HttpUriFetcher$executeNetworkRequest$1.invokeSuspend(Unknown Source:15) at kotlin.coroutines.jvm.internal.BaseContinuationImpl.resumeWith(ContinuationImpl.kt:33) at kotlinx.coroutines.DispatchedTask.run(DispatchedTask.kt:106) at kotlinx.coroutines.internal.LimitedDispatcher.run(LimitedDispatcher.kt:42) at kotlinx.coroutines.scheduling.TaskImpl.run(Tasks.kt:95) at kotlinx.coroutines.scheduling.CoroutineScheduler.runSafely(CoroutineScheduler.kt:570) at kotlinx.coroutines.scheduling.CoroutineScheduler$Worker.executeTask(CoroutineScheduler.kt:750) at kotlinx.coroutines.scheduling.CoroutineScheduler$Worker.runWorker(CoroutineScheduler.kt:677) at kotlinx.coroutines.scheduling.CoroutineScheduler$Worker.run(CoroutineScheduler.kt:664) Signed-off-by: Marcel Hibbe --- .../java/com/nextcloud/talk/extensions/ImageViewExtensions.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/extensions/ImageViewExtensions.kt b/app/src/main/java/com/nextcloud/talk/extensions/ImageViewExtensions.kt index 0a487f405..c50b35900 100644 --- a/app/src/main/java/com/nextcloud/talk/extensions/ImageViewExtensions.kt +++ b/app/src/main/java/com/nextcloud/talk/extensions/ImageViewExtensions.kt @@ -137,7 +137,7 @@ fun ImageView.loadThumbnail(url: String, user: User): io.reactivex.disposables.D } if (url.startsWith(user.baseUrl!!) && - (url.contains("index.php/core/preview?fileId=") || url.contains("/avatar/")) + (url.contains("index.php/core/preview") || url.contains("/avatar/")) ) { requestBuilder.addHeader( "Authorization", @@ -163,7 +163,7 @@ fun ImageView.loadImage(url: String, user: User, placeholder: Drawable? = null): .transformations(RoundedCornersTransformation(ROUNDING_PIXEL, ROUNDING_PIXEL, ROUNDING_PIXEL, ROUNDING_PIXEL)) if (url.startsWith(user.baseUrl!!) && - (url.contains("index.php/core/preview?fileId=") || url.contains("/avatar/")) + (url.contains("index.php/core/preview") || url.contains("/avatar/")) ) { requestBuilder.addHeader( "Authorization", From 29a9b0e3812e258c8a7fbabb54e0dd7038fa5f56 Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Fri, 10 Feb 2023 12:34:31 +0100 Subject: [PATCH 2/4] use class variable fileIcon instead binding.fileIcon this shouldn't make a difference. class variable was unused before.. Signed-off-by: Andy Scherzinger Signed-off-by: Marcel Hibbe --- .../adapters/RemoteFileBrowserItemsListViewHolder.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/remotefilebrowser/adapters/RemoteFileBrowserItemsListViewHolder.kt b/app/src/main/java/com/nextcloud/talk/remotefilebrowser/adapters/RemoteFileBrowserItemsListViewHolder.kt index b8090ed9d..b28d94b29 100644 --- a/app/src/main/java/com/nextcloud/talk/remotefilebrowser/adapters/RemoteFileBrowserItemsListViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/remotefilebrowser/adapters/RemoteFileBrowserItemsListViewHolder.kt @@ -96,13 +96,13 @@ class RemoteFileBrowserItemsListViewHolder( val path = ApiUtils.getUrlForFilePreviewWithRemotePath( currentUser.baseUrl, item.path, - binding.fileIcon.context.resources.getDimensionPixelSize(R.dimen.small_item_height) + fileIcon.context.resources.getDimensionPixelSize(R.dimen.small_item_height) ) if (path.isNotEmpty()) { - binding.fileIcon.loadImage(path, currentUser, placeholder) + fileIcon.loadImage(path, currentUser, placeholder) } } else { - binding.fileIcon.setImageDrawable(placeholder) + fileIcon.setImageDrawable(placeholder) } binding.filenameTextView.text = item.displayName From 4bca10a5fa72b85bdae90b9686b91e0163e149ed Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Fri, 10 Feb 2023 12:46:48 +0100 Subject: [PATCH 3/4] fix to not replace folder with some thumbnail from files fix #2757 Signed-off-by: Marcel Hibbe --- .../remotefilebrowser/activities/RemoteFileBrowserActivity.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/com/nextcloud/talk/remotefilebrowser/activities/RemoteFileBrowserActivity.kt b/app/src/main/java/com/nextcloud/talk/remotefilebrowser/activities/RemoteFileBrowserActivity.kt index 7c09d9e88..9f03e3f00 100644 --- a/app/src/main/java/com/nextcloud/talk/remotefilebrowser/activities/RemoteFileBrowserActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/remotefilebrowser/activities/RemoteFileBrowserActivity.kt @@ -147,7 +147,6 @@ class RemoteFileBrowserActivity : AppCompatActivity(), SelectionInterface, Swipe viewModel.selectedPaths.observe(this) { selectedPaths -> filesSelectionDoneMenuItem?.isVisible = !selectedPaths.isNullOrEmpty() - binding.recyclerView.adapter?.notifyDataSetChanged() } } From 86c837b45631d4bbfb4b61cbeac11104c64e8eaa Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 10 Feb 2023 12:09:50 +0000 Subject: [PATCH 4/4] Analysis: update lint results to reflect reduced error/warning count Signed-off-by: github-actions --- scripts/analysis/lint-results.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/analysis/lint-results.txt b/scripts/analysis/lint-results.txt index c5244b2e9..034225a6a 100644 --- a/scripts/analysis/lint-results.txt +++ b/scripts/analysis/lint-results.txt @@ -1,2 +1,2 @@ DO NOT TOUCH; GENERATED BY DRONE - Lint Report: 111 warnings + Lint Report: 110 warnings