Simplified fitDrawable

app/src/main/java/eu/faircode/email/ImageHelper.java

@@ -46,6 +46,8 @@ import android.text.TextUtils;
 import android.util.Base64;
 import android.util.DisplayMetrics;
 import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewParent;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -69,8 +71,6 @@ import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.Date;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Semaphore;
-import java.util.concurrent.TimeUnit;
 
 class ImageHelper {
     private static final ExecutorService executor_1 =
@@ -80,7 +80,6 @@ class ImageHelper {
 
     private static final int DOWNLOAD_TIMEOUT = 15 * 1000; // milliseconds
     private static final int MAX_REDIRECTS = 10;
-    private static final long FIT_DRAWABLE_TIMEOUT = 10 * 1000L; // milliseconds
     private static final int SLOW_CONNECTION = 2 * 1024; // Kbps
 
     static Bitmap generateIdenticon(@NonNull String email, int size, int pixels, Context context) {
@@ -443,14 +442,6 @@ class ImageHelper {
     }
 
     private static void fitDrawable(final Drawable d, final AnnotatedSource a, final View view) {
-        if (!view.isAttachedToWindow())
-            return;
-
-        Semaphore semaphore = new Semaphore(0);
-
-        view.post(new Runnable() {
-            @Override
-            public void run() {
         Rect bounds = d.getBounds();
         int w = bounds.width();
         int h = bounds.height();
@@ -466,29 +457,25 @@ class ImageHelper {
             d.setBounds(0, 0, w, h);
         }
 
-                float width = view.getWidth();
+        float width = view.getContext().getResources().getDisplayMetrics().widthPixels;
+        View v = view;
+        while (v != null) {
+            width -= v.getPaddingStart() + v.getPaddingEnd();
+            if (v.getLayoutParams() instanceof ViewGroup.MarginLayoutParams) {
+                ViewGroup.MarginLayoutParams lparam = (ViewGroup.MarginLayoutParams) v.getLayoutParams();
+                width -= lparam.leftMargin + lparam.rightMargin;
+            }
+
+            ViewParent parent = v.getParent();
+            v = (parent instanceof View ? (View) parent : null);
+        }
+
         if (w > width) {
             float scale = width / w;
             w = Math.round(w * scale);
             h = Math.round(h * scale);
             d.setBounds(0, 0, w, h);
         }
-
-                semaphore.release();
-            }
-        });
-
-        try {
-            long now = new Date().getTime();
-            long start = now;
-            while (view.isAttachedToWindow() && now - start < FIT_DRAWABLE_TIMEOUT) {
-                if (semaphore.tryAcquire(1000, TimeUnit.MILLISECONDS))
-                    break;
-                now = new Date().getTime();
-            }
-        } catch (InterruptedException ex) {
-            Log.w(ex);
-        }
     }
 
     private static Drawable getDataDrawable(Context context, String source) {