Skip to content

Commit 1e9d9d8

Browse files
authored
Merge pull request #3190 from owncloud/BumpGlide
Glide update
2 parents 1387581 + 84ea69d commit 1e9d9d8

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

owncloudApp/build.gradle

+1-3
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@ dependencies {
2727
implementation "androidx.biometric:biometric:$biometricVersion"
2828

2929
// Image loading
30-
implementation('com.github.bumptech.glide:glide:4.6.1') {
31-
exclude group: "com.android.support"
32-
}
30+
implementation 'com.github.bumptech.glide:glide:4.12.0'
3331

3432
// CustomTabs required for OAuth2 and OIDC.
3533
implementation "androidx.browser:browser:1.3.0"

owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.kt

+2-4
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ import com.bumptech.glide.load.DataSource
4040
import com.bumptech.glide.load.engine.DiskCacheStrategy
4141
import com.bumptech.glide.load.engine.GlideException
4242
import com.bumptech.glide.request.RequestListener
43-
import com.bumptech.glide.request.RequestOptions
4443
import com.bumptech.glide.request.target.Target
4544
import com.github.chrisbanes.photoview.PhotoView
4645
import com.owncloud.android.R
@@ -297,11 +296,10 @@ class PreviewImageFragment : FileFragment() {
297296
}
298297

299298
private fun loadAndShowImage() {
300-
val requestOptions =
301-
RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.NONE).apply(RequestOptions.skipMemoryCacheOf(true))
302299
Glide.with(requireContext())
303300
.load(File(file.storagePath))
304-
.apply(requestOptions)
301+
.diskCacheStrategy(DiskCacheStrategy.NONE)
302+
.skipMemoryCache(true)
305303
.listener(object : RequestListener<Drawable?> {
306304
override fun onLoadFailed(
307305
e: GlideException?, model: Any, target: Target<Drawable?>, isFirstResource: Boolean

0 commit comments

Comments
 (0)