From 0018ceb4d627950c46178879a1e495da6cc98d2b Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 17 Feb 2021 09:00:05 +0100
Subject: [PATCH] Fall-safe

---
 .../java/eu/faircode/email/AdapterMessage.java    |  1 +
 .../main/java/eu/faircode/email/WebViewEx.java    | 15 +++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 9f95d62594..7882b4cb4a 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -2451,6 +2451,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         private void bindConversationActions(TupleMessageEx message, ConversationActions cactions) {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
                 boolean has = false;
+                clearActions();
                 if (cactions != null) {
                     List<ConversationAction> actions = cactions.getConversationActions();
                     for (final ConversationAction action : actions) {
diff --git a/app/src/main/java/eu/faircode/email/WebViewEx.java b/app/src/main/java/eu/faircode/email/WebViewEx.java
index f8e7b64f2f..57d095cd65 100644
--- a/app/src/main/java/eu/faircode/email/WebViewEx.java
+++ b/app/src/main/java/eu/faircode/email/WebViewEx.java
@@ -21,6 +21,7 @@ package eu.faircode.email;
 
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Build;
 import android.util.Pair;
@@ -28,6 +29,7 @@ import android.view.InputDevice;
 import android.view.MotionEvent;
 import android.view.View;
 import android.webkit.DownloadListener;
+import android.webkit.RenderProcessGoneDetail;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
@@ -97,6 +99,11 @@ public class WebViewEx extends WebView implements DownloadListener, View.OnLongC
         this.intf = intf;
 
         setWebViewClient(new WebViewClient() {
+            @Override
+            public void onPageStarted(WebView view, String url, Bitmap favicon) {
+                Log.i("Started url=" + url);
+            }
+
             @Override
             public void onPageFinished(WebView view, String url) {
                 Log.i("Finished url=" + url);
@@ -109,6 +116,14 @@ public class WebViewEx extends WebView implements DownloadListener, View.OnLongC
                     ApplicationEx.getMainHandler().post(onPageFinished);
             }
 
+            @Override
+            public boolean onRenderProcessGone(WebView view, RenderProcessGoneDetail detail) {
+                Log.i("Render process gone");
+                if (onPageFinished != null)
+                    ApplicationEx.getMainHandler().post(onPageFinished);
+                return super.onRenderProcessGone(view, detail);
+            }
+
             public boolean shouldOverrideUrlLoading(WebView view, String url) {
                 Log.i("Open url=" + url);
                 return intf.onOpenLink(url);