From 69b19fd97d878b7f7c9c1fa0201469ad9ef9b97f Mon Sep 17 00:00:00 2001 From: M66B Date: Sat, 11 Dec 2021 16:00:02 +0100 Subject: [PATCH] Fixed broken image --- app/src/main/java/eu/faircode/email/FixedImageButton.java | 5 ++++- app/src/main/java/eu/faircode/email/FixedImageView.java | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FixedImageButton.java b/app/src/main/java/eu/faircode/email/FixedImageButton.java index 90b6df0ecd..57dddb10c7 100644 --- a/app/src/main/java/eu/faircode/email/FixedImageButton.java +++ b/app/src/main/java/eu/faircode/email/FixedImageButton.java @@ -21,6 +21,7 @@ package eu.faircode.email; import android.content.Context; import android.graphics.Canvas; +import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.util.AttributeSet; @@ -49,7 +50,9 @@ public class FixedImageButton extends AppCompatImageButton { Log.e(new Throwable(Helper.getViewName(this), ex)); Context context = getContext(); Drawable d = context.getDrawable(R.drawable.twotone_broken_image_24); - d.setBounds(getDrawable().getBounds()); + Rect b = getDrawable().getBounds(); + int px = Math.min(b.width(), b.height()); + d.setBounds(0, 0, px, px); d.draw(canvas); } } diff --git a/app/src/main/java/eu/faircode/email/FixedImageView.java b/app/src/main/java/eu/faircode/email/FixedImageView.java index d3bb81a08a..6e018a80cd 100644 --- a/app/src/main/java/eu/faircode/email/FixedImageView.java +++ b/app/src/main/java/eu/faircode/email/FixedImageView.java @@ -21,6 +21,7 @@ package eu.faircode.email; import android.content.Context; import android.graphics.Canvas; +import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.util.AttributeSet; import android.view.View; @@ -50,7 +51,9 @@ public class FixedImageView extends androidx.appcompat.widget.AppCompatImageView Log.e(new Throwable(Helper.getViewName(this), ex)); Context context = getContext(); Drawable d = context.getDrawable(R.drawable.twotone_broken_image_24); - d.setBounds(getDrawable().getBounds()); + Rect b = getDrawable().getBounds(); + int px = Math.min(b.width(), b.height()); + d.setBounds(0, 0, px, px); d.draw(canvas); } }