Browse Source

Merge pull request #2752 from nextcloud/bugfix/2729/fixThumbnailsInFileBrowser

Fix to show thumbnails in FileBrowser
Marcel Hibbe 2 năm trước cách đây
mục cha
commit
01128b7b93

+ 2 - 2
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",

+ 0 - 1
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()
         }
     }
 

+ 3 - 3
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

+ 1 - 1
scripts/analysis/lint-results.txt

@@ -1,2 +1,2 @@
 DO NOT TOUCH; GENERATED BY DRONE
-      <span class="mdl-layout-title">Lint Report: 111 warnings</span>
+      <span class="mdl-layout-title">Lint Report: 110 warnings</span>