diff --git a/app/src/main/java/app/pachli/components/compose/dialog/FocusDialog.kt b/app/src/main/java/app/pachli/components/compose/dialog/FocusDialog.kt index 050b1a8de..f740081c6 100644 --- a/app/src/main/java/app/pachli/components/compose/dialog/FocusDialog.kt +++ b/app/src/main/java/app/pachli/components/compose/dialog/FocusDialog.kt @@ -50,12 +50,12 @@ fun T.makeFocusDialog( .downsample(DownsampleStrategy.CENTER_INSIDE) .listener( object : RequestListener { - override fun onLoadFailed(p0: GlideException?, p1: Any?, p2: Target?, p3: Boolean): Boolean { + override fun onLoadFailed(p0: GlideException?, p1: Any?, p2: Target, p3: Boolean): Boolean { return false } - override fun onResourceReady(resource: Drawable?, model: Any?, target: Target?, dataSource: DataSource?, isFirstResource: Boolean): Boolean { - val width = resource!!.intrinsicWidth + override fun onResourceReady(resource: Drawable, model: Any, target: Target?, dataSource: DataSource, isFirstResource: Boolean): Boolean { + val width = resource.intrinsicWidth val height = resource.intrinsicHeight dialogBinding.focusIndicator.setImageSize(width, height) diff --git a/app/src/main/java/app/pachli/fragment/ViewImageFragment.kt b/app/src/main/java/app/pachli/fragment/ViewImageFragment.kt index 56db5fc4e..ac26d0dd7 100644 --- a/app/src/main/java/app/pachli/fragment/ViewImageFragment.kt +++ b/app/src/main/java/app/pachli/fragment/ViewImageFragment.kt @@ -310,7 +310,7 @@ class ViewImageFragment : ViewMediaFragment() { override fun onLoadFailed( e: GlideException?, - model: Any, + model: Any?, target: Target, isFirstResource: Boolean, ): Boolean { diff --git a/app/src/main/java/app/pachli/view/MediaPreviewImageView.kt b/app/src/main/java/app/pachli/view/MediaPreviewImageView.kt index db85454df..f2b340b9a 100644 --- a/app/src/main/java/app/pachli/view/MediaPreviewImageView.kt +++ b/app/src/main/java/app/pachli/view/MediaPreviewImageView.kt @@ -96,11 +96,11 @@ open class MediaPreviewImageView } } - override fun onLoadFailed(e: GlideException?, model: Any?, target: Target?, isFirstResource: Boolean): Boolean { + override fun onLoadFailed(e: GlideException?, model: Any?, target: Target, isFirstResource: Boolean): Boolean { return false } - override fun onResourceReady(resource: Drawable?, model: Any?, target: Target?, dataSource: DataSource?, isFirstResource: Boolean): Boolean { + override fun onResourceReady(resource: Drawable, model: Any, target: Target?, dataSource: DataSource, isFirstResource: Boolean): Boolean { recalculateMatrix(width, height, resource) return false } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b99aaddde..b6d16819e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -31,7 +31,7 @@ diffx = "1.1.1" emoji2 = "1.3.0" espresso = "3.5.1" filemoji-compat = "3.2.7" -glide = "4.15.1" +glide = "4.16.0" # Deliberate downgrade, https://github.com/tuskyapp/Tusky/issues/3631 glide-animation-plugin = "2.23.0" gson = "2.10.1"