Cache html, fixes

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

@@ -697,8 +697,10 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 boolean show_expanded = properties.getValue("expanded", message.id);
                 if (show_expanded)
                     bindExpanded(message);
-                else
+                else {
                     properties.setBody(message.id, null);
+                    properties.setHtml(message.id, null);
+                }
             }
         }
 
@@ -918,15 +920,12 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             }.execute(context, owner, sargs, "message:actions");
 
             // Message text
-            Spanned body = properties.getBody(message.id);
-            tvBody.setText(body);
-            tvBody.setMovementMethod(null);
             if (internet || message.content)
                 pbBody.setVisibility(View.VISIBLE);
             else
                 tvNoInternetBody.setVisibility(View.VISIBLE);
 
-            if (body == null && message.content)
+            if (message.content)
                 if (show_html)
                     onShowHtmlConfirmed(message);
                 else {
@@ -1269,6 +1268,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     }
                 };
                 webView.setId(vwBody.getId());
+                webView.setVisibility(vwBody.getVisibility());
 
                 ConstraintLayout cl = (ConstraintLayout) itemView;
                 cl.removeView(vwBody);
@@ -1278,7 +1278,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             }
 
             final WebView webView = (WebView) vwBody;
-            webView.setVisibility(View.INVISIBLE);
+            webView.loadUrl("about:blank");
 
             WebSettings settings = webView.getSettings();
             settings.setJavaScriptEnabled(true);
@@ -1289,18 +1289,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             settings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
 
             webView.setWebViewClient(new WebViewClient() {
-                @Override
-                public void onPageCommitVisible(WebView view, String url) {
-                    pbBody.setVisibility(View.GONE);
-                    webView.setVisibility(View.VISIBLE);
-                }
-
-                @Override
-                public void onPageFinished(WebView view, String url) {
-                    pbBody.setVisibility(View.GONE);
-                    webView.setVisibility(View.VISIBLE);
-                }
-
                 public boolean shouldOverrideUrlLoading(WebView view, String url) {
                     Helper.view(context, owner, Uri.parse(url), true);
                     return true;
@@ -1356,6 +1344,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 }
             });
 
+            String html = properties.getHtml(message.id);
+            if (TextUtils.isEmpty(html)) {
                 Bundle args = new Bundle();
                 args.putLong("id", message.id);
 
@@ -1405,7 +1395,12 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
                     @Override
                     protected void onExecuted(Bundle args, String html) {
+                        properties.setHtml(message.id, html);
                         webView.loadDataWithBaseURL("email://", html, "text/html", "UTF-8", null);
+
+                        boolean expanded = properties.getValue("expanded", message.id);
+                        pbBody.setVisibility(View.GONE);
+                        webView.setVisibility(expanded ? View.VISIBLE : View.GONE);
                     }
 
                     @Override
@@ -1413,6 +1408,11 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                         Helper.unexpectedError(context, owner, ex);
                     }
                 }.execute(context, owner, args, "message:webview");
+            } else {
+                webView.loadDataWithBaseURL("email://", html, "text/html", "UTF-8", null);
+                pbBody.setVisibility(View.GONE);
+                webView.setVisibility(View.VISIBLE);
+            }
         }
 
         private void onShowQuotes(final TupleMessageEx message) {
@@ -1463,6 +1463,14 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         private SimpleTask<SpannableStringBuilder> bodyTask = new SimpleTask<SpannableStringBuilder>() {
             private String body = null;
 
+            @Override
+            protected void onPreExecute(Bundle args) {
+                TupleMessageEx message = (TupleMessageEx) args.getSerializable("message");
+                Spanned body = properties.getBody(message.id);
+                tvBody.setText(body);
+                tvBody.setMovementMethod(null);
+            }
+
             @Override
             protected SpannableStringBuilder onExecute(Context context, final Bundle args) {
                 DB db = DB.getInstance(context);
@@ -2657,6 +2665,10 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
         Spanned getBody(long id);
 
+        void setHtml(long id, String html);
+
+        String getHtml(long id);
+
         void scrollTo(int pos, int dy);
 
         void move(long id, String target, boolean type);

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

@@ -143,6 +143,7 @@ public class FragmentMessages extends FragmentBase {
     private boolean autoExpanded = true;
     private Map<String, List<Long>> values = new HashMap<>();
     private LongSparseArray<Spanned> bodies = new LongSparseArray<>();
+    private LongSparseArray<String> html = new LongSparseArray<>();
     private LongSparseArray<TupleAccountSwipes> accountSwipes = new LongSparseArray<>();
 
     private BoundaryCallbackMessages boundaryCallback = null;
@@ -555,11 +556,11 @@ public class FragmentMessages extends FragmentBase {
         }
 
         @Override
-        public void setBody(long id, Spanned body) {
+        public void setBody(long id, Spanned value) {
-            if (body == null)
+            if (value == null)
                 bodies.remove(id);
             else
-                bodies.put(id, body);
+                bodies.put(id, value);
         }
 
         @Override
@@ -567,6 +568,19 @@ public class FragmentMessages extends FragmentBase {
             return bodies.get(id);
         }
 
+        @Override
+        public void setHtml(long id, String value) {
+            if (value == null)
+                html.remove(id);
+            else
+                html.put(id, value);
+        }
+
+        @Override
+        public String getHtml(long id) {
+            return html.get(id);
+        }
+
         @Override
         public void scrollTo(final int pos, final int dy) {
             new Handler().post(new Runnable() {