From 50434e744f06e06301b23aaf3c8e5c45c6407c53 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 3 May 2019 17:39:32 +0200
Subject: [PATCH] Small improvement

---
 app/src/main/java/eu/faircode/email/AdapterImage.java    | 2 +-
 app/src/main/java/eu/faircode/email/FragmentCompose.java | 3 +--
 app/src/main/java/eu/faircode/email/HtmlHelper.java      | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterImage.java b/app/src/main/java/eu/faircode/email/AdapterImage.java
index ef66ba755d..6afd0902c0 100644
--- a/app/src/main/java/eu/faircode/email/AdapterImage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterImage.java
@@ -78,7 +78,7 @@ public class AdapterImage extends RecyclerView.Adapter<AdapterImage.ViewHolder>
         private void bindTo(EntityAttachment attachment) {
             if (attachment.available) {
                 Bitmap bm = Helper.decodeImage(attachment.getFile(context),
-                        context.getResources().getDisplayMetrics().widthPixels / 2);
+                        context.getResources().getDisplayMetrics().widthPixels);
                 if (bm == null)
                     image.setImageResource(R.drawable.baseline_broken_image_24);
                 else
diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 99ad8521a8..267da94a84 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -2881,8 +2881,7 @@ public class FragmentCompose extends FragmentBase {
                                     lld.setLevel(2); // image
 
                                     float scale = 1.0f;
-                                    float width = getContext().getResources().getDisplayMetrics().widthPixels -
-                                            Helper.dp2pixels(getContext(), 12); // margins;
+                                    float width = etBody.getWidth();
                                     if (image.getIntrinsicWidth() > width)
                                         scale = width / image.getIntrinsicWidth();
 
diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java
index 9e87ff29f1..2403cd69a0 100644
--- a/app/src/main/java/eu/faircode/email/HtmlHelper.java
+++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java
@@ -313,7 +313,7 @@ public class HtmlHelper {
                 return d;
             } else {
                 Bitmap bm = Helper.decodeImage(attachment.getFile(view.getContext()),
-                        res.getDisplayMetrics().widthPixels);
+                        res.getDisplayMetrics().widthPixels * 2);
                 if (bm == null) {
                     Drawable d = res.getDrawable(R.drawable.baseline_broken_image_24, theme);
                     d.setBounds(0, 0, px, px);