From 504e99eeea362b4612f4cd7cee4afa97d5db4ab8 Mon Sep 17 00:00:00 2001
From: Samuel Sieb <samuel@sieb.net>
Date: Tue, 28 Apr 2015 20:57:30 -0700
Subject: [PATCH 1/2] Disable RigidWebView resize throttling on Android
 Lollipop or higher. This fixes the problem with blank messages.

---
 src/com/fsck/k9/view/RigidWebView.java | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/com/fsck/k9/view/RigidWebView.java b/src/com/fsck/k9/view/RigidWebView.java
index 2031648b7..796ab5674 100644
--- a/src/com/fsck/k9/view/RigidWebView.java
+++ b/src/com/fsck/k9/view/RigidWebView.java
@@ -18,6 +18,7 @@
 package com.fsck.k9.view;
 
 import android.content.Context;
+import android.os.Build;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.webkit.WebView;
@@ -45,6 +46,7 @@ public class RigidWebView extends WebView {
         super(context, attrs, defStyle);
     }
 
+    private boolean noThrottle = Build.VERSION.SDK_INT >= 21; //Build.VERSION_CODES.LOLLIPOP
     private static final int MIN_RESIZE_INTERVAL = 200;
     private static final int MAX_RESIZE_INTERVAL = 300;
     private final Clock mClock = Clock.INSTANCE;
@@ -66,6 +68,13 @@ public class RigidWebView extends WebView {
     protected void onSizeChanged(int w, int h, int ow, int oh) {
         mRealWidth = w;
         mRealHeight = h;
+
+        // Don't throttle resizes on Android 5 or higher.
+        if (noThrottle) {
+            performSizeChange(ow, oh);
+            return;
+        }
+
         long now = mClock.getTime();
         boolean recentlySized = (now - mLastSizeChangeTime < MIN_RESIZE_INTERVAL);
 

From efc129fcd00d9f010049fa2510c199e798c383c3 Mon Sep 17 00:00:00 2001
From: cketti <cketti@gmail.com>
Date: Thu, 30 Apr 2015 04:41:50 +0200
Subject: [PATCH 2/2] Do less work in RigidWebView in 'no throttle' case

---
 src/com/fsck/k9/view/RigidWebView.java | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/com/fsck/k9/view/RigidWebView.java b/src/com/fsck/k9/view/RigidWebView.java
index 796ab5674..43e344ba5 100644
--- a/src/com/fsck/k9/view/RigidWebView.java
+++ b/src/com/fsck/k9/view/RigidWebView.java
@@ -35,6 +35,7 @@ import com.fsck.k9.helper.Utility;
  * contents with percent-based height will force the WebView to infinitely expand (or shrink).
  */
 public class RigidWebView extends WebView {
+    private static final boolean NO_THROTTLE = Build.VERSION.SDK_INT >= 21; //Build.VERSION_CODES.LOLLIPOP
 
     public RigidWebView(Context context) {
         super(context);
@@ -46,7 +47,6 @@ public class RigidWebView extends WebView {
         super(context, attrs, defStyle);
     }
 
-    private boolean noThrottle = Build.VERSION.SDK_INT >= 21; //Build.VERSION_CODES.LOLLIPOP
     private static final int MIN_RESIZE_INTERVAL = 200;
     private static final int MAX_RESIZE_INTERVAL = 300;
     private final Clock mClock = Clock.INSTANCE;
@@ -66,15 +66,14 @@ public class RigidWebView extends WebView {
 
     @Override
     protected void onSizeChanged(int w, int h, int ow, int oh) {
-        mRealWidth = w;
-        mRealHeight = h;
-
-        // Don't throttle resizes on Android 5 or higher.
-        if (noThrottle) {
-            performSizeChange(ow, oh);
+        if (NO_THROTTLE) {
+            super.onSizeChanged(w, h, ow, oh);
             return;
         }
 
+        mRealWidth = w;
+        mRealHeight = h;
+
         long now = mClock.getTime();
         boolean recentlySized = (now - mLastSizeChangeTime < MIN_RESIZE_INTERVAL);