From 4c974be4077c790fc7d2b543f55ccd5c82bab178 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 20 Apr 2019 15:32:33 +0200
Subject: [PATCH] Revert "Workaround AndroidX bug"

This reverts commit d879ac3c7ac58ec9195cfd78df2c9baa13d9d4d0.
---
 .../eu/faircode/email/AdapterMessage.java     | 38 ++++---------------
 .../main/java/eu/faircode/email/Helper.java   |  7 ----
 2 files changed, 8 insertions(+), 37 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 26e9e49911..ec16d4014b 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -35,11 +35,7 @@ import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.content.res.ColorStateList;
 import android.database.Cursor;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
 import android.graphics.Color;
-import android.graphics.ColorFilter;
-import android.graphics.ColorMatrix;
 import android.graphics.ColorMatrixColorFilter;
 import android.graphics.Paint;
 import android.graphics.Rect;
@@ -1396,44 +1392,26 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             // For performance reasons the WebView is created when needed only
             if (!(vwBody instanceof WebView)) {
                 WebView webView = new WebView(context) {
-                    private Bitmap bm;
-                    private Canvas cc;
-                    private Paint paint = new Paint();
-                    private ColorFilter cf = new ColorMatrixColorFilter(new ColorMatrix(Helper.NEGATIVE));
-
                     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
                         super.onMeasure(widthMeasureSpec, heightMeasureSpec);
                         int height = getMeasuredHeight();
                         if (height < tvBody.getMinHeight())
                             setMeasuredDimension(getMeasuredWidth(), tvBody.getMinHeight());
                     }
-
-                    @Override
-                    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
-                        super.onSizeChanged(w, h, oldw, oldh);
-                        bm = Bitmap.createBitmap(w, h, Bitmap.Config.ARGB_8888);
-                        cc = new Canvas(bm);
-                    }
-
-                    @Override
-                    protected void onDraw(Canvas canvas) {
-                        if (dark) {
-                            super.onDraw(cc);
-                            paint.setColorFilter(cf);
-                            canvas.drawBitmap(bm, 0, 0, paint);
-                        } else
-                            super.onDraw(canvas);
-                    }
                 };
 
-                /*
-                // https://bugs.chromium.org/p/chromium/issues/detail?id=578150
                 if (dark) {
+                    float[] NEGATIVE = new float[]{
+                            -1, 0, 0, 0, 255, // red
+                            0, -1, 0, 0, 255, // green
+                            0, 0, -1, 0, 255, // blue
+                            0, 0, 0, 1, 0 // alpha
+                    };
+
                     Paint paint = new Paint();
-                    paint.setColorFilter(new ColorMatrixColorFilter(Helper.NEGATIVE));
+                    paint.setColorFilter(new ColorMatrixColorFilter(NEGATIVE));
                     webView.setLayerType(View.LAYER_TYPE_HARDWARE, paint);
                 }
-                */
 
                 webView.setWebViewClient(new WebViewClient() {
                     public boolean shouldOverrideUrlLoading(WebView view, String url) {
diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index ff5c28acef..d6adfa8ecd 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -132,13 +132,6 @@ public class Helper {
 
     static final float LOW_LIGHT = 0.6f;
 
-    static final float[] NEGATIVE = new float[]{
-            -1, 0, 0, 0, 255, // red
-            0, -1, 0, 0, 255, // green
-            0, 0, -1, 0, 255, // blue
-            0, 0, 0, 1, 0 // alpha
-    };
-
     static final String FAQ_URI = "https://github.com/M66B/open-source-email/blob/master/FAQ.md";
 
     static ThreadFactory backgroundThreadFactory = new ThreadFactory() {